change gen db

.gitignore

@@ -42,6 +42,7 @@ nbdist/
 *.log
 *.xml.versionsBackup
 *.swp
+.DS_Store
 
 !*/build/*.java
 !*/build/*.html

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/organize/domain/listener/SysUserListeners.java

@@ -1,35 +0,0 @@
-package com.xueyi.system.api.organize.domain.listener;
-
-import com.xueyi.system.api.organize.domain.dto.SysUserDto;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.PostPersist;
-import javax.persistence.PostUpdate;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
-
-@Component
-@RequiredArgsConstructor
-public class SysUserListeners {
-
-    @PrePersist
-    public void onPrePrist(final SysUserDto sysUserDto){
-        System.err.println("onPrePrist=====");
-    }
-
-    @PostPersist
-    @PostUpdate
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
-    public void afterPresist(final SysUserDto sysUserDto){
-        System.err.println("afterPresist=====");
-    }
-
-    @PreUpdate
-    public void onUpdate(final SysUserDto sysUserDto){
-        System.err.println("onUpdate=====");
-    }
-
-}

xueyi-modules/xueyi-gen/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.17.0.1:18848
+        server-addr: 192.168.65.4:8848
       config:
         # 配置中心地址
-        server-addr: 172.17.0.1:18848
+        server-addr: 192.168.65.4:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

xueyi-modules/xueyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -24,7 +24,7 @@
 		       (case when column_key = 'UNI' then 1 else 0 end) as is_unique,
 		       ordinal_position as sort
 		from information_schema.columns
-		where table_schema = (select database()) and table_name = (#{tableName})
+		where table_schema like 'xy-%' and table_name = (#{tableName})
 		order by ordinal_position
 	</select>
 

xueyi-modules/xueyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -19,9 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectDbTableList" parameterType="com.xueyi.gen.domain.dto.GenTableDto" resultMap="GenTableResult">
 		<include refid="schema"/>
-		where table_schema = (select database())
-        AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
-		AND table_name NOT IN (select name from gen_table)
+-- 		where table_schema = (select database())
+		where table_schema LIKE 'xy-%'
+		AND table_name LIKE 'dm_%'
+--         AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
+-- 		AND table_name NOT IN (select name from gen_table)
+
 		<if test="name != null and name != ''">
 			AND lower(table_name) like lower(concat('%', #{name}, '%'))
 		</if>
@@ -33,7 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">
 		<include refid="schema"/>
-		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+-- 		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+		where table_schema LIKE 'xy-%'
+		AND table_name LIKE 'dm_%'
 		and table_name in
 	    <foreach collection="array" item="name" open="(" separator="," close=")">
  			#{name}
@@ -42,7 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectDbTableByName" parameterType="String" resultMap="GenTableResult">
 		<include refid="schema"/>
-		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
+		where table_comment <![CDATA[ <> ]]> ''
+-- 		and table_schema = (select database())
+		and table_schema LIKE 'xy-%'
 		and table_name = #{name}
 	</select>
 

xueyi-modules/xueyi-system/src/main/resources/bootstrap.yml

@@ -18,10 +18,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.17.0.1:18848
+        server-addr: 192.168.65.4:8848
       config:
         # 配置中心地址
-        server-addr: 172.17.0.1:18848
+        server-addr: 192.168.65.4:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

xueyi-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://39.107.77.235:8080`,
+        target: `http://127.0.0.1:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''