From 9442a1d5607ff030643919c5ed91b1d7bd3f0b6f Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 19 May 2021 11:32:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.4=E3=80=91=E5=8E=BB=E6=8E=89dbInit?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/init/actuator/DbInitializer.java | 1 + .../GunsDbInitListenerAutoConfiguration.java | 45 ----------- .../main/resources/META-INF/spring.factories | 1 - .../dict/modular/init/DictInitializer.java | 24 +----- .../modular/init/DictTypeInitializer.java | 21 +---- .../dict/modular/sqladapter/DictSql.java | 77 +++++++++++++++++++ .../dict/modular/sqladapter/DictTypeSql.java | 74 ++++++++++++++++++ 7 files changed, 160 insertions(+), 83 deletions(-) delete mode 100644 kernel-d-db/db-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/db/starter/GunsDbInitListenerAutoConfiguration.java create mode 100644 kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/sqladapter/DictSql.java create mode 100644 kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/sqladapter/DictTypeSql.java diff --git a/kernel-d-db/db-sdk-init/src/main/java/cn/stylefeng/roses/kernel/db/init/actuator/DbInitializer.java b/kernel-d-db/db-sdk-init/src/main/java/cn/stylefeng/roses/kernel/db/init/actuator/DbInitializer.java index 1b670f61a..f2542f101 100644 --- a/kernel-d-db/db-sdk-init/src/main/java/cn/stylefeng/roses/kernel/db/init/actuator/DbInitializer.java +++ b/kernel-d-db/db-sdk-init/src/main/java/cn/stylefeng/roses/kernel/db/init/actuator/DbInitializer.java @@ -71,6 +71,7 @@ public abstract class DbInitializer { } @Resource + @Getter private DruidProperties druidProperties; /** diff --git a/kernel-d-db/db-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/db/starter/GunsDbInitListenerAutoConfiguration.java b/kernel-d-db/db-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/db/starter/GunsDbInitListenerAutoConfiguration.java deleted file mode 100644 index 1f0d62a9c..000000000 --- a/kernel-d-db/db-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/db/starter/GunsDbInitListenerAutoConfiguration.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.db.starter; - -import cn.stylefeng.roses.kernel.db.init.listener.InitTableListener; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * 数据库初始话监听器自动配置 - * - * @author fengshuonan - * @date 2020/12/26 22:47 - */ -@Configuration -public class GunsDbInitListenerAutoConfiguration { - - @Bean - public InitTableListener initTableListener() { - return new InitTableListener(); - } - -} diff --git a/kernel-d-db/db-spring-boot-starter/src/main/resources/META-INF/spring.factories b/kernel-d-db/db-spring-boot-starter/src/main/resources/META-INF/spring.factories index dae51740f..1ed30ffcc 100644 --- a/kernel-d-db/db-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/kernel-d-db/db-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -2,5 +2,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ cn.stylefeng.roses.kernel.db.starter.GunsDataSourceAutoConfiguration,\ cn.stylefeng.roses.kernel.db.starter.GunsDruidPropertiesAutoConfiguration,\ cn.stylefeng.roses.kernel.db.starter.GunsMyBatisPlusAutoConfiguration,\ - cn.stylefeng.roses.kernel.db.starter.GunsDbInitListenerAutoConfiguration,\ cn.stylefeng.roses.kernel.db.starter.GunsDruidMonitorAutoConfiguration diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/init/DictInitializer.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/init/DictInitializer.java index fb86fa13b..800b49018 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/init/DictInitializer.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/init/DictInitializer.java @@ -24,9 +24,11 @@ */ package cn.stylefeng.roses.kernel.dict.modular.init; +import cn.stylefeng.roses.kernel.db.api.pojo.druid.DruidProperties; import cn.stylefeng.roses.kernel.db.api.sqladapter.AbstractSql; import cn.stylefeng.roses.kernel.db.init.actuator.DbInitializer; import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict; +import cn.stylefeng.roses.kernel.dict.modular.sqladapter.DictSql; import org.springframework.stereotype.Component; /** @@ -41,26 +43,8 @@ public class DictInitializer extends DbInitializer { @Override protected String getTableInitSql() { - return "CREATE TABLE sys_dict (\n" + - " dict_id bigint(20) NOT NULL COMMENT '字典id',\n" + - " dict_code varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典编码',\n" + - " dict_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典名称',\n" + - " dict_name_pinyin varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典名称首字母',\n" + - " dict_encode varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典编码',\n" + - " dict_type_code varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典类型的编码',\n" + - " dict_short_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典简称',\n" + - " dict_short_code varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典简称的编码',\n" + - " dict_parent_id bigint(20) NOT NULL COMMENT '上级字典的id(如果没有上级字典id，则为-1)',\n" + - " status_flag tinyint(4) NOT NULL COMMENT '状态：(1-启用,2-禁用),参考 StatusEnum',\n" + - " dict_sort decimal(10, 2) NULL DEFAULT NULL COMMENT '排序，带小数点',\n" + - " dict_pids varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '父id集合',\n" + - " del_flag char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N' COMMENT '是否删除，Y-被删除，N-未删除',\n" + - " create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间',\n" + - " create_user bigint(20) NULL DEFAULT NULL COMMENT '创建用户id',\n" + - " update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间',\n" + - " update_user bigint(20) NULL DEFAULT NULL COMMENT '修改用户id',\n" + - " PRIMARY KEY (dict_id) USING BTREE\n" + - ") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典表' ROW_FORMAT = Dynamic;"; + DruidProperties druidProperties = getDruidProperties(); + return new DictSql().getSql(druidProperties.getUrl()); } @Override diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/init/DictTypeInitializer.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/init/DictTypeInitializer.java index a32872551..6e3845e01 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/init/DictTypeInitializer.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/init/DictTypeInitializer.java @@ -24,9 +24,11 @@ */ package cn.stylefeng.roses.kernel.dict.modular.init; +import cn.stylefeng.roses.kernel.db.api.pojo.druid.DruidProperties; import cn.stylefeng.roses.kernel.db.api.sqladapter.AbstractSql; import cn.stylefeng.roses.kernel.db.init.actuator.DbInitializer; import cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType; +import cn.stylefeng.roses.kernel.dict.modular.sqladapter.DictTypeSql; import org.springframework.stereotype.Component; /** @@ -41,23 +43,8 @@ public class DictTypeInitializer extends DbInitializer { @Override protected String getTableInitSql() { - return "CREATE TABLE sys_dict_type (\n" + - " dict_type_id bigint(20) NOT NULL COMMENT '字典类型id',\n" + - " dict_type_class int(2) NULL DEFAULT NULL COMMENT '字典类型： 1-业务类型，2-系统类型，参考 DictTypeClassEnum',\n" + - " dict_type_bus_code varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型业务编码',\n" + - " dict_type_code varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型编码',\n" + - " dict_type_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型名称',\n" + - " dict_type_name_pinyin varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型名称首字母拼音',\n" + - " dict_type_desc varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型描述',\n" + - " status_flag tinyint(4) NULL DEFAULT NULL COMMENT '字典类型的状态：1-启用，2-禁用，参考 StatusEnum',\n" + - " dict_type_sort decimal(10, 2) NULL DEFAULT NULL COMMENT '排序，带小数点',\n" + - " del_flag char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N' COMMENT '是否删除：Y-被删除，N-未删除',\n" + - " create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间',\n" + - " create_user bigint(20) NULL DEFAULT NULL COMMENT '创建用户id',\n" + - " update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间',\n" + - " update_user bigint(20) NULL DEFAULT NULL COMMENT '修改用户id',\n" + - " PRIMARY KEY (dict_type_id) USING BTREE\n" + - ") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表，一个字典类型下有多个字典' ROW_FORMAT = Dynamic;"; + DruidProperties druidProperties = getDruidProperties(); + return new DictTypeSql().getSql(druidProperties.getUrl()); } @Override diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/sqladapter/DictSql.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/sqladapter/DictSql.java new file mode 100644 index 000000000..073dd02a6 --- /dev/null +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/sqladapter/DictSql.java @@ -0,0 +1,77 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点，可申请商业授权 + */ +package cn.stylefeng.roses.kernel.dict.modular.sqladapter; + +import cn.stylefeng.roses.kernel.db.api.sqladapter.AbstractSql; +import lombok.Getter; + +/** + * 创建数据库的sql，可用在租户的创建 + * + * @author fengshuonan + * @date 2019-07-16-13:06 + */ +@Getter +public class DictSql extends AbstractSql { + + @Override + protected String mysql() { + return "CREATE TABLE `sys_dict` (\n" + + " `dict_id` bigint(20) NOT NULL COMMENT '字典id',\n" + + " `dict_code` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典编码',\n" + + " `dict_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典名称',\n" + + " `dict_name_pinyin` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '字典名称首字母',\n" + + " `dict_encode` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '字典编码',\n" + + " `dict_type_code` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典类型的编码',\n" + + " `dict_short_name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '字典简称',\n" + + " `dict_short_code` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '字典简称的编码',\n" + + " `dict_parent_id` bigint(20) NOT NULL COMMENT '上级字典的id(如果没有上级字典id，则为-1)',\n" + + " `status_flag` tinyint(4) NOT NULL COMMENT '状态：(1-启用,2-禁用),参考 StatusEnum',\n" + + " `dict_sort` decimal(10,2) DEFAULT NULL COMMENT '排序，带小数点',\n" + + " `dict_pids` varchar(1000) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '父id集合',\n" + + " `del_flag` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'N' COMMENT '是否删除，Y-被删除，N-未删除',\n" + + " `create_time` datetime DEFAULT NULL COMMENT '创建时间',\n" + + " `create_user` bigint(20) DEFAULT NULL COMMENT '创建用户id',\n" + + " `update_time` datetime DEFAULT NULL COMMENT '修改时间',\n" + + " `update_user` bigint(20) DEFAULT NULL COMMENT '修改用户id',\n" + + " PRIMARY KEY (`dict_id`) USING BTREE\n" + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='字典';"; + } + + @Override + protected String sqlServer() { + return ""; + } + + @Override + protected String pgSql() { + return ""; + } + + @Override + protected String oracle() { + return ""; + } +} diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/sqladapter/DictTypeSql.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/sqladapter/DictTypeSql.java new file mode 100644 index 000000000..1f60a6a9e --- /dev/null +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/sqladapter/DictTypeSql.java @@ -0,0 +1,74 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点，可申请商业授权 + */ +package cn.stylefeng.roses.kernel.dict.modular.sqladapter; + +import cn.stylefeng.roses.kernel.db.api.sqladapter.AbstractSql; +import lombok.Getter; + +/** + * 创建数据库的sql，可用在租户的创建 + * + * @author fengshuonan + * @date 2019-07-16-13:06 + */ +@Getter +public class DictTypeSql extends AbstractSql { + + @Override + protected String mysql() { + return "CREATE TABLE `sys_dict_type` (\n" + + " `dict_type_id` bigint(20) NOT NULL COMMENT '字典类型id',\n" + + " `dict_type_class` int(11) DEFAULT NULL COMMENT '字典类型： 1-业务类型，2-系统类型，参考 DictTypeClassEnum',\n" + + " `dict_type_bus_code` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '字典类型业务编码',\n" + + " `dict_type_code` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '字典类型编码',\n" + + " `dict_type_name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '字典类型名称',\n" + + " `dict_type_name_pinyin` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '字典类型名称首字母拼音',\n" + + " `dict_type_desc` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '字典类型描述',\n" + + " `status_flag` tinyint(4) DEFAULT NULL COMMENT '字典类型的状态：1-启用，2-禁用，参考 StatusEnum',\n" + + " `dict_type_sort` decimal(10,2) DEFAULT NULL COMMENT '排序，带小数点',\n" + + " `del_flag` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'N' COMMENT '是否删除：Y-被删除，N-未删除',\n" + + " `create_time` datetime DEFAULT NULL COMMENT '创建时间',\n" + + " `create_user` bigint(20) DEFAULT NULL COMMENT '创建用户id',\n" + + " `update_time` datetime DEFAULT NULL COMMENT '修改时间',\n" + + " `update_user` bigint(20) DEFAULT NULL COMMENT '修改用户id',\n" + + " PRIMARY KEY (`dict_type_id`) USING BTREE\n" + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='字典类型';"; + } + + @Override + protected String sqlServer() { + return ""; + } + + @Override + protected String pgSql() { + return ""; + } + + @Override + protected String oracle() { + return ""; + } +}