From f8c908c5e4da96317bd0b7566819fa2894b4c721 Mon Sep 17 00:00:00 2001
From: wujj <1027418825@qq.com>
Date: Sat, 21 Nov 2020 11:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=8E=BB=E6=8E=89=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/5.2-patch.sql | 7 +++++++
.../net/mingsoft/cms/action/CategoryAction.java | 6 ------
.../mingsoft/cms/action/web/CategoryAction.java | 2 --
.../java/net/mingsoft/cms/dao/ICategoryDao.xml | 7 -------
.../java/net/mingsoft/cms/dao/IContentDao.xml | 1 -
.../net/mingsoft/cms/entity/CategoryEntity.java | 17 -----------------
6 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/doc/5.2-patch.sql b/doc/5.2-patch.sql
index 652a501c..0b2c5589 100644
--- a/doc/5.2-patch.sql
+++ b/doc/5.2-patch.sql
@@ -49,6 +49,10 @@ ADD CONSTRAINT `fk_category_id` FOREIGN KEY (`category_id`) REFERENCES `cms_cate
ALTER TABLE `cms_category`
MODIFY COLUMN `category_id` bigint(20) NULL DEFAULT NULL COMMENT '所属栏目' AFTER `id`;
+ALTER TABLE `cms_category`
+DROP COLUMN `category_manager_id`;
+ALTER TABLE `cms_category`
+DROP COLUMN `app_id`;
ALTER TABLE`app`
DROP COLUMN `app_mobile_style`,
@@ -83,6 +87,9 @@ CHANGE COLUMN `model_modelid` `model_id` int(22) NULL DEFAULT NULL COMMENT '模
CHANGE COLUMN `model_modelmanagerid` `manager_id` int(11) NULL DEFAULT NULL COMMENT '模块关联的关联员id' AFTER `model_icon`;
ALTER TABLE `model` DROP FOREIGN KEY `model_ibfk_1`;
+ALTER TABLE `model`
+MODIFY COLUMN `IS_CHILD` varchar(300) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展业务标记' AFTER `model_parent_ids`;
+
ALTER TABLE `model`
RENAME INDEX `model_modelid` TO `idx_model_id`,
DROP INDEX `sys_c009201`,
diff --git a/src/main/java/net/mingsoft/cms/action/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/CategoryAction.java
index 1552d5cc..fbdc5ce7 100644
--- a/src/main/java/net/mingsoft/cms/action/CategoryAction.java
+++ b/src/main/java/net/mingsoft/cms/action/CategoryAction.java
@@ -72,8 +72,6 @@ public class CategoryAction extends BaseAction {
@ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"),
@ApiImplicitParam(name = "mdiyModelId", value = "栏目管理的内容模型id", required =false,paramType="query"),
@ApiImplicitParam(name = "categoryDatetime", value = "类别发布时间", required =false,paramType="query"),
- @ApiImplicitParam(name = "categoryManagerId", value = "发布用户id", required =false,paramType="query"),
- @ApiImplicitParam(name = "appId", value = "应用编号", 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"),
@@ -132,8 +130,6 @@ public class CategoryAction extends BaseAction {
@ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"),
@ApiImplicitParam(name = "mdiyModelId", value = "栏目管理的内容模型id", required =false,paramType="query"),
@ApiImplicitParam(name = "categoryDatetime", value = "类别发布时间", required =false,paramType="query"),
- @ApiImplicitParam(name = "categoryManagerId", value = "发布用户id", required =false,paramType="query"),
- @ApiImplicitParam(name = "appId", value = "应用编号", 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"),
@@ -216,8 +212,6 @@ public class CategoryAction extends BaseAction {
@ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"),
@ApiImplicitParam(name = "mdiyModelId", value = "栏目管理的内容模型id", required =false,paramType="query"),
@ApiImplicitParam(name = "categoryDatetime", value = "类别发布时间", required =false,paramType="query"),
- @ApiImplicitParam(name = "categoryManagerId", value = "发布用户id", required =false,paramType="query"),
- @ApiImplicitParam(name = "appId", value = "应用编号", 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"),
diff --git a/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java
index fe2e781a..240a6770 100644
--- a/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java
+++ b/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java
@@ -77,8 +77,6 @@ public class CategoryAction extends net.mingsoft.cms.action.BaseAction{
@ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"),
@ApiImplicitParam(name = "mdiyModelId", value = "栏目管理的内容模型id", required =false,paramType="query"),
@ApiImplicitParam(name = "categoryDatetime", value = "类别发布时间", required =false,paramType="query"),
- @ApiImplicitParam(name = "categoryManagerId", value = "发布用户id", required =false,paramType="query"),
- @ApiImplicitParam(name = "appId", value = "应用编号", 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"),
diff --git a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
index 9fdd331d..6d49bc8f 100644
--- a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
@@ -17,8 +17,6 @@
-
-
@@ -48,7 +46,6 @@
category_diy_url,
mdiy_model_id,
category_datetime,
- category_manager_id,
dict_id,
category_flag,
category_path,
@@ -73,7 +70,6 @@
#{categoryDiyUrl},
#{mdiyModelId},
#{categoryDatetime},
- #{categoryManagerId},
#{dictId},
#{categoryFlag},
#{categoryPath},
@@ -104,7 +100,6 @@
category_diy_url=#{categoryDiyUrl},
mdiy_model_id=#{mdiyModelId},
category_datetime=#{categoryDatetime},
- category_manager_id=#{categoryManagerId},
dict_id=#{dictId},
category_flag=#{categoryFlag},
category_path=#{categoryPath},
@@ -139,7 +134,6 @@
and category_diy_url=#{categoryDiyUrl}
and mdiy_model_id=#{mdiyModelId}
and category_datetime=#{categoryDatetime}
- and category_manager_id=#{categoryManagerId}
and dict_id=#{dictId}
and category_flag=#{categoryFlag}
and category_path=#{categoryPath}
@@ -221,7 +215,6 @@
and category_diy_url=#{categoryDiyUrl}
and mdiy_model_id=#{mdiyModelId}
and category_datetime=#{categoryDatetime}
- and category_manager_id=#{categoryManagerId}
and dict_id=#{dictId}
and category_flag=#{categoryFlag}
and category_path=#{categoryPath}
diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index 4b226457..220842b3 100644
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -64,7 +64,6 @@
-
diff --git a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java
index 168132ef..b0d11d1b 100644
--- a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java
+++ b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java
@@ -78,10 +78,6 @@ private static final long serialVersionUID = 1574925152750L;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
private Date categoryDatetime;
- /**
- * 发布用户id
- */
- private Integer categoryManagerId;
/**
* 字典对应编号
@@ -290,19 +286,6 @@ private static final long serialVersionUID = 1574925152750L;
public Date getCategoryDatetime() {
return this.categoryDatetime;
}
- /**
- * 设置发布用户id
- */
- public void setCategoryManagerId(Integer categoryManagerId) {
- this.categoryManagerId = categoryManagerId;
- }
-
- /**
- * 获取发布用户id
- */
- public Integer getCategoryManagerId() {
- return this.categoryManagerId;
- }
/**
* 设置字典对应编号