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