From b392260a2c2df31535d8409cfc17d86f3d376463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B0=E6=95=A3=E5=9C=A8=E6=97=B6=E5=85=89=E9=87=8C?=
 <954441582@qq.com>
Date: Thu, 9 Jan 2020 11:44:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A0=8F=E7=9B=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E6=B7=BB=E5=8A=A0=E4=B8=8E=E4=BF=AE=E6=94=B9=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=85=E5=AE=B9=E6=A8=A1=E6=9D=BF=E5=92=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A8=A1=E6=9D=BF=E9=80=89=E9=A1=B9=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=202=E3=80=81=E5=88=A0=E9=99=A4=E5=AF=B9=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E7=AE=A1=E7=90=86=E4=B8=AD=E6=A0=8F=E7=9B=AE=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E7=9A=84=E9=95=BF=E5=BA=A6=E9=AA=8C=E8=AF=81=203?=
 =?UTF-8?q?=E3=80=81resources.properties=E5=86=85=E5=AE=B9=E4=B8=8Eresourc?=
 =?UTF-8?q?es=5Fzh=5FCN.properties=E5=86=85=E5=AE=B9=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mingsoft/cms/action/CategoryAction.java   |  8 +---
 .../cms/resources/resources.properties        | 38 ++++++++++++++++---
 .../WEB-INF/manager/cms/category/form.ftl     |  3 ++
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/action/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/CategoryAction.java
index e19633f5..5d2a5f34 100644
--- a/src/main/java/net/mingsoft/cms/action/CategoryAction.java
+++ b/src/main/java/net/mingsoft/cms/action/CategoryAction.java
@@ -163,9 +163,7 @@ public class CategoryAction extends BaseAction{
 		if(!StringUtil.checkLength(category.getCategoryTitle()+"", 1, 100)){
 			return ResultData.build().error(getResString("err.length", this.getResString("category.title"), "1", "100"));
 		}
-		if(!StringUtil.checkLength(category.getCategoryFlag()+"", 1, 100)){
-			return ResultData.build().error(getResString("err.length", this.getResString("category.flag"), "1", "100"));
-		}
+
 		if(!StringUtil.checkLength(category.getCategoryPath()+"", 1, 100)){
 			return ResultData.build().error(getResString("err.length", this.getResString("category.path"), "1", "100"));
 		}
@@ -236,9 +234,7 @@ public class CategoryAction extends BaseAction{
 		if(!StringUtil.checkLength(category.getCategoryTitle()+"", 1, 100)){
 			return ResultData.build().error(getResString("err.length", this.getResString("category.title"), "1", "100"));
 		}
-		if(!StringUtil.checkLength(category.getCategoryFlag()+"", 0, 100)){
-			return ResultData.build().error(getResString("err.length", this.getResString("category.flag"), "1", "100"));
-		}
+
 		if(!StringUtil.checkLength(category.getCategoryPath()+"", 0, 100)){
 			return ResultData.build().error(getResString("err.length", this.getResString("category.path"), "1", "100"));
 		}
diff --git a/src/main/java/net/mingsoft/cms/resources/resources.properties b/src/main/java/net/mingsoft/cms/resources/resources.properties
index fcdcae2b..61730331 100644
--- a/src/main/java/net/mingsoft/cms/resources/resources.properties
+++ b/src/main/java/net/mingsoft/cms/resources/resources.properties
@@ -1,7 +1,35 @@
 #
-#Mon Dec 23 09:24:03 CST 2019
-content.id=\u6587\u7AE0\u7F16\u53F7
-hl.ip=\u6D4F\u89C8ip
-hl.people.id=\u7528\u6237id
-hl.is.mobile=\u662F\u5426\u4E3A\u79FB\u52A8\u7AEF
+#Thu Nov 28 15:12:32 CST 2019
+category.img=\u7F29\u7565\u56FE
+appid=\u6587\u7AE0\u7BA1\u7406\u7684\u5E94\u7528id
+content.datetime=\u53D1\u5E03\u65F6\u95F4
+category.manager.id=\u53D1\u5E03\u7528\u6237id
+category.title=\u680F\u76EE\u7BA1\u7406\u540D\u79F0
+category.keyword=\u680F\u76EE\u7BA1\u7406\u5173\u952E\u5B57
+content.img=\u6587\u7AE0\u7F29\u7565\u56FE
+category.path=\u680F\u76EE\u8DEF\u5F84
+content.type=\u6587\u7AE0\u7C7B\u578B
+category.url=\u5185\u5BB9\u6A21\u677F
+dict.id=\u5B57\u5178\u5BF9\u5E94\u7F16\u53F7
+content.author=\u6587\u7AE0\u4F5C\u8005
+category.parent.id=\u7236\u7C7B\u578B\u7F16\u53F7
+category.datetime=\u7C7B\u522B\u53D1\u5E03\u65F6\u95F4
+category.flag=\u680F\u76EE\u5C5E\u6027
+content.description=\u63CF\u8FF0
+content.url=\u6587\u7AE0\u8DF3\u8F6C\u94FE\u63A5\u5730\u5740
+category.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
+content.title=\u6587\u7AE0\u6807\u9898
+content.category.id=\u6240\u5C5E\u680F\u76EE
 id=\u7F16\u53F7
+app.id=\u5E94\u7528\u7F16\u53F7
+category.list.url=\u5217\u8868\u6A21\u677F
+mdiy.model.id=\u680F\u76EE\u7BA1\u7406\u7684\u5185\u5BB9\u6A21\u578Bid
+content.source=\u6587\u7AE0\u6765\u6E90
+content.display=\u662F\u5426\u663E\u793A
+category.type=\u680F\u76EE\u7BA1\u7406\u5C5E\u6027
+category.descrip=\u680F\u76EE\u7BA1\u7406\u63CF\u8FF0
+content.details=\u6587\u7AE0\u5185\u5BB9
+category.id=\u6240\u5C5E\u680F\u76EE
+content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
+category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
+content.keyword=\u5173\u952E\u5B57
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 ab65da89..bddeb308 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -283,6 +283,9 @@
                         "required": true,
                         "message": "请选择栏目管理名称"
                     }, {"pattern": /^[^[!@#$%^&*()_+-/~?！@#￥%…&*（）——+—？》《：“‘’]+$/, "message": "栏目管理名称格式不匹配"}],
+                    categoryListUrl: [{"required":true,"message":"请选择列表模板"}],
+                    // 内容模板
+                    categoryUrl: [{"required":true,"message":"请选择内容模板"}],
                 },
 
             }