up:：5.2.10

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

pom.xml

@@ -10,14 +10,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.mingsoft</groupId>
     <artifactId>ms-mcms</artifactId>
-    <version>5.2.9</version>
+    <version>5.2.10</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <!-- 打包war包，注意不启用(resources》resource》excludes的配置并注释掉maven-assembly-plugin 插件配置 -->
     <!--<packaging>war</packaging>-->
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <log4j.version>2.18.0</log4j.version>
+        <log4j.version>2.19.0</log4j.version>
     </properties>
     <repositories>
         <repository>
@@ -44,24 +44,24 @@
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-base</artifactId>
-            <version>2.1.14.1</version>
+            <version>2.1.15</version>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-basic</artifactId>
-            <version>2.1.14.1</version>
+            <version>2.1.15</version>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-mdiy</artifactId>
-            <version>2.1.14.1</version>
+            <version>2.1.15</version>
         </dependency>
 
         <!--store入口依赖（源码不开发），如果不需要MStore可以直接去掉依赖-->
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>store-client</artifactId>
-            <version>2.1.14</version>
+            <version>2.1.15</version>
         </dependency>
         <dependency>
             <groupId>com.github.oshi</groupId>

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

@@ -25,12 +25,6 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.ComponentScan;
-
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import java.util.Locale;
 
 @SpringBootApplication(scanBasePackages = {"net.mingsoft"})
 @MapperScan(basePackages={"**.dao","com.baomidou.**.mapper"})

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

@@ -70,6 +70,7 @@ public class CategoryAction extends BaseAction {
 	 * @return
 	 */
 	@GetMapping("/index")
+	@RequiresPermissions("cms:category:view")
 	public String index(){
 		return "/cms/category/index";
 	}
@@ -86,7 +87,6 @@ public class CategoryAction extends BaseAction {
     })
 	@RequestMapping(value="/list",method = {RequestMethod.GET, RequestMethod.POST})
 	@ResponseBody
-	@RequiresPermissions("cms:category:view")
 	public ResultData list(@ModelAttribute @ApiIgnore CategoryEntity category) {
 		BasicUtil.startPage();
 		List categoryList = categoryBiz.query(category);

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

@@ -27,11 +27,11 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import net.mingsoft.base.entity.ResultData;
+import net.mingsoft.base.util.SqlInjectionUtil;
 import net.mingsoft.basic.annotation.LogAnn;
 import net.mingsoft.basic.bean.EUListBean;
 import net.mingsoft.basic.constant.e.BusinessTypeEnum;
 import net.mingsoft.basic.util.BasicUtil;
-import net.mingsoft.base.util.SqlInjectionUtil;
 import net.mingsoft.basic.util.StringUtil;
 import net.mingsoft.cms.bean.ContentBean;
 import net.mingsoft.cms.biz.ICategoryBiz;
@@ -45,13 +45,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -219,9 +216,6 @@ public class ContentAction extends BaseAction {
 		if(StringUtil.isBlank(content.getContentDatetime())){
 			return ResultData.build().error(getResString("err.empty", this.getResString("content.datetime")));
 		}
-		if(!StringUtil.checkLength(content.getContentUrl()+"", 0, 200)){
-			return ResultData.build().error(getResString("err.length", this.getResString("content.url"), "0", "200"));
-		}
 		contentBiz.save(content);
 		return ResultData.build().success(content);
 	}
@@ -307,9 +301,6 @@ public class ContentAction extends BaseAction {
 		if(StringUtil.isBlank(content.getContentDatetime())){
 			return ResultData.build().error(getResString("err.empty", this.getResString("content.datetime")));
 		}
-		if(!StringUtil.checkLength(content.getContentUrl()+"", 0, 200)){
-			return ResultData.build().error(getResString("err.length", this.getResString("content.url"), "0", "200"));
-		}
 		contentBiz.saveOrUpdate(content);
 		return ResultData.build().success(content);
 	}

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

@@ -250,6 +250,7 @@ public class GeneraterAction extends BaseAction {
             }
             contentBean.setCategoryId(category.getId());
             contentBean.setCategoryType(category.getCategoryType());
+            contentBean.setOrderBy("date");
             //将文章列表标签中的中的参数
             articleIdList = contentBiz.queryIdsByCategoryIdForParserAndNotCover(contentBean);
             // 分类是列表

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

@@ -33,13 +33,9 @@ import net.mingsoft.cms.biz.ICategoryBiz;
 import net.mingsoft.cms.entity.CategoryEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 /**
  * 分类管理控制层

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

@@ -38,13 +38,9 @@ import net.mingsoft.cms.entity.HistoryLogEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 /**
@@ -137,7 +133,7 @@ public class ContentAction extends net.mingsoft.cms.action.BaseAction{
 		}else {
 			content.setContentHit(1);
 		}
-		contentBiz.updateEntity(content);
+		contentBiz.updateById(content);
 
 		// cms_history 增加相应记录
 		HistoryLogEntity entity = new HistoryLogEntity();

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

@@ -22,12 +22,7 @@
 
 package net.mingsoft.cms.bean;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import net.mingsoft.cms.entity.ContentEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
 
 /**
  * 文章实体bean

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

@@ -24,12 +24,12 @@
 
 package net.mingsoft.cms.biz.impl;
 
-import net.mingsoft.cms.biz.IHistoryLogBiz;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import net.mingsoft.base.biz.impl.BaseBizImpl;
 import net.mingsoft.base.dao.IBaseDao;
+import net.mingsoft.cms.biz.IHistoryLogBiz;
 import net.mingsoft.cms.dao.ICmsHistoryLogDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * 文章浏览记录管理持久化层

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

@@ -16,7 +16,7 @@
 				<result column="content_description" property="contentDescription" /><!--描述 -->
 				<result column="content_keyword" property="contentKeyword" /><!--关键字 -->
 				<result column="content_details" property="contentDetails" /><!--文章内容 -->
-				<result column="content_url" property="contentUrl" /><!--文章跳转链接地址 -->
+				<result column="content_out_link" property="contentOutLink" /><!--文章跳转链接地址 -->
 				<result column="content_hit" property="contentHit" /><!--点击次数 -->
 				<result column="create_by" property="createBy" /><!--创建人 -->
 				<result column="create_date" property="createDate" /><!--创建时间 -->
@@ -39,7 +39,7 @@
 		<result column="content_description" property="contentDescription" /><!--描述 -->
 		<result column="content_keyword" property="contentKeyword" /><!--关键字 -->
 		<result column="content_details" property="contentDetails" /><!--文章内容 -->
-		<result column="content_url" property="contentUrl" /><!--文章跳转链接地址 -->
+		<result column="content_out_link" property="contentOutLink" /><!--文章跳转链接地址 -->
 <!--		<result column="static_url" property="staticUrl" />&lt;!&ndash;静态地址 &ndash;&gt;-->
 		<result column="content_hit" property="contentHit" /><!--点击次数 -->
 		<result column="create_by" property="createBy" /><!--创建人 -->
@@ -91,7 +91,7 @@
 				<if test="contentDescription != null and contentDescription != ''">content_description,</if>
 				<if test="contentKeyword != null and contentKeyword != ''">content_keyword,</if>
 				<if test="contentDetails != null and contentDetails != ''">content_details,</if>
-				<if test="contentUrl != null and contentUrl != ''">content_url,</if>
+				<if test="contentOutLink != null and contentOutLink != ''">content_out_link,</if>
 				<if test="contentHit != null">content_hit,</if>
 				<if test="createBy &gt; 0">create_by,</if>
 				<if test="createDate != null">create_date,</if>
@@ -138,7 +138,7 @@
 				<if test="contentDescription != null ">content_description=#{contentDescription},</if>
 				<if test="contentKeyword != null ">content_keyword=#{contentKeyword},</if>
 				<if test="contentDetails != null ">content_details=#{contentDetails},</if>
-				<if test="contentUrl != null and contentUrl != ''">content_url=#{contentUrl},</if>
+				<if test="contentOutLink != null and contentOutLink != ''">content_out_link=#{contentOutLink},</if>
 				<if test="contentHit != null">content_hit=#{contentHit},</if>
 				<if test="createBy &gt; 0">create_by=#{createBy},</if>
 				<if test="createDate != null">create_date=#{createDate},</if>
@@ -171,7 +171,7 @@
 				<if test="contentDescription != null and contentDescription != ''">and content_description=#{contentDescription}</if>
 				<if test="contentKeyword != null and contentKeyword != ''">and content_keyword=#{contentKeyword}</if>
 				<if test="contentDetails != null and contentDetails != ''">and content_details=#{contentDetails}</if>
-				<if test="contentUrl != null and contentUrl != ''">and content_url=#{contentUrl}</if>
+				<if test="contentOutLink != null and contentOutLink != ''">and content_out_link=#{contentOutLink}</if>
 				<if test="contentHit != null">and content_hit=#{contentHit}</if>
 				<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
 				<if test="createDate != null"> and create_date=#{createDate} </if>
@@ -236,7 +236,7 @@
 			<if test="contentDescription != null and contentDescription != ''"> and content_description=#{contentDescription}</if>
 			<if test="contentKeyword != null and contentKeyword != ''"> and content_keyword=#{contentKeyword}</if>
 			<if test="contentDetails != null and contentDetails != ''"> and content_details=#{contentDetails}</if>
-			<if test="contentUrl != null and contentUrl != ''"> and content_url=#{contentUrl}</if>
+			<if test="contentOutLink != null and contentOutLink != ''">and content_out_link=#{contentOutLink}</if>
 			<if test="contentHit != null"> and content_hit=#{contentHit}</if>
 			<if test="createBy &gt; 0"> and ct.create_by=#{createBy} </if>
 			<if test="createDate != null"> and ct.create_date=#{createDate} </if>
@@ -273,7 +273,7 @@
 			<if test="contentDescription != null and contentDescription != ''"> and content_description=#{contentDescription}</if>
 			<if test="contentKeyword != null and contentKeyword != ''"> and content_keyword=#{contentKeyword}</if>
 			<if test="contentDetails != null and contentDetails != ''"> and content_details=#{contentDetails}</if>
-			<if test="contentUrl != null and contentUrl != ''"> and content_url=#{contentUrl}</if>
+			<if test="contentOutLink != null and contentOutLink != ''">and content_out_link=#{contentOutLink}</if>
 			<if test="contentHit != null"> and content_hit=#{contentHit}</if>
 			<if test="createBy &gt; 0"> and ct.create_by=#{createBy} </if>
 			<if test="createDate != null"> and ct.create_date=#{createDate} </if>
@@ -287,10 +287,10 @@
 	<!-- 根据站点编号、开始、结束时间和栏目编号查询文章编号集合 -->
 	<select id="queryIdsByCategoryIdForParser" resultMap="resultBean" >
 			select
-			ct.id article_id,c.*
+			ct.id article_id,ct.content_img  litpic,c.*
 			FROM cms_content ct
 			LEFT JOIN cms_category c ON ct.category_id = c.id
-			where ct.del=0
+			where ct.del=0 and ct.content_display=0
 
 			<!-- 查询子栏目数据 -->
 			<if test="categoryId!=null and  categoryId!='' and categoryType==1">
@@ -345,7 +345,7 @@
 	<!-- 根据站点编号、开始、结束时间和栏目编号查询文章编号集合,不包括单篇 -->
 	<select id="queryIdsByCategoryIdForParserAndNotCover" resultMap="resultBean" >
 		select
-		ct.id article_id,c.*
+		ct.id article_id,ct.content_img  litpic,c.*
 		FROM cms_content ct
 		LEFT JOIN cms_category c ON ct.category_id = c.id
 		where ct.del=0

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

@@ -22,11 +22,7 @@
 
 package net.mingsoft.cms.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import net.mingsoft.base.entity.BaseEntity;
 
 /**

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

@@ -24,7 +24,6 @@ package net.mingsoft.cms.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -110,7 +109,7 @@ private static final long serialVersionUID = 1574925152617L;
 	/**
 	 * 文章跳转链接地址
 	 */
-	private String contentUrl;
+	private String contentOutLink;
 	/**
 	* 点击次数
 	*/
@@ -279,14 +278,14 @@ private static final long serialVersionUID = 1574925152617L;
 	/**
 	 * 设置文章跳转链接地址
 	 */
-	public void setContentUrl(String contentUrl) {
-	this.contentUrl = contentUrl;
+	public void setContentOutLink(String contentOutLink) {
+		this.contentOutLink = contentOutLink;
 	}
 
 	/**
 	 * 获取文章跳转链接地址
 	 */
-	public String getContentUrl() {
-	return this.contentUrl;
+	public String getContentOutLink() {
+		return this.contentOutLink;
 	}
 }

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

@@ -22,11 +22,7 @@
 
 package net.mingsoft.cms.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import net.mingsoft.base.entity.BaseEntity;
-import java.util.Date;
 /**
 * 文章浏览记录实体
 * @author 铭飞开发团队

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

@@ -22,7 +22,6 @@
 
 package net.mingsoft.cms.util;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.PageUtil;

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

@@ -40,7 +40,10 @@ import org.springframework.core.Ordered;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.context.request.RequestContextListener;
-import org.springframework.web.servlet.config.annotation.*;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import javax.annotation.Resource;
 import java.io.File;
@@ -95,7 +98,7 @@ public class WebConfig implements WebMvcConfigurer {
         String uploadMapping = MSProperties.upload.mapping;
         String uploadFolderPath = MSProperties.upload.path;
         String template = MSProperties.upload.template;
-        String htmlDir = MSProperties.DiyProperties.htmlDir;
+        String htmlDir = MSProperties.diy.htmlDir;
         // 上传路径映射 这里的映射不能使用File.separator Windows会存在映射问题
         registry.addResourceHandler(uploadMapping).addResourceLocations("/" + uploadFolderPath + "/", "file:" + uploadFolderPath + "/");
         registry.addResourceHandler("/" + template + "/**").addResourceLocations("/" + template + "/", "file:" + template + "/");
@@ -127,9 +130,9 @@ public class WebConfig implements WebMvcConfigurer {
 
     //XSS过滤器
     @Bean
-    public FilterRegistrationBean xssFilterRegistration(@Value("${ms.xss.enable:false}") boolean xssEnable,
-                                                        @Value("${ms.xss.filter-url}:''") String filterUrl,
-                                                        @Value("${ms.xss.exclude-url}:''") String excludeUrl) {
+    public FilterRegistrationBean xssFilterRegistration(@Value("${ms.xss.enable:true}") boolean xssEnable,
+                                                        @Value("${ms.xss.filter-url}") String filterUrl,
+                                                        @Value("${ms.xss.exclude-url}") String excludeUrl) {
         XSSEscapeFilter xssFilter = new XSSEscapeFilter();
         Map<String, String> initParameters = new HashMap();
         FilterRegistrationBean registration = new FilterRegistrationBean();