From 5be80533b1d08413a1f5ba9ca8005bb3798cf299 Mon Sep 17 00:00:00 2001
From: sgjj <995959152@qq.com>
Date: Wed, 1 Jul 2020 08:54:11 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=A0=8F=E7=9B=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/manager/cms/category/form.ftl     | 39 +++++++------------
 1 file changed, 13 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
index d6f676bb..a7c26d55 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -3,9 +3,6 @@
 <head>
     <title>分类</title>
     <#include "../../include/head-file.ftl">
-    <script src="${base}/static/locale/lang/cms/category/ch.js"></script>
-    <script src="${base}/static/locale/lang/cms/category/en.js"></script>
-
 </head>
 <body>
 <div id="form" v-cloak>
@@ -22,7 +19,7 @@
                         justify="start" align="top">
                     <el-col span="12">
                         <el-form-item label="栏目管理名称" prop="categoryTitle">
-                            <template slot='label'>{{$t('form.categoryTitle.text')}}
+                            <template slot='label'>栏目管理名称
                                 <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
                                     <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
                                        target="_blank">{ms:field.typetitle/}</a>
@@ -35,12 +32,12 @@
                                       :disabled="false"
                                       :style="{width:  '100%'}"
                                       :clearable="true"
-                                      :placeholder="$t('form.categoryTitle.placeholder')">
+                                      placeholder="请输入栏目管理名称">
                             </el-input>
                         </el-form-item>
                     </el-col>
                     <el-col span="12">
-                        <el-form-item :label="$t('form.categoryId')" prop="categoryId">
+                        <el-form-item label="所属栏目" prop="categoryId">
                             <tree-select ref="tree" :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
                                          :options="treeList" :style="{width:'100%'}"
                                          v-model="form.categoryId"></tree-select>
@@ -52,7 +49,7 @@
                         justify="start" align="top">
                     <el-col span="12">
                         <el-form-item prop="categoryType">
-                            <template slot='label'>{{$t('form.categoryType')}}
+                            <template slot='label'>栏目类型
                                 <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
                                     列表：常用于带列表、详情的业务，例如：新闻列表、图片列表<br>封面：常用单篇文章显示，例如：关于我们、公司介绍<br>修改栏目时如果该栏目存在文章则不能修改栏目类型
                                     <i class="el-icon-question" slot="reference"></i>
@@ -69,7 +66,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col span="12">
-                        <el-form-item :label="$t('form.categorySort')" prop="categorySort">
+                        <el-form-item label="自定义顺序" prop="categorySort">
                             <el-input-number
                                     v-model="form.categorySort"
                                     :disabled="false"
@@ -82,7 +79,7 @@
                         gutter="0"
                         justify="start" align="top">
                     <el-col span="12">
-                        <el-form-item prop="categoryUrl" :label=" $tc('form.categoryUrl',form.categoryType)">
+                        <el-form-item prop="categoryUrl" :label="form.categoryType =='1'? '内容模板' : '封面模板'">
                             <el-select v-model="form.categoryUrl"
                                        :style="{width: '100%'}"
                                        :filterable="true"
@@ -96,7 +93,7 @@
                     </el-col>
                     <el-col span="12">
                         <el-form-item prop="mdiyModelId">
-                            <template slot='label'>{{$t('form.mdiyModelId')}}
+                            <template slot='label'>自定义模型
                                 <el-popover slot="label" placement="top-start" title="提示" width="400" trigger="hover"
                                             content="如果发布时候文章字段信息不够，可以采用铭飞代码生成器生成自定义模型，再通过“自定义管理->自定义模型->导入”功能导入模型，注意类型是cms">
                                     <i class="el-icon-question" slot="reference"></i>
@@ -117,7 +114,7 @@
                 <el-row gutter="0" justify="start" align="top">
                     <el-col span="12">
                         <el-form-item prop="categoryListUrl" v-if="form.categoryType == '1'">
-                            <template slot='label'>{{$t('form.categoryListUrl')}}
+                            <template slot='label'>列表模板
                                 <el-popover slot="label" placement="top-start" title="提示" trigger="hover"
                                             content="当栏目类型为列表时有效">
                                     <i class="el-icon-question" slot="reference"></i>
@@ -136,7 +133,7 @@
                     </el-col>
                     <el-col span="12">
                         <el-form-item  label="栏目属性" prop="categoryFlag">
-                            <template slot='label'>{{$t('form.categoryFlag')}}
+                            <template slot='label'>栏目属性
                                 <el-popover placement="top-start" title="提示" trigger="hover" content="类型不满足可以在自定义字典菜单中新增,字段类型为“栏目属性”">
                                     <i class="el-icon-question" slot="reference"></i>
                                 </el-popover>
@@ -154,7 +151,7 @@
                     </el-col>
                 </el-row>
                 <el-form-item label="栏目管理关键字" prop="categoryKeyword">
-                    <template slot='label'>{{$t('form.categoryKeyword')}}
+                    <template slot='label'>栏目关键字
                         <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
                             <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
                                target="_blank">[field.typekeyword/]</a>
@@ -170,7 +167,7 @@
                     </el-input>
                 </el-form-item>
                 <el-form-item label="栏目管理描述" prop="categoryDescrip">
-                    <template slot='label'>{{$t('form.categoryDescrip')}}
+                    <template slot='label'>栏目描述
                         <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
                             <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
                                target="_blank">[field.typedescrip/]</a>
@@ -186,7 +183,7 @@
                     </el-input>
                 </el-form-item>
                 <el-form-item label="" prop="categoryImg">
-                    <template slot='label'>{{$t('form.categoryImg')}}
+                    <template slot='label'>缩略图
                         <el-popover slot="label" placement="top-start" title="提示"  trigger="hover">
                             <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html"
                                target="_blank">{ms:field.typelitpic/}</a>
@@ -212,7 +209,7 @@
                     </el-upload>
                 </el-form-item>
                 <el-form-item prop="categoryDiyUrl">
-                    <template slot='label'>{{$t('form.categoryDiyUrl')}}
+                    <template slot='label'>自定义链接
                         <el-popover slot="label" placement="top-start" title="提示" trigger="hover">
                             <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html"
                                target="_blank">[field.typeurl/]</a>
@@ -233,17 +230,10 @@
 </body>
 </html>
 <script>
-
-    var i18n = new VueI18n({
-        locale: parent.indexVue.locale.language, // 设置地区
-        messages:Object.assign({}, localeCh, localeEn)
-    })
     var form = new Vue({
-        i18n:i18n,
         el: '#form',
         data: function () {
             return {
-                locale:parent.indexVue.locale,
                 treeList: [{
                     id: '0',
                     categoryTitle: '顶级栏目',
@@ -312,9 +302,6 @@
             };
         },
         watch: {
-            'locale.language':function (n,o) {
-                this.$i18n.locale = n
-            },
             'form.categoryId': function (n, o) {
                 var _this = this;
 

From db3741229e988be6f68881a5301899593ed76d3c Mon Sep 17 00:00:00 2001
From: panpp <805820766@qq.com>
Date: Wed, 1 Jul 2020 09:16:12 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BA=86ftl=20=E7=9A=84?=
 =?UTF-8?q?=E4=B8=80=E5=A4=84=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/mingsoft/cms/util/CmsParserUtil.java     | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
index 1d77912d..e3353cee 100644
--- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
+++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
@@ -66,17 +66,7 @@ public class CmsParserUtil extends ParserUtil {
 	 */
 	public static void generateList(CategoryEntity column, int articleIdTotal)
 			throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException {
-		// 只初始化一次cfg
-		if (ftl == null) {
-			ftl = new FileTemplateLoader(new File(ParserUtil.buildTempletPath()));
-			cfg.setTemplateLoader(ftl);
-		}
-		// 移动端模板
 		try{
-			Template mobileTemplate = cfg.getTemplate(
-					BasicUtil.getApp().getAppMobileStyle() + File.separator + column.getCategoryListUrl(), Const.UTF8);
-			// pc端模板
-
 			// 文章的栏目模型编号
 			String columnContentModelId = column.getMdiyModelId();
 			PageBean page = new PageBean();
@@ -87,7 +77,6 @@ public class CmsParserUtil extends ParserUtil {
 			//获取总数
 
 			String columnListPath;
-			String mobilePath;
 			ModelEntity contentModel = null;
 			// 判断当前栏目是否有自定义模型
 			if (StringUtils.isNotBlank(columnContentModelId)) {

From c4bcf2b999cbc889b7ede5cc20f8e3b31b922d5f Mon Sep 17 00:00:00 2001
From: panpp <805820766@qq.com>
Date: Wed, 1 Jul 2020 14:08:53 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B8=B8?=
 =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/manager/main.ftl | 62 +++++++++++++-----------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/main/webapp/WEB-INF/manager/main.ftl b/src/main/webapp/WEB-INF/manager/main.ftl
index 50acb312..19c41652 100644
--- a/src/main/webapp/WEB-INF/manager/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/main.ftl
@@ -43,8 +43,7 @@
         </div>
         <div  class="class-6" >
         </div>
-        <div  class="class-7" >
-          <div class="panel">
+        <div  class="panel" >
             <div  v-if="alwaysList.length>0" class="panel-title">
               常用功能
             </div>
@@ -61,9 +60,6 @@
                 <!--文本结束-->
               </div>
             </div>
-
-          </div>
-
         </div>
         <!--大容器开始-->
         <div  class="class-43" >
@@ -466,36 +462,40 @@
   });
 </script>
 <style>
-  .panel-content .mitem {
-    color: #333333;
-    cursor: pointer;
-    outline-offset: -1px;
-    height: 88px;
-    flex-direction: column;
-    display: flex;
-    animation-duration: 1s;
-    width: 88px;
-    background-repeat: no-repeat;
-    align-items: center;
-
-  }
-  .panel .panel-content .mitem:hover i ,.panel .panel-content .mitem:hover .item-title{
-    color:#409EFF
-  }
-  .panel-content .mitem i {
-    font-size: 36px;
-  }
   .panel {
+    margin-top:10px;
     color: #333333;
-    padding: 10px;
+    padding-right:20px;
+    padding-top:20px;
+    max-width:100%;
+    padding-left:20px;
     outline-offset: -1px;
-    flex: 1;
     background-color: rgba(255, 255, 255, 1);
     flex-direction: column;
     display: flex;
     animation-duration: 1s;
     background-repeat: no-repeat;
   }
+  .panel .panel-content .mitem:hover i ,.panel .panel-content .mitem:hover .item-title{
+    color:#409EFF
+  }
+  .panel-content .mitem i {
+    font-size: 40px;
+  }
+  .panel-content .mitem {
+    color: #333333;
+    cursor: pointer;
+    outline-offset: -1px;
+    max-width:100%;
+    height: 69px;
+    flex-direction: column;
+    display: flex;
+    animation-duration: 1s;
+    width: 25%;
+    background-repeat: no-repeat;
+    align-items: center;
+    margin-bottom:20px;
+  }
   .panel .panel-title {
     color: #333333;
     word-wrap: break-word;
@@ -503,8 +503,6 @@
     display: inline-block;
     animation-duration: 1s;
     font-size: 16px;
-    padding-left: 10px;
-    margin-top: 5px;
   }
   .panel .panel-content {
     color: #333333;
@@ -521,6 +519,14 @@
     padding-left: 10px;
     background-repeat: no-repeat;
   }
+  .panel .panel-content .mitem .item-title{
+    color:#333333;
+    word-wrap:break-word;
+    display:inline-block;
+    animation-duration:1s;
+    font-size:14px;
+    line-height:1.4;
+  }
   .custom-body {
   }
   .class-1

From a41d33740dc783b361a3ea37b762b3318820f21d Mon Sep 17 00:00:00 2001
From: luoxj <1227731421@qq.com>
Date: Thu, 2 Jul 2020 08:40:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/manager/index.ftl         | 15 ---------------
 src/main/webapp/static/ms-admin/5.0.0/css/app.css |  1 -
 .../webapp/static/ms-admin/5.0.0/css/index.css    |  2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index e9517fb7..9af6daf6 100644
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -192,8 +192,6 @@
             collapseMenu: false, //菜单折叠，false不折叠
             currentTab: '工作台', //当前激活tab的name
             tabIndex: 1,
-            // markList:
-            // ['项目管理', '组织管理', '客户管理', '合同管理', '印章管理', '绩效管理', '权限管理', '系统设置'],
             markList: [
                 {title: "权限管理", icon: "icon-wode", hide: true},
                 {title: "系统设置", icon: "icon-xitongguanli", hide: true},
@@ -310,18 +308,6 @@
                 })
 
             },
-            <#--connect: function () {-->
-            <#--    var that = this-->
-            <#--    var sockjs = new SockJS("/websocket");-->
-            <#--    var stompClient = Stomp.over(sockjs);-->
-            <#--    stompClient.connect({}, function (frame) {-->
-            <#--        stompClient.subscribe('/topic/message/' +${Session.manager_session.managerId}, function (greeting) {-->
-            <#--            if (greeting.body == "list") {-->
-            <#--                that.getMessage()-->
-            <#--            }-->
-            <#--        });-->
-            <#--    });-->
-            <#--},-->
             markMenu: function (title, icon) {
                 var menu = {
                     title: title,
@@ -571,7 +557,6 @@
             //setInterval(this.getMessage,3000)
             // 菜单列表
             this.list();
-            // this.connect();
             //获取登录用户信息
             this.managerGet();
             var that = this;
diff --git a/src/main/webapp/static/ms-admin/5.0.0/css/app.css b/src/main/webapp/static/ms-admin/5.0.0/css/app.css
index 9c2b4ebc..ba1179b6 100644
--- a/src/main/webapp/static/ms-admin/5.0.0/css/app.css
+++ b/src/main/webapp/static/ms-admin/5.0.0/css/app.css
@@ -134,7 +134,6 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
 .ms-index .el-menu {
     border-right: none;
     background-color: unset;
-    height: calc(100vh - 141px);
 }
 .ms-index .el-menu-item {
     white-space: nowrap;
diff --git a/src/main/webapp/static/ms-admin/5.0.0/css/index.css b/src/main/webapp/static/ms-admin/5.0.0/css/index.css
index cdf16b1a..34d8204c 100644
--- a/src/main/webapp/static/ms-admin/5.0.0/css/index.css
+++ b/src/main/webapp/static/ms-admin/5.0.0/css/index.css
@@ -86,7 +86,7 @@ textarea::-webkit-input-placeholder {
   height: 50px;
 }
 .ms-header button {
-  height: 30px;
+  /*height: 30px;*/
 }
 .ms-pagination {
   padding: 20px 0;

From fc144a457dfc75bf9c2e3f7ba7feae687afa6713 Mon Sep 17 00:00:00 2001
From: panpp <805820766@qq.com>
Date: Thu, 2 Jul 2020 08:47:17 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86ms.util=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/static/plugins/ms/1.0.0/ms.util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/static/plugins/ms/1.0.0/ms.util.js b/src/main/webapp/static/plugins/ms/1.0.0/ms.util.js
index 137ac3cb..b927978c 100644
--- a/src/main/webapp/static/plugins/ms/1.0.0/ms.util.js
+++ b/src/main/webapp/static/plugins/ms/1.0.0/ms.util.js
@@ -62,7 +62,7 @@
         fmt: function(de, fmt) {
             var date = new Date(typeof de == "string"?de.replace(/-/g, "/"):de);
             if (!fmt) {
-                fmt = "yyyy-mm-dd";
+                fmt = "yyyy-MM-dd";
             }
             var o = {
                 "M+": date.getMonth() + 1, //月份
