From 018d7693d1b80525cccbf58fbc39865ae19e9d06 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 17 Oct 2025 13:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=9B=86=E6=88=90=20?=
 =?UTF-8?q?=E4=B8=BB=E4=BD=93=E5=BA=93=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bonus-admin/pom.xml                           |  6 +++++
 .../src/main/resources/application-druid.yml  |  7 ++---
 .../mapper/generator/GenTableColumnMapper.xml | 10 +++----
 .../mapper/generator/GenTableMapper.xml       | 22 +++++++--------
 bonus-mainDatabase/pom.xml                    | 27 +++++++++++++++++++
 pom.xml                                       |  9 +++++++
 6 files changed, 60 insertions(+), 21 deletions(-)
 create mode 100644 bonus-mainDatabase/pom.xml

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 @@
             <artifactId>bonus-ocr</artifactId>
         </dependency>
 
+        <!-- 主体库-->
+        <dependency>
+            <groupId>com.bonus</groupId>
+            <artifactId>bonus-mainDatabase</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
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"
     </resultMap>
 
 	<sql id="selectGenTableColumnVo">
-        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
     </sql>
 
     <select id="selectGenTableColumnListByTableId" parameterType="Long" resultMap="GenTableColumnResult">
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
     <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
-        insert into da_ky_gen_table_column (
+        insert into gen_table_column (
 			<if test="tableId != null and tableId != ''">table_id,</if>
 			<if test="columnName != null and columnName != ''">column_name,</if>
 			<if test="columnComment != null and columnComment != ''">column_comment,</if>
@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateGenTableColumn" parameterType="GenTableColumn">
-        update da_ky_gen_table_column
+        update gen_table_column
         <set>
             <if test="columnComment != null">column_comment = #{columnComment},</if>
             <if test="javaType != null">java_type = #{javaType},</if>
@@ -111,14 +111,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteGenTableColumnByIds" parameterType="Long">
-        delete from da_ky_gen_table_column where table_id in
+        delete from gen_table_column where table_id in
         <foreach collection="array" item="tableId" open="(" separator="," close=")">
             #{tableId}
         </foreach>
     </delete>
 
     <delete id="deleteGenTableColumns">
-        delete from da_ky_gen_table_column where column_id in
+        delete from gen_table_column where column_id in
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item.columnId}
         </foreach>
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"
     </resultMap>
 	
 	<sql id="selectGenTableVo">
-        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
     </sql>
     
     <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_schema = (select database())
 		AND table_name NOT LIKE 'qrtz\_%' AND table_name NOT LIKE 'gen\_%'
-		AND table_name NOT IN (select table_name from da_ky_gen_table)
+		AND table_name NOT IN (select table_name from gen_table)
 		<if test="tableName != null and tableName != ''">
 			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
 		</if>
@@ -114,29 +114,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
 	    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
 	</select>
 	
 	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
 	    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_name = #{tableName} order by c.sort
 	</select>
 	
 	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
 	    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.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
 		order by c.sort
 	</select>
 	
 	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
-        insert into da_ky_gen_table (
+        insert into gen_table (
 			<if test="tableName != null">table_name,</if>
 			<if test="tableComment != null and tableComment != ''">table_comment,</if>
 			<if test="className != null and className != ''">class_name,</if>
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     
     <update id="updateGenTable" parameterType="GenTable">
-        update da_ky_gen_table
+        update gen_table
         <set>
             <if test="tableName != null">table_name = #{tableName},</if>
             <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
@@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     
     <delete id="deleteGenTableByIds" parameterType="Long">
-        delete from da_ky_gen_table where table_id in
+        delete from gen_table where table_id in
         <foreach collection="array" item="tableId" open="(" separator="," close=")">
             #{tableId}
         </foreach>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.bonus</groupId>
+        <artifactId>bonus</artifactId>
+        <version>3.9.0</version>
+    </parent>
+
+    <artifactId>bonus-mainDatabase</artifactId>
+
+    <description>
+        主体库模块
+    </description>
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.bonus</groupId>
+            <artifactId>bonus-common</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ 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 @@
                 <version>${bonus.version}</version>
             </dependency>
 
+            <!--ocr模块-->
             <dependency>
                 <groupId>com.bonus</groupId>
                 <artifactId>bonus-ocr</artifactId>
                 <version>${bonus.version}</version>
             </dependency>
+
+            <!--主体库模块-->
+            <dependency>
+                <groupId>com.bonus</groupId>
+                <artifactId>bonus-mainDatabase</artifactId>
+                <version>${bonus.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -254,6 +262,7 @@
         <module>bonus-file</module>
         <module>bonus-rabbitmq</module>
         <module>bonus-ocr</module>
+        <module>bonus-mainDatabase</module>
     </modules>
     <packaging>pom</packaging>