fix:5.2.8版本待发布

pom.xml

@@ -49,13 +49,15 @@
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-basic</artifactId>
-            <version>2.1.13.1</version>
+            <version>2.1.13.2</version>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-mdiy</artifactId>
             <version>2.1.13.1</version>
         </dependency>
+
+
         <!--store入口依赖（源码不开发），如果不需要MStore可以直接去掉依赖-->
         <dependency>
             <groupId>net.mingsoft</groupId>

src/main/java/net/mingsoft/config/WebConfig.java

@@ -64,6 +64,9 @@ public class WebConfig implements WebMvcConfigurer {
     @Autowired(required = false)
     private IConfigBiz configBiz;
 
+    @Autowired(required = false)
+    private MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter;
+
     @Bean
     public ActionInterceptor actionInterceptor() {
         return new ActionInterceptor();
@@ -178,21 +181,11 @@ public class WebConfig implements WebMvcConfigurer {
     @Override
     public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
         // TODO Auto-generated method stub
-        converters.add(mappingJackson2HttpMessageConverter());
+        converters.add(mappingJackson2HttpMessageConverter);
         WebMvcConfigurer.super.configureMessageConverters(converters);
 
     }
 
-    @Bean
-    public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() {
-        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-        ObjectMapper objectMapper = new ObjectMapper();
-
-        //添加此配置
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        converter.setObjectMapper(objectMapper);
-        return converter;
-    }
 
     @Bean
     public ExecutorService crawlExecutorPool() {

src/main/webapp/WEB-INF/manager/include/head-file.ftl

@@ -1,114 +0,0 @@
-<meta charset="utf-8">
-<!--浏览器小图标-->
-<link rel="icon" href="/logo.ico" type="x-icon">
-<script type="text/javascript" src="${base}/static/plugins/vue/2.6.9/vue.min.js"></script>
-<script src="${base}/static/plugins/vue-i18n/8.18.2/vue-i18n.js"></script>
-<!-- 图标 -->
-<link rel="stylesheet" type="text/css" href="${base}/static/plugins/iconfont/1.0.0/iconfont.css" />
-<script src="${base}/static/plugins/iconfont/1.0.0/iconfont.js"></script>
-
-<!-- 引入样式 -->
-<link rel="stylesheet" href="${base}/static/plugins/element-ui/2.15.7/theme-chalk/index.min.css">
-<!-- 引入组件库 -->
-<script src="${base}/static/plugins/element-ui/2.15.7/index.min.js"></script>
-<script src="${base}/static/plugins/element-ui/2.15.7/local/en.min.js"></script>
-<script src="${base}/static/plugins/element-ui/2.15.7/local/zh-CN.min.js"></script>
-<!--图片懒加载-->
-<script src="${base}/static/plugins/vue.lazyload/1.2.6/vue-lazyload.js"></script>
-<!--网络请求框架-->
-<script src="${base}/static/plugins/axios/0.18.0/axios.min.js"></script>
-<script src="${base}/static/plugins/qs/6.6.0/qs.min.js"></script>
-<!--金额转换-->
-<script src="${base}/static/plugins/accounting/0.4.1/accounting.js"></script>
-<!--时间转换-->
-<script src="${base}/static/plugins/moment/2.24.0/moment.min.js"></script>
-<!--铭飞-->
-<script src="${base}/static/plugins/ms/2.0/ms.umd.js"></script>
-<script src="${base}/static/plugins/ms/2.0/ms-el-form.umd.js"></script>
-<script src="${base}/static/plugins/vue-ueditor-wrap/vue-ueditor-wrap.min.js"></script>
-
-<#--复制-->
-<script src="${base}/static/plugins/clipboard/clipboard.js"></script>
-<#-- 树形下拉-->
-<script src="${base}/static/plugins/tree-select/tree.js"></script>
-<!--通用样式-->
-<link rel="stylesheet" href="${base}/static/css/app.css"/>
-<#--主题-->
-<link rel="stylesheet" href="${base}/static/css/theme.css">
-<![if IE]>
-<script src="${base}/static/plugins/babel-polyfill/7.8.3/polyfill.min.js"></script>
-<![endif]>
-
-<#--语言文件-->
-<script src="${base}/static/locale/lang/base/zh_CN.js"></script>
-<script src="${base}/static/locale/lang/base/en_US.js"></script>
-
-<script src="${base}/static/mdiy/index.js"></script>
-
-<#--下拉框-->
-<script src="${base}/static/plugins/vue-treeselect/0.4.0/vue-treeselect.umd.min.js"></script>
-<link rel="stylesheet" href="${base}/static/plugins/vue-treeselect/0.4.0/vue-treeselect.min.css">
-
-<#--代码预览-->
-<script src="${base}/static/plugins/clipboard/clipboard.js"></script>
-<script src="${base}/static/plugins/codemirror/5.48.4/codemirror.js"></script>
-<link href="${base}/static/plugins/codemirror/5.48.4/codemirror.css" rel="stylesheet">
-<script src="${base}/static/plugins/codemirror/5.48.4/mode/css/css.js"></script>
-<script src="${base}/static/plugins/vue-codemirror/vue-codemirror.js"></script>
-<script src="${base}/static/plugins/codemirror/5.48.4/addon/scroll/annotatescrollbar.js"></script>
-<script src="${base}/static/plugins/codemirror/5.48.4/mode/xml/xml.js"></script>
-<script src="${base}/static/plugins/codemirror/5.48.4/mode/javascript/javascript.js"></script>
-
-<script>
-    ms.base = "${base}";
-  	ms.login = "${managerPath}/login.do";
-    ms.manager = "${managerPath}";
-    ms.web = ms.base;
-    //百度编辑器默认配置
-    ms.editorConfig={
-        imageScaleEnabled :true,
-        autoHeightEnabled: true,
-        autoFloatEnabled: false,
-        scaleEnabled: true,
-        compressSide:0,
-        maxImageSideLength:1000,
-        maximumWords: 2000,
-        initialFrameWidth: '100%',
-        initialFrameHeight: 400,
-        serverUrl: ms.base + "/static/plugins/ueditor/1.4.3.3/jsp/editor.do?jsonConfig=%7BvideoUrlPrefix:\'\',fileManagerListPath:\'\',imageMaxSize:204800000,videoMaxSize:204800000,fileMaxSize:204800000,fileUrlPrefix:\'\',imageUrlPrefix:\'\',imagePathFormat:\'/${appId}/cms/content/editor/%7Btime%7D\',filePathFormat:\'/${appId}/cms/content/editor/%7Btime%7D\',videoPathFormat:\'/${appId}/cms/content/editor/%7Btime%7D\'%7D",
-        UEDITOR_HOME_URL: ms.base + '/static/plugins/ueditor/1.4.3.3/'
-    }
-
-    //ms.base = "http://192.168.0.54:90/";
-    //ms.manager = "http://192.168.0.54:90/apis/ms/";
-    //ms.web = "http://192.168.0.54:90/apis/";
-    //图片懒加载
-    Vue.use(VueLazyload, {
-        error: ms.base + '/static/images/error.png',
-        loading: ms.base + '/static/images/loading.png',
-    })
-    Vue.component('treeselect', VueTreeselect.Treeselect)
-    Vue.component('vue-ueditor-wrap', VueUeditorWrap);
-
-</script>
-<style>
-    .ms-admin-menu .is-active {
-        border: 0px !important;
-    }
-    .vue-treeselect__placeholder,.vue-treeselect__single-value {
-        font-size: 12px;
-        padding-top: -8px;
-    }
-    .vue-treeselect__control {
-        height: 28px;
-    }
-    .vue-treeselect__label {
-        font-size: 12px;
-    }
-
-    .vue-treeselect__menu-container {
-        z-index: 9999!important;
-    }
-</style>
-
-

src/main/webapp/template/1/default/header.htm

@@ -0,0 +1,44 @@
+<#assign ids=field.parentids>
+<#assign typeid=field.typeid>
+<div class="ms-nav">
+ <div class="body">
+  <div class="logo">
+   <img title="" alt="" src="{ms:global.host/}/{@ms:file global.logo/}" class="logo-pic">
+   <img title="" alt="" src="https://www.mingsoft.net//template/1/ms/images/1596437934982.png" class="logo-desc">
+  </div>
+  <div @click="switchShow([&quot;1605172743000_96378&quot;]);" class="nav-h5">
+   <i class="iconfont icon-caidan nav-h5-icon"></i>
+   <div id="key_1605172743000_96378" class="nav-h5-body" style="display: none">
+    <a href="{ms:global.host/}" class="nav-h5-item"> 首页 </a>
+    {ms:channel flag='nav' type='top'}
+    <a href="<#if field.type==3>{ms:global.url/}${field.typeurl}<#else>{ms:global.url/}${field.typelink}</#if>" class="nav-h5-item <#if typeid==field.typeid || (ids?has_content && ids?index_of('${field.typeid}') gt -1)> sel</#if>">
+     ${field.typetitle}
+    </a>
+    {/ms:channel}
+   </div>
+  </div>
+  <div class="nav-item">
+   <a href="{ms:global.host/}" class="item"> 首页 </a>
+
+   {ms:channel flag='nav' type='top'}
+   <a href="<#if field.type==3>{ms:global.url/}${field.typeurl}<#else>{ms:global.url/}${field.typelink}</#if>" class="item<#if typeid==field.typeid || (ids?has_content && ids?index_of('${field.typeid}') gt -1)> sel</#if>">
+    ${field.typetitle}
+   </a>
+   {/ms:channel}
+  </div>
+  <div class="nav-search">
+   <!--搜索-start-->
+   <form id="searchDataForm" action="{ms:global.host/}/mcms/search.do" method="post" class="ms-search-input">
+    <div class="ms-search-input-div">
+     <!--输入框 - start -->
+     <input class="ms-input" name="content_title" placeholder="输入搜索关键字">
+     <!--输入框 -end -->
+    </div>
+    <div class="ms-search-button" onclick="document.getElementById('searchDataForm').submit();">
+     <i class="iconfont icon-fangdajing"></i>
+    </div>
+   </form>
+   <!--搜索-end-->
+  </div>
+ </div>
+</div>