From 2f82d35cb25daa71f3801b236ef88c329d4adc56 Mon Sep 17 00:00:00 2001 From: mingsoft Date: Mon, 28 Feb 2022 17:47:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:5.2.7=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 +++++------ src/main/java/net/mingsoft/MSApplication.java | 3 +-- .../net/mingsoft/MSServletInitializer.java | 3 +-- .../net/mingsoft/cms/dao/ICategoryDao.xml | 4 ---- .../mingsoft/cms/entity/CategoryEntity.java | 21 ------------------- .../java/net/mingsoft/config/WebConfig.java | 21 ------------------- 6 files changed, 8 insertions(+), 56 deletions(-) diff --git a/pom.xml b/pom.xml index 99282139..7ae2f7bc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ 4.0.0 net.mingsoft ms-mcms - 5.2.6 + 5.2.7 ms-mcms @@ -45,24 +45,24 @@ net.mingsoft ms-base - 2.1.11 + 2.1.12 net.mingsoft ms-basic - 2.1.11 + 2.1.12 net.mingsoft ms-mdiy - 2.1.11 + 2.1.12 net.mingsoft store-client - 2.1.11 + 2.1.12 diff --git a/src/main/java/net/mingsoft/MSApplication.java b/src/main/java/net/mingsoft/MSApplication.java index 20bde750..25188e73 100644 --- a/src/main/java/net/mingsoft/MSApplication.java +++ b/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; diff --git a/src/main/java/net/mingsoft/MSServletInitializer.java b/src/main/java/net/mingsoft/MSServletInitializer.java index 13e6d1f2..396d7f88 100644 --- a/src/main/java/net/mingsoft/MSServletInitializer.java +++ b/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; diff --git a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml index 9d7a61a9..574b3e55 100755 --- a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml +++ b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml @@ -16,7 +16,6 @@ - @@ -50,7 +49,6 @@ category_img=#{categoryImg}, category_diy_url=#{categoryDiyUrl}, mdiy_model_id=#{mdiyModelId}, - category_datetime=#{categoryDatetime}, dict_id=#{dictId}, category_flag=#{categoryFlag}, category_path=#{categoryPath}, @@ -84,7 +82,6 @@ and category_img=#{categoryImg} and category_diy_url=#{categoryDiyUrl} and mdiy_model_id=#{mdiyModelId} - and category_datetime=#{categoryDatetime} and dict_id=#{dictId} and category_flag=#{categoryFlag} and category_path=#{categoryPath} @@ -150,7 +147,6 @@ and category_img=#{categoryImg} and category_diy_url=#{categoryDiyUrl} and mdiy_model_id=#{mdiyModelId} - and category_datetime=#{categoryDatetime} and dict_id=#{dictId} and category_flag=#{categoryFlag} and category_path=#{categoryPath} diff --git a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java index 1e90110e..882c9e38 100755 --- a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java +++ b/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; /** * 字典对应编号 @@ -314,20 +307,6 @@ public class CategoryEntity extends BaseEntity { this.mdiyModelId = mdiyModelId; } - /** - * 设置类别发布时间 - */ - public void setCategoryDatetime(Date categoryDatetime) { - this.categoryDatetime = categoryDatetime; - } - - /** - * 获取类别发布时间 - */ - public Date getCategoryDatetime() { - return this.categoryDatetime; - } - /** * 设置字典对应编号 */ diff --git a/src/main/java/net/mingsoft/config/WebConfig.java b/src/main/java/net/mingsoft/config/WebConfig.java index d7143371..385b45bb 100644 --- a/src/main/java/net/mingsoft/config/WebConfig.java +++ b/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;