up：5.3.6

Signed-off-by: mingsoft <killfen@126.com>

src/main/java/net/mingsoft/MSApplication.java

@@ -19,8 +19,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-
 package net.mingsoft;
 
 import org.mybatis.spring.annotation.MapperScan;

src/main/java/net/mingsoft/MSServletInitializer.java

@@ -19,8 +19,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-
 package net.mingsoft;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/net/mingsoft/cms/action/BaseAction.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.action;
 
 import java.util.MissingResourceException;

src/main/java/net/mingsoft/cms/action/CategoryAction.java

@@ -7,10 +7,10 @@
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
-
+ * <p>
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
-
+ * <p>
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.action;
 
 import cn.hutool.core.io.file.FileNameUtil;

src/main/java/net/mingsoft/cms/action/ContentAction.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.action;
 
 import io.swagger.annotations.Api;

src/main/java/net/mingsoft/cms/action/GeneraterAction.java

@@ -22,8 +22,6 @@
 
 
 
-
-
 package net.mingsoft.cms.action;
 
 import cn.hutool.core.bean.BeanUtil;

src/main/java/net/mingsoft/cms/action/web/CategoryAction.java

@@ -1,25 +1,23 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012-present 铭软科技(mingsoft.net)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 
 package net.mingsoft.cms.action.web;
@@ -63,7 +61,24 @@ public class CategoryAction extends net.mingsoft.cms.action.BaseAction{
 	 */
 	@ApiOperation(value = "查询分类列表接口")
 	@ApiImplicitParams({
+    	@ApiImplicitParam(name = "id", value = "栏目管理ID", required =false,paramType="query"),
     	@ApiImplicitParam(name = "categoryTitle", value = "栏目管理名称", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryShortTitle", value = "栏目管理副标题", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryPinyin", value = "栏目管理别名", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryId", value = "所属栏目id", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryType", value = "栏目管理属性", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryListUrl", value = "列表模板", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryUrl", value = "内容模板", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryKeyword", value = "栏目管理关键字", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryDescrip", value = "栏目管理描述", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "mdiyModelId", value = "文章管理的内容模型id", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "dictId", value = "字典对应编号", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryFlag", value = "栏目属性", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryPath", value = "栏目路径", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryParentIds", value = "父类型编号", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "leaf", value = "叶子节点", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "topId", value = "顶级id", required =false,paramType="query"),
     })
 	@PostMapping(value="/list")
 	@ResponseBody

src/main/java/net/mingsoft/cms/action/web/ContentAction.java

@@ -1,25 +1,23 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012-present 铭软科技(mingsoft.net)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 
 package net.mingsoft.cms.action.web;
@@ -73,15 +71,26 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{
 	 */
 	@ApiOperation(value = "查询文章列表接口")
 	@ApiImplicitParams({
+    	@ApiImplicitParam(name = "id", value = "文章id", required =false,paramType="query"),
     	@ApiImplicitParam(name = "contentTitle", value = "文章标题", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentShortTitle", value = "文章副标题", required =false,paramType="query"),
     	@ApiImplicitParam(name = "categoryId", value = "所属栏目", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "contentType", value = "文章类型", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "flag", value = "文章类型", required =false,paramType="query"),
+		@ApiImplicitParam(name = "contentType", value = "文章类型", required =false,paramType="query"),
+		@ApiImplicitParam(name = "contentAuthor", value = "文章作者", required =false,paramType="query"),
+		@ApiImplicitParam(name = "contentSource", value = "文章来源", required =false,paramType="query"),
+		@ApiImplicitParam(name = "contentDatetime", value = "发布时间", required =false,paramType="query"),
+		@ApiImplicitParam(name = "contentTags", value = "文章标签", required =false,paramType="query"),
+		@ApiImplicitParam(name = "contentDescription", value = "描述", required =false,paramType="query"),
+		@ApiImplicitParam(name = "contentKeyword", value = "关键字", required =false,paramType="query"),
+		@ApiImplicitParam(name = "contentDetails", value = "文章内容", required =false,paramType="query"),
+		@ApiImplicitParam(name = "contentOutLink", value = "文章跳转链接地址", required =false,paramType="query"),
+		@ApiImplicitParam(name = "contentHit", value = "点击次数", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryType", value = "栏目类型", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryFlag", value = "栏目属性", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "flag", value = "属性标记", required =false,paramType="query"),
     	@ApiImplicitParam(name = "noflag", value = "排除文章类型", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "contentDisplay", value = "是否显示", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "contentAuthor", value = "文章作者", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "contentSource", value = "文章来源", required =false,paramType="query"),
-    	@ApiImplicitParam(name = "contentDatetime", value = "发布时间", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "hasDetailHtml", value = "文章是否被静态化", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "hasListHtml", value = "栏目是否被静态化", required =false,paramType="query"),
     })
 	@RequestMapping(value = "/list",method = {RequestMethod.GET,RequestMethod.POST})
 	@ResponseBody

src/main/java/net/mingsoft/cms/action/web/MCmsAction.java

@@ -19,8 +19,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-
 package net.mingsoft.cms.action.web;
 
 import cn.hutool.core.util.ObjectUtil;

src/main/java/net/mingsoft/cms/aop/CategoryAop.java

@@ -20,7 +20,6 @@
  */
 
 
-
 package net.mingsoft.cms.aop;
 
 import cn.hutool.core.collection.CollectionUtil;

src/main/java/net/mingsoft/cms/aop/ContentAop.java

@@ -7,10 +7,10 @@
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
-
+ * <p>
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
-
+ * <p>
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.aop;
 
 import cn.hutool.core.io.FileUtil;

src/main/java/net/mingsoft/cms/bean/CategoryBean.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.bean;
 
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/net/mingsoft/cms/bean/ContentBean.java

@@ -1,25 +1,23 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012-present 铭软科技(mingsoft.net)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 
 package net.mingsoft.cms.bean;

src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.biz;
 
 import net.mingsoft.base.biz.IBaseBiz;

src/main/java/net/mingsoft/cms/biz/IContentBiz.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.biz;
 
 import net.mingsoft.base.biz.IBaseBiz;

src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.biz;
 
 import net.mingsoft.base.biz.IBaseBiz;

src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java

@@ -22,8 +22,6 @@
 
 
 
-
-
 package net.mingsoft.cms.biz.impl;
 
 import cn.hutool.core.collection.CollUtil;

src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java

@@ -22,8 +22,6 @@
 
 
 
-
-
 package net.mingsoft.cms.biz.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java

@@ -1,25 +1,23 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012-present 铭软科技(mingsoft.net)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 
 

src/main/java/net/mingsoft/cms/constant/Const.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.constant;
 
 /**

src/main/java/net/mingsoft/cms/constant/e/CategoryDisplayEnum.java

@@ -19,8 +19,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-
 package net.mingsoft.cms.constant.e;
 
 import net.mingsoft.base.constant.e.BaseEnum;

src/main/java/net/mingsoft/cms/constant/e/CategoryIsSearchEnum.java

@@ -20,7 +20,6 @@
  */
 
 
-
 package net.mingsoft.cms.constant.e;
 
 import net.mingsoft.base.constant.e.BaseEnum;

src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java

@@ -21,8 +21,6 @@
 
 
 
-
-
 package net.mingsoft.cms.constant.e;
 
 import net.mingsoft.base.constant.e.BaseEnum;

src/main/java/net/mingsoft/cms/constant/e/ContentEnum.java

@@ -19,6 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+
 package net.mingsoft.cms.constant.e;
 
 import net.mingsoft.base.constant.e.BaseEnum;

src/main/java/net/mingsoft/cms/dao/ICategoryDao.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.dao;
 
 import net.mingsoft.base.dao.IBaseDao;

src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.dao;
 
 import net.mingsoft.base.dao.IBaseDao;

src/main/java/net/mingsoft/cms/dao/IContentDao.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.dao;
 
 import net.mingsoft.base.dao.IBaseDao;

src/main/java/net/mingsoft/cms/entity/CategoryEntity.java

@@ -7,10 +7,10 @@
  * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
-
+ * <p>
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
-
+ * <p>
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.entity;
 
 import cn.hutool.core.util.BooleanUtil;
@@ -534,6 +532,13 @@ public class CategoryEntity extends BaseEntity {
         return this.categoryType;
     }
 
+    /**
+     * 获取栏目副标题 (标签使用)
+     */
+    public String getTypeshorttitle(){
+        return this.categoryShortTitle;
+    }
+
     /**
      * 获取子分类数量 (标签使用）
      */

src/main/java/net/mingsoft/cms/entity/ContentEntity.java

@@ -1,25 +1,23 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012-present 铭软科技(mingsoft.net)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 
 package net.mingsoft.cms.entity;

src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java

@@ -1,25 +1,23 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012-present 铭软科技(mingsoft.net)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 
 package net.mingsoft.cms.entity;

src/main/java/net/mingsoft/cms/resources/resources_en_US.properties

@@ -36,3 +36,4 @@ content.keyword=keyword
 template.file=template file not found
 category.pinyin=pinyin
 datetime.format=datatime format
+cannot.select.child=cannot select child node

src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties

@@ -36,4 +36,5 @@ content.keyword=\u5173\u952E\u5B57
 template.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6
 category.pinyin=\u62FC\u97F3
 datetime.format=\u65F6\u95F4\u683C\u5F0F
+cannot.select.child=\u65e0\u6cd5\u9009\u62e9\u5b50\u8282\u70b9
 

src/main/java/net/mingsoft/cms/util/CmsParserUtil.java

@@ -20,8 +20,6 @@
  */
 
 
-
-
 package net.mingsoft.cms.util;
 
 import cn.hutool.core.io.FileUtil;

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

@@ -19,8 +19,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-
 package net.mingsoft.config;
 
 import cn.hutool.core.util.StrUtil;

src/main/resources/application.yml

@@ -10,6 +10,7 @@ server:
   error:
     include-exception: true
     include-message: always
+
 #  ssl: #https证书配置 配置了之后只能通过https访问应用
 #    key-store: xxx.pfx 证书文件，证书文件格式具体参考证书分发平台
 #    key-store-password:  1234 证书密码
@@ -29,6 +30,7 @@ ms:
     exclude-url: /ms/**,/static/**,/template/**,/file/upload.do,/static/plugins/ueditor/1.4.3.3/jsp/editor.do
     #过滤的参数名,多个用逗号分开 默认排除菜单、自定模型JSON、模版内容、文章内容，具体根据需要配置其他字段
     exclude-filed: menuStr,modelField,modelUrl,modelJson,fileContent,contentDetails
+    # shiro-key:  #16位长度，不填写默认随机生成
 
   diy:
     html-dir: html

src/main/webapp/WEB-INF/manager/cms/category/form.ftl

@@ -8,10 +8,10 @@
 <div id="form" v-cloak>
     <el-header class="ms-header ms-tr" height="50px">
         <@shiro.hasPermission name="cms:category:save">
-            <el-button type="primary" icon="iconfont icon-baocun" size="mini" @click="save()" :loading="saveDisabled">保存
+            <el-button type="primary" class="iconfont icon-baocun" size="mini" @click="save()" :loading="saveDisabled">保存
             </el-button>
         </@shiro.hasPermission>
-        <el-button size="mini" icon="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回</el-button>
+        <el-button size="mini" class="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回</el-button>
     </el-header>
     <el-main class="ms-container">
 
@@ -41,10 +41,10 @@
                             <el-col :span=12>
                                 <el-form-item label="所属栏目" prop="categoryId">
                                     <ms-tree-select  ref="tree"
-                                                    :key="treeKey"
-                                                    :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
-                                                    :options="treeList" :style="{width:'100%'}"
-                                                    v-model="form.categoryId"></ms-tree-select>
+                                                     :key="treeKey"
+                                                     :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
+                                                     :options="treeList" :style="{width:'100%'}"
+                                                     v-model:value="form.categoryId"></ms-tree-select>
                                     <div class="ms-form-tip">
                                         不能将父级别栏目移动到自身子级栏目
                                     </div>
@@ -84,7 +84,13 @@
                                         可以在自定义字典中管理
                                     </div>
                                 </el-form-item>
-
+                                <el-form-item label="自定义顺序" prop="categorySort">
+                                    <el-input-number
+                                            v-model="form.categorySort"
+                                            :disabled="false"
+                                            controls-position="">
+                                    </el-input-number>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row
@@ -245,13 +251,7 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span=12>
-                                <el-form-item label="自定义顺序" prop="categorySort">
-                                    <el-input-number
-                                            v-model="form.categorySort"
-                                            :disabled="false"
-                                            controls-position="">
-                                    </el-input-number>
-                                </el-form-item>
+
                             </el-col>
 
 
@@ -299,11 +299,13 @@
                                     accept="image/*"
                                     list-type="picture-card">
                                 <i class="el-icon-plus"></i>
-                                <div slot="tip" class="ms-form-tip">
-                                    只能上传1张图片
-                                    标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/lan-mu-lie-biao-ms-channel.html"
-                                          target="_blank"><#noparse>{@ms:file field.typelitpic/}</#noparse></a><br/>
-                                </div>
+                                <template slot="tip">
+                                    <div class="ms-form-tip">
+                                        只能上传1张图片
+                                        标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                                              target="_blank"><#noparse>{@ms:file field.typelitpic/}</#noparse></a><br/>
+                                    </div>
+                                </template>
                             </el-upload>
                         </el-form-item>
                         <el-form-item label="栏目小图" prop="categoryIco">
@@ -321,15 +323,17 @@
                                     accept="image/*"
                                     list-type="picture-card">
                                 <i class="el-icon-plus"></i>
-                                <div slot="tip" class="ms-form-tip">
-                                    只能上传1张图片
-                                    标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/lan-mu-lie-biao-ms-channel.html"
-                                          target="_blank"><#noparse>{@ms:file field.typeico/}</#noparse></a><br/>
-                                </div>
+                                <template slot="tip">
+                                    <div class="ms-form-tip">
+                                        只能上传1张图片
+                                        标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/lan-mu-lie-biao-ms-channel.html"
+                                              target="_blank"><#noparse>{@ms:file field.typeico/}</#noparse></a><br/>
+                                    </div>
+                                </template>
                             </el-upload>
                         </el-form-item>
                     </el-form>
-                    <div :id="'model'+index" v-else></div>
+
                 </el-tab-pane>
             </el-tabs>
         </el-scrollbar>
@@ -658,6 +662,7 @@
                 });
             },
 
+
             //获取当前分类
             get: function (id) {
                 var that = this;
@@ -828,10 +833,12 @@
                     title: '加载中...',
                     name: 'custom-name'
                 });
+
             },
 
         },
         created: function () {
+
             this.queryColumnContentModelList();
             this.queryCategoryModelList();
             this.getTree();
@@ -840,6 +847,7 @@
             this.categoryFlagOptionsGet();
             this.form.id = ms.util.getParameter("id");
             this.form.childId = ms.util.getParameter("childId");// 判断是否增加子栏目
+            this.form.categoryId = '0';
             // 判断三种状态，默认为新增状态
             this.categoryTypeDisabled = false;// 控制栏目分类是否可编辑
             if (this.form.id != undefined && (this.form.childId == undefined || this.form.childId == "undefined")) {
@@ -852,13 +860,11 @@
                 this.form.categoryId = this.form.childId;
             }
         }
+
     });
 </script>
 <style>
     .el-select {
         width: 100%;
     }
-</style>
-
-
-
+</style>

src/main/webapp/WEB-INF/manager/cms/category/index.ftl

@@ -124,7 +124,7 @@
                     "label": "列表"
                 }, {
                     "value": "2",
-                    "label": "封面"
+                    "label": "单篇"
                 }, {
                     "value": "3",
                     "label": "链接"

src/main/webapp/WEB-INF/manager/cms/content/form.ftl

@@ -13,14 +13,14 @@
                 <el-tooltip class="item" effect="dark" :content="form.id" placement="top-start">
                     <span v-if="form.id && categoryType=='2'" style="float: left; max-width:calc(30% - 40px);" class="header-info">编号：{{form.id}}</span>
                 </el-tooltip>
-                <el-button v-if="form.id && categoryType=='2'" type="text" style="float: left" icon="el-icon-document-copy" circle :data-clipboard-text="form.id" @click="copyString()" class="copyBtn"></el-button>
+                <el-button v-if="form.id && categoryType=='2'" type="text" link style="float: left" icon="el-icon-document-copy" circle :data-clipboard-text="form.id" @click="copyString()" class="copyBtn"></el-button>
             </el-col>
             <el-col :xs=12 :sm=10 :md=8 :lg=6 :xl=6 class="ms-tr">
                 <@shiro.hasPermission name="cms:content:save">
-                    <el-button type="primary" icon="iconfont icon-baocun" size="mini" @click="save()" :loading="saveDisabled">保存
+                    <el-button type="primary" class="iconfont icon-baocun" size="mini" @click="save()" :loading="saveDisabled">保存
                     </el-button>
                 </@shiro.hasPermission>
-                <el-button v-if="categoryType==1" size="mini" icon="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回
+                <el-button v-if="categoryType==1" size="mini" class="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回
                 </el-button>
                 <el-button v-if="categoryType==2" size="mini" type="danger" icon="el-icon-delete" @click="del()">删除
                 </el-button>
@@ -225,14 +225,16 @@
                                             accept="image/*"
                                             list-type="picture-card">
                                         <i class="el-icon-plus"></i>
-                                        <div slot="tip" class="ms-form-tip">
-                                            标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'{@ms:file field.litpic/}'}</a><br/>
-                                            最多可上传10张图片，文章缩略图,支持jpg格式；多图情况下，{@ms:file field.litpic/}会只取第一张缩略图，其他用法参考文档arclist标签
-                                        </div>
+                                        <template slot="tip">
+                                            <div class="ms-form-tip">
+                                                标签：<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'{@ms:file field.litpic/}'}</a><br/>
+                                                最多可上传10张图片，文章缩略图,支持jpg格式；多图情况下，{@ms:file field.litpic/}会只取第一张缩略图，其他用法参考文档arclist标签
+                                            </div>
+                                        </template>
                                     </el-upload>
                                 </el-form-item>
                             </el-col>
-                            <el-col span=12>
+                            <el-col :span=12>
                                 <el-form-item label="文章标签" prop="contentTags">
                                     <el-select v-model="form.contentTags"
                                                :style="{width: '100%'}"
@@ -311,7 +313,19 @@
                     title: '文章编辑',
                     name: 'form'
                 }],
-                editorConfig: ms.editorConfig,
+                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:\'/${app.id}/editor/%7Btime%7D\',filePathFormat:\'/${app.id}/editor/%7Btime%7D\',videoPathFormat:\'/${app.id}/editor/%7Btime%7D\'%7D",
+                    UEDITOR_HOME_URL: ms.base + '/static/plugins/ueditor/1.4.3.3/'
+                },
                 contentCategoryIdOptions: [],
                 returnIsShow: true,
                 type: '',
@@ -675,7 +689,7 @@
                     }
                 });
             },
-            //获取contentType数据源
+            //获取contentTag数据源
             contentTagsOptionsGet: function () {
                 var that = this;
                 ms.http.get(ms.base + '/mdiy/dict/list.do', {

src/main/webapp/WEB-INF/manager/cms/content/index.ftl

@@ -22,9 +22,11 @@
 						:props="defaultProps"
 						@node-click="handleNodeClick"
 						style="padding: 10px;height: 100%;">
-						<span class="custom-tree-node" slot-scope="{ node, data }" >
-							<span :style="data.categoryType == '3' ? 'color: #dcdfe6' : ''" :title="data.categoryTitle">{{ data.categoryTitle }}</span>
-						</span>
+						<template slot-scope="{ node, data }" >
+							<span class="custom-tree-node" >
+								<span :style="data.categoryType == '3' ? 'color: #dcdfe6' : ''" :title="data.categoryTitle">{{ data.categoryTitle }}</span>
+							</span>
+						</template>
 				</el-tree>
 			</el-scrollbar>
 		</div>

src/main/webapp/WEB-INF/manager/cms/content/main.ftl

@@ -417,7 +417,11 @@
                     });
                     if (data && data.categoryPath) {
                         // row.url /html/web/categoryPath/文章id.html categoryPath做占位符
-                        path = row.url.replace("categoryPath",data.categoryPath);
+                        if (data.categoryType === "2"){
+                            path = row.url.replace("categoryPath/"+row.id,data.categoryPinyin+"/index");
+                        }else {
+                            path = row.url.replace("categoryPath",data.categoryPath);
+                        }
                     }else {
                         path = row.url;
                     }

src/main/webapp/WEB-INF/manager/cms/generate/index.ftl

@@ -56,7 +56,7 @@
             <div class="class-13 panel" >
                 <div class="class-14" >
                     <el-form-item label="文章栏目">
-                        <ms-tree-select v-model="contentSection"
+                        <ms-tree-select v-model:value="contentSection"
                                      :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
                                      :options="treeList" :style="{width:'100%'}"
                                      placeholder="请选择文章栏目">
@@ -99,7 +99,7 @@
             <div class="class-23 panel" >
                 <div class="class-24" >
                     <el-form-item label="生成栏目">
-                        <ms-tree-select v-model="section"
+                        <ms-tree-select v-model:value="section"
                                      :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
                                      :options="treeList" :style="{width:'100%'}"
                                      placeholder="请选择文章栏目">