diff --git a/bonus-admin/pom.xml b/bonus-admin/pom.xml index 2cf0dc2..a24016e 100644 --- a/bonus-admin/pom.xml +++ b/bonus-admin/pom.xml @@ -80,6 +80,12 @@ bonus-ocr + + + com.bonus + bonus-mainDatabase + + diff --git a/bonus-admin/src/main/resources/application-druid.yml b/bonus-admin/src/main/resources/application-druid.yml index 2a61349..a894b92 100644 --- a/bonus-admin/src/main/resources/application-druid.yml +++ b/bonus-admin/src/main/resources/application-druid.yml @@ -6,12 +6,9 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://192.168.0.56:13306/smart_archives_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: root -# password: qd_mysql@2025 - url: jdbc:mysql://127.0.0.1:3306/smart_bid_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.14:2009/smart-bid-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: ccw1998@yyt1999 + password: Bonus@admin123! # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/bonus-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/bonus-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 89d7f1d..052b02a 100644 --- a/bonus-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/bonus-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from da_ky_gen_table_column + select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column - insert into da_ky_gen_table_column ( + insert into gen_table_column ( table_id, column_name, column_comment, @@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update da_ky_gen_table_column + update gen_table_column column_comment = #{columnComment}, java_type = #{javaType}, @@ -111,14 +111,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from da_ky_gen_table_column where table_id in + delete from gen_table_column where table_id in #{tableId} - delete from da_ky_gen_table_column where column_id in + delete from gen_table_column where column_id in #{item.columnId} diff --git a/bonus-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/bonus-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 8695407..25fb3e7 100644 --- a/bonus-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/bonus-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from da_ky_gen_table + select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort - FROM da_ky_gen_table t - LEFT JOIN da_ky_gen_table_column c ON t.table_id = c.table_id + FROM gen_table t + LEFT JOIN gen_table_column c ON t.table_id = c.table_id where t.table_id = #{tableId} order by c.sort - insert into da_ky_gen_table ( + insert into gen_table ( table_name, table_comment, class_name, @@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update da_ky_gen_table + update gen_table table_name = #{tableName}, table_comment = #{tableComment}, @@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from da_ky_gen_table where table_id in + delete from gen_table where table_id in #{tableId} diff --git a/bonus-mainDatabase/pom.xml b/bonus-mainDatabase/pom.xml new file mode 100644 index 0000000..88ec8e8 --- /dev/null +++ b/bonus-mainDatabase/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.bonus + bonus + 3.9.0 + + + bonus-mainDatabase + + + 主体库模块 + + + + + + com.bonus + bonus-common + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4251e60..7960371 100644 --- a/pom.xml +++ b/pom.xml @@ -236,11 +236,19 @@ ${bonus.version} + com.bonus bonus-ocr ${bonus.version} + + + + com.bonus + bonus-mainDatabase + ${bonus.version} + @@ -254,6 +262,7 @@ bonus-file bonus-rabbitmq bonus-ocr + bonus-mainDatabase pom