fix:5.2.7发布

pom.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.mingsoft</groupId>
     <artifactId>ms-mcms</artifactId>
-    <version>5.2.6</version>
+    <version>5.2.7</version>
     <name>ms-mcms</name>
     <!-- 打包war包 -->
     <!--    <packaging>war</packaging>-->
@@ -45,24 +45,24 @@
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-base</artifactId>
-            <version>2.1.11</version>
+            <version>2.1.12</version>
         </dependency>
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-basic</artifactId>
-            <version>2.1.11</version>
+            <version>2.1.12</version>
         </dependency>
 
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-mdiy</artifactId>
-            <version>2.1.11</version>
+            <version>2.1.12</version>
         </dependency>
         <!--store入口依赖（源码不开发），如果不需要MStore可以直接去掉依赖-->
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>store-client</artifactId>
-            <version>2.1.11</version>
+            <version>2.1.12</version>
         </dependency>
 
         <dependency>

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2020 铭软科技(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
@@ -18,7 +18,6 @@
  * 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;
 
 import org.mybatis.spring.annotation.MapperScan;

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

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2020 铭软科技(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
@@ -18,7 +18,6 @@
  * 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;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;

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

@@ -16,7 +16,6 @@
 				<result column="category_img" property="categoryImg" /><!--缩略图 -->
 				<result column="category_diy_url" property="categoryDiyUrl" /><!--自定义链接 -->
 				<result column="mdiy_model_id" property="mdiyModelId" /><!--栏目管理的内容模型id -->
-				<result column="category_datetime" property="categoryDatetime" /><!--类别发布时间 -->
 				<result column="dict_id" property="dictId" /><!--字典对应编号 -->
 				<result column="category_flag" property="categoryFlag" /><!--栏目属性 -->
 				<result column="category_path" property="categoryPath" /><!--栏目路径 -->
@@ -50,7 +49,6 @@
 				<if test="categoryImg != null and categoryImg != ''">category_img=#{categoryImg},</if>
 				<if test="categoryDiyUrl != null">category_diy_url=#{categoryDiyUrl},</if>
 				<if test="mdiyModelId != null and mdiyModelId != ''">mdiy_model_id=#{mdiyModelId},</if>
-				<if test="categoryDatetime != null">category_datetime=#{categoryDatetime},</if>
 				<if test="dictId != null">dict_id=#{dictId},</if>
 				<if test="categoryFlag != null ">category_flag=#{categoryFlag},</if>
 				<if test="categoryPath != null and categoryPath != ''">category_path=#{categoryPath},</if>
@@ -84,7 +82,6 @@
 				<if test="categoryImg != null and categoryImg != ''">and category_img=#{categoryImg}</if>
 				<if test="categoryDiyUrl != null and categoryDiyUrl != ''">and category_diy_url=#{categoryDiyUrl}</if>
 				<if test="mdiyModelId != null and mdiyModelId != ''">and mdiy_model_id=#{mdiyModelId}</if>
-				<if test="categoryDatetime != null"> and category_datetime=#{categoryDatetime} </if>
 				<if test="dictId != null"> and dict_id=#{dictId} </if>
 				<if test="categoryFlag != null and categoryFlag != ''">and category_flag=#{categoryFlag}</if>
 				<if test="categoryPath != null and categoryPath != ''">and category_path=#{categoryPath}</if>
@@ -150,7 +147,6 @@
 			<if test="categoryImg != null and categoryImg != ''"> and category_img=#{categoryImg}</if>
 			<if test="categoryDiyUrl != null and categoryDiyUrl != ''"> and category_diy_url=#{categoryDiyUrl}</if>
 			<if test="mdiyModelId != null and mdiyModelId != ''"> and mdiy_model_id=#{mdiyModelId}</if>
-			<if test="categoryDatetime != null"> and category_datetime=#{categoryDatetime} </if>
 			<if test="dictId != null"> and dict_id=#{dictId} </if>
 			<if test="categoryFlag != null and categoryFlag != ''"> and category_flag=#{categoryFlag}</if>
 			<if test="categoryPath != null and categoryPath != ''"> and category_path=#{categoryPath}</if>

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

@@ -107,13 +107,6 @@ public class CategoryEntity extends BaseEntity {
      * 栏目管理的内容模型id
      */
     private Integer mdiyModelId;
-    /**
-     * 类别发布时间
-     */
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date categoryDatetime;
 
     /**
      * 字典对应编号
@@ -315,20 +308,6 @@ public class CategoryEntity extends BaseEntity {
     }
 
     /**
-     * 设置类别发布时间
-     */
-    public void setCategoryDatetime(Date categoryDatetime) {
-        this.categoryDatetime = categoryDatetime;
-    }
-
-    /**
-     * 获取类别发布时间
-     */
-    public Date getCategoryDatetime() {
-        return this.categoryDatetime;
-    }
-
-    /**
      * 设置字典对应编号
      */
     public void setDictId(Integer dictId) {

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

@@ -1,24 +1,3 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(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.config;
 
 import com.alibaba.druid.pool.DruidDataSource;