数据库合并处理

hx-admin/src/main/resources/application-dev.yml

@@ -5,15 +5,15 @@ spring:
       strict: true
       primary: base
       datasource:
+#        base:
+        #          url: jdbc:mysql://121.37.194.75:30102/bytesailing_base1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+        #          username: xmhjc
+        #          password: 2j^q9*DF
+        #        common:
+        #          url: jdbc:mysql://121.37.194.75:30102/bytesailing_common1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+        #          username: xmhjc
+        #          password: 2j^q9*DF
         base:
-          url: jdbc:mysql://121.37.194.75:30102/bytesailing_base1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: xmhjc
-          password: 2j^q9*DF
-        common:
-          url: jdbc:mysql://121.37.194.75:30102/bytesailing_common1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: xmhjc
-          password: 2j^q9*DF
-        xmhjc:
           url: jdbc:mysql://121.37.194.75:30102/bytesailing_xmhjc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: xmhjc
           password: 2j^q9*DF

hx-common/src/main/resources/mapper/on/OnLineInfoMapper.xml

@@ -16,8 +16,8 @@
         ur.nick_name userName
         FROM
         on_line_info oli
-        LEFT JOIN bytesailing_base.sys_user ur ON oli.user_id = ur.user_id
-        LEFT JOIN bytesailing_base.sys_dept dt ON dt.dept_id = ur.dept_id
+        LEFT JOIN sys_user ur ON oli.user_id = ur.user_id
+        LEFT JOIN sys_dept dt ON dt.dept_id = ur.dept_id
         <where>
             on_line_date >= NOW() - INTERVAL 7 DAY
             <if test="deptIds neq null and deptIds.size() > 0">