Browse Source

更换为人大金仓数据库

srd13059540457 6 hours ago
parent
commit
a716438e9c

+ 3 - 3
derby.log

@@ -1,7 +1,7 @@
 ----------------------------------------------------------------
-Thu Sep 04 10:42:37 CST 2025:
-Booting Derby version The Apache Software Foundation - Apache Derby - 10.14.2.0 - (1828579): instance a816c00e-0199-129a-b5cf-000001fe3818 
-on database directory memory:D:\Project\LiXiang\bj-maritime-dcds\bdf0e630-8f49-4b07-97c6-a3ae3ab618c7 with class loader jdk.internal.loader.ClassLoaders$AppClassLoader@5e481248 
+Fri Sep 05 16:21:49 CST 2025:
+Booting Derby version The Apache Software Foundation - Apache Derby - 10.14.2.0 - (1828579): instance a816c00e-0199-18f7-9d36-0000020336c8 
+on database directory memory:D:\Project\LiXiang\bj-maritime-dcds\96fd1331-878d-4eae-bad4-7baa9e81b19f with class loader jdk.internal.loader.ClassLoaders$AppClassLoader@5e481248 
 Loaded from file:/D:/APP/Maven/repository/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar
 java.vendor=Alibaba
 java.runtime.version=17.0.15+6

+ 11 - 5
ruoyi-modules/ruoyi-gen/pom.xml

@@ -70,11 +70,11 @@
             <version>${anyline.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.anyline</groupId>
-            <artifactId>anyline-data-jdbc-mysql</artifactId>
-            <version>${anyline.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.anyline</groupId>-->
+<!--            <artifactId>anyline-data-jdbc-mysql</artifactId>-->
+<!--            <version>${anyline.version}</version>-->
+<!--        </dependency>-->
 
         <!-- anyline支持100+种类型数据库 添加对应的jdbc依赖与anyline对应数据库依赖包即可 -->
 <!--        <dependency>-->
@@ -95,6 +95,12 @@
 <!--            <version>${anyline.version}</version>-->
 <!--        </dependency>-->
 
+                <dependency>
+                    <groupId>org.anyline</groupId>
+                    <artifactId>anyline-data-jdbc-kingbase</artifactId>
+                    <version>${anyline.version}</version>
+                </dependency>
+
     </dependencies>
 
     <build>

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java

@@ -14,7 +14,7 @@ import org.dromara.common.tenant.core.TenantEntity;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_config")
+@TableName("sys_config_info")
 public class SysConfig extends TenantEntity {
 
     /**

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java

@@ -17,7 +17,7 @@ import org.dromara.common.tenant.core.TenantEntity;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_role")
+@TableName("sys_role_info")
 public class SysRole extends TenantEntity {
 
     /**

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_user")
+@TableName("sys_user_info")
 public class SysUser extends TenantEntity {
 
     /**

+ 3 - 3
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -12,7 +12,7 @@
         m.perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id
-        left join sys_role r on rm.role_id = r.role_id
+        left join sys_role_info r on rm.role_id = r.role_id
         ${ew.getCustomSqlSegment}
     </select>
 
@@ -34,7 +34,7 @@
                         m.create_time
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
-        left join sys_role r on rm.role_id = r.role_id and r.status = '0'
+        left join sys_role_info r on rm.role_id = r.role_id and r.status = '0'
         where m.menu_type in ('M', 'C')
             and r.role_id in (select role_id from sys_user_role where user_id = #{userId})
         order by m.parent_id, m.order_num
@@ -56,7 +56,7 @@
         select distinct m.perms
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
-        left join sys_role r on r.role_id = rm.role_id and r.status = '0'
+        left join sys_role_info r on r.role_id = rm.role_id and r.status = '0'
         where r.role_id in (select role_id from sys_user_role where user_id = #{userId})
     </select>
 

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -11,7 +11,7 @@
         select p.post_id, p.dept_id, p.post_name, p.post_code, p.post_category
         from sys_post p
                  left join sys_user_post up on up.post_id = p.post_id
-                 left join sys_user u on u.user_id = up.user_id
+                 left join sys_user_info u on u.user_id = up.user_id
         where u.user_id = #{userId}
     </select>
 

+ 3 - 3
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -19,9 +19,9 @@
                         r.del_flag,
                         r.create_time,
                         r.remark
-        from sys_role r
+        from sys_role_info r
                  left join sys_user_role sur on sur.role_id = r.role_id
-                 left join sys_user u on u.user_id = sur.user_id
+                 left join sys_user_info u on u.user_id = sur.user_id
                  left join sys_dept d on u.dept_id = d.dept_id
     </sql>
 
@@ -47,7 +47,7 @@
                r.role_sort,
                r.data_scope,
                r.status
-        from sys_role r
+        from sys_role_info r
         WHERE r.del_flag = '0' and r.role_id in (select role_id from sys_user_role where user_id = #{userId})
     </select>
 

+ 6 - 6
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -15,27 +15,27 @@
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
                u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
                d.dept_name, d.leader, u1.user_name as leaderName
-        from sys_user u
+        from sys_user_info u
                  left join sys_dept d on u.dept_id = d.dept_id
-                 left join sys_user u1 on u1.user_id = d.leader
+                 left join sys_user_info u1 on u1.user_id = d.leader
             ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectAllocatedList" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-        from sys_user u
+        from sys_user_info u
              left join sys_dept d on u.dept_id = d.dept_id
              left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
+             left join sys_role_info r on r.role_id = sur.role_id
         ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectUnallocatedList" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-        from sys_user u
+        from sys_user_info u
              left join sys_dept d on u.dept_id = d.dept_id
              left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
+             left join sys_role_info r on r.role_id = sur.role_id
         ${ew.getCustomSqlSegment}
     </select>
 

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="org.dromara.system.mapper.SysUserRoleMapper">
 
     <select id="selectUserIdsByRoleId" resultType="Long">
-        select u.user_id from sys_user u
+        select u.user_id from sys_user_info u
         inner join sys_user_role sur
             on u.user_id = sur.user_id and sur.role_id = #{roleId}
     </select>

+ 1 - 1
ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties

@@ -50,7 +50,7 @@ db.num=1
 
 db.pool.config.driverClassName=com.kingbase8.Driver
 ### Connect URL of DB:
-db.url.0=jdbc:kingbase8://172.16.10.65:54321/maritimeDcds?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&compatibleMode=mysql&currentSchema=ry_config
+db.url.0=jdbc:kingbase8://172.16.10.226:54321/maritimeDcds?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&compatibleMode=mysql&currentSchema=ry_config
 db.user.0=system
 db.password.0=Kb#!pw2025
 

+ 5 - 0
ruoyi-visual/ruoyi-snailjob-server/pom.xml

@@ -40,6 +40,11 @@
             <artifactId>spring-boot-admin-starter-client</artifactId>
             <version>${spring-boot-admin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.com.kingbase</groupId>
+            <artifactId>kingbase8</artifactId>
+            <version>8.6.0</version>
+        </dependency>
     </dependencies>
 
     <build>