feat(): 添加测试数据源模块

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/Constants.java

@@ -51,11 +51,21 @@ public class Constants {
      */
     public static final Integer SUCCESS = 200;
 
+    /**
+     * 成功提示消息
+     */
+    public static final String SUCCESS_MESSAGE = "操作成功";
+
     /**
      * 失败标记
      */
     public static final Integer FAIL = 500;
 
+    /**
+     * 失败提示消息
+     */
+    public static final String FAIL_MESSAGE = "操作失败";
+
     /**
      * 登录成功状态
      */

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java

@@ -38,7 +38,7 @@ public class BaseEntity implements Serializable {
      * 创建者
      */
     @TableField(fill = FieldFill.INSERT)
-    private Long createBy;
+    private String createBy;
 
     /**
      * 创建时间
@@ -51,7 +51,7 @@ public class BaseEntity implements Serializable {
      * 更新者
      */
     @TableField(fill = FieldFill.UPDATE)
-    private Long updateBy;
+    private String updateBy;
 
     /**
      * 更新时间

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java

@@ -91,17 +91,29 @@ public class ManyDataSource implements ApplicationRunner {
      */
     @Bean
     public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) {
-        Map<Object, Object> dataSourceMap = dataSourceInfoList().stream()
+        List<DataSourceInfo> sourceInfoList = dataSourceInfoList().stream()
                 .map(entInfo -> DataSourceInfo.hostAndPortBuild(
                                 entInfo.getEntCode(),
                                 entInfo.getIp(),
                                 entInfo.getPort()
                         )
-                )
+                ).toList();
-                .collect(Collectors.toMap(
+
-                        dataSourceInfo -> dataSourceInfo.getKey(),
+        Map<Object, Object> dataSourceMap = sourceInfoList.stream().collect(Collectors.toMap(
-                        dataSourceInfo -> druidDataSourceFactory.create(dataSourceInfo)
+                dataSourceInfo -> dataSourceInfo.getKey(),
-                ));
+                dataSourceInfo -> druidDataSourceFactory.create(dataSourceInfo)
+        ));
+//        Map<Object, Object> dataSourceMap = dataSourceInfoList().stream()
+//                .map(entInfo -> DataSourceInfo.hostAndPortBuild(
+//                                entInfo.getEntCode(),
+//                                entInfo.getIp(),
+//                                entInfo.getPort()
+//                        )
+//                )
+//                .collect(Collectors.toMap(
+//                        dataSourceInfo -> dataSourceInfo.getKey(),
+//                        dataSourceInfo -> druidDataSourceFactory.create(dataSourceInfo)
+//                ));
 
         //设置动态数据源
         DynamicDataSource dynamicDataSource = new DynamicDataSource();

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java

@@ -20,15 +20,15 @@ public class DatasourceContent {
     /**
      * 数据源密码
      */
-    public final static String PASSWORD = "wx0713101x";
+    public final static String PASSWORD = "Six@211206";
 
     /**
      * 数据源IP
      */
-    public final static String IP = "127.0.0.1";
+    public final static String IP = "106.15.136.7";
 
     /**
      * 数据源端口号
      */
-    public final static Integer PORT = 3307;
+    public final static Integer PORT = 3306;
 }

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/role/DynamicDataSource.java

@@ -16,7 +16,7 @@ import java.util.Map;
  * 切换数据源时可以使用@DataSource(value = "数据源名称")，或者DynamicDataSourceContextHolder.setContextKey("数据源名称")
  */
 @Data
-@SuperBuilder
+@Builder
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/WebMvcSaaSConfig.java

@@ -5,9 +5,9 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
- * 拦截器配置
+ * @Author: zi run
- *
+ * @Date 2024/9/20 22:20
- * @author muyu
+ * @Description 拦截器配置
  */
 public class WebMvcSaaSConfig implements WebMvcConfigurer {
 

cloud-modules/cloud-modules-many-datasource/pom.xml

@@ -0,0 +1,81 @@
+<?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.muyu</groupId>
+        <artifactId>cloud-modules</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>cloud-modules-many-datasource</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataSource -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-datasource</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataScope -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-datascope</artifactId>
+        </dependency>
+
+        <!-- MuYu Common Log -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-log</artifactId>
+        </dependency>
+
+        <!-- 接口模块 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-api-doc</artifactId>
+        </dependency>
+
+        <!-- saas模块-->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-saas</artifactId>
+        </dependency>
+    </dependencies>
+</project>

cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/CloudManyDataSourceApplication.java

@@ -0,0 +1,27 @@
+package com.muyu.many.datasource;
+
+import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
+import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
+import com.muyu.common.security.annotation.EnableCustomConfig;
+import com.muyu.common.security.annotation.EnableMyFeignClients;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * @Author: zi run
+ * @Date 2024/9/21 0:04
+ * @Description 多数据源启动类
+ */
+@EnableCustomConfig
+@EnableMyFeignClients
+@SpringBootApplication(exclude = {
+        DataSourceAutoConfiguration.class,
+        DruidDataSourceAutoConfigure.class,
+        DynamicDataSourceAutoConfiguration.class
+})
+public class CloudManyDataSourceApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(CloudManyDataSourceApplication.class, args);
+    }
+}

cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/controller/TestUserController.java

@@ -0,0 +1,37 @@
+package com.muyu.many.datasource.controller;
+
+import com.muyu.common.core.constant.Constants;
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.web.controller.BaseController;
+import com.muyu.many.datasource.domain.TestUser;
+import com.muyu.many.datasource.service.TestUserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
+/**
+ * @Author: zi run
+ * @Date 2024/9/21 0:12
+ * @Description 测试用户控制层
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/testUser")
+public class TestUserController extends BaseController {
+
+    /**
+     * 测试用户业务层
+     */
+    private final TestUserService testUserService;
+
+    /**
+     * 查询测试用户列表
+     * @return
+     */
+    @GetMapping("/selectList")
+    public Result<List<TestUser>> selectList() {
+        return Result.success(testUserService.list(), Constants.SUCCESS_MESSAGE);
+    }
+}

cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/domain/TestUser.java

@@ -0,0 +1,33 @@
+package com.muyu.many.datasource.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: zi run
+ * @Date 2024/9/21 0:07
+ * @Description 测试用户实体类
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName(value = "test_user", autoResultMap = true)
+public class TestUser {
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户名
+     */
+    private String name;
+}

cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/mapper/TestUserMapper.java

@@ -0,0 +1,14 @@
+package com.muyu.many.datasource.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.many.datasource.domain.TestUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author: zi run
+ * @Date 2024/9/21 0:09
+ * @Description 测试用户持久层
+ */
+@Mapper
+public interface TestUserMapper extends BaseMapper<TestUser> {
+}

cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/service/TestUserService.java

@@ -0,0 +1,12 @@
+package com.muyu.many.datasource.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.many.datasource.domain.TestUser;
+
+/**
+ * @Author: zi run
+ * @Date 2024/9/21 0:10
+ * @Description 测试用户也业务层
+ */
+public interface TestUserService extends IService<TestUser> {
+}

cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/service/impl/TestUserServiceImpl.java

@@ -0,0 +1,23 @@
+package com.muyu.many.datasource.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.many.datasource.domain.TestUser;
+import com.muyu.many.datasource.mapper.TestUserMapper;
+import com.muyu.many.datasource.service.TestUserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: zi run
+ * @Date 2024/9/21 0:10
+ * @Description 测试用户业务实现层
+ */
+@Service
+@RequiredArgsConstructor
+public class TestUserServiceImpl extends ServiceImpl<TestUserMapper, TestUser> implements TestUserService {
+
+    /**
+     * 测试用户持久层
+     */
+    private final TestUserMapper testUserMapper;
+}

cloud-modules/cloud-modules-many-datasource/src/main/resources/banner.txt

@@ -0,0 +1,2 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}

cloud-modules/cloud-modules-many-datasource/src/main/resources/bootstrap.yml

@@ -0,0 +1,49 @@
+# Tomcat
+server:
+  port: 12000
+
+# nacos线上地址
+nacos:
+  addr: 106.15.136.7:8848
+  user-name: nacos
+  password: nacos
+  namespace: xzr
+
+spring:
+  application:
+    # 应用名称
+    name: cloud-many-datasource
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: ${nacos.addr}
+        # nacos用户名
+        username: ${nacos.user-name}
+        # nacos密码
+        password: ${nacos.password}
+        # 命名空间
+        namespace: ${nacos.namespace}
+      config:
+        # 服务注册地址
+        server-addr: ${nacos.addr}
+        # nacos用户名
+        username: ${nacos.user-name}
+        # nacos密码
+        password: ${nacos.password}
+        # 命名空间
+        namespace: ${nacos.namespace}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          # 系统共享配置
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          # 系统环境Config共享配置
+          - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+logging:
+  level:
+    com.muyu.system.mapper: DEBUG

cloud-modules/cloud-modules-many-datasource/src/main/resources/logback/dev.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/cloud-many-datasource"/>
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.muyu" level="info"/>
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn"/>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+    </root>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+</configuration>

cloud-modules/cloud-modules-many-datasource/src/main/resources/logback/prod.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/cloud-many-datasource"/>
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+    <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.sky.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 使用gRpc将日志发送到skywalking服务端 -->
+    <appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
+        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
+                <Pattern>${log.sky.pattern}</Pattern>
+            </layout>
+        </encoder>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.muyu" level="info"/>
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn"/>
+
+    <root level="info">
+        <appender-ref ref="GRPC_LOG"/>
+        <appender-ref ref="console"/>
+    </root>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+</configuration>

cloud-modules/cloud-modules-many-datasource/src/main/resources/logback/test.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/cloud-many-datasource"/>
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+    <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.sky.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 使用gRpc将日志发送到skywalking服务端 -->
+    <appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
+        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
+                <Pattern>${log.sky.pattern}</Pattern>
+            </layout>
+        </encoder>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.muyu" level="info"/>
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn"/>
+
+    <root level="info">
+        <appender-ref ref="GRPC_LOG"/>
+        <appender-ref ref="console"/>
+    </root>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+</configuration>

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java

@@ -139,4 +139,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return 结果
      */
     public SysUser checkEmailUnique (String email);
+
+    /**
+     * 根据数据库名称查询用户列表
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectUserListByDatabaseName();
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java

@@ -508,8 +508,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public List<SysUser> entList() {
-        LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+        return userMapper.selectUserListByDatabaseName();
-        queryWrapper.last("where database_name!=''");
-        return this.list(queryWrapper);
     }
 }

cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -186,6 +186,14 @@
         limit 1
     </select>
 
+    <select id="selectUserListByDatabaseName" resultMap="SysUserResult">
+        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, u.database_name, d.dept_name, d.leader
+        from sys_user u
+        left join sys_dept d on u.dept_id = d.dept_id
+        where u.del_flag = '0' and database_name != ''
+    </select>
+
     <insert id="insertUser" parameterType="com.muyu.common.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user(
         <if test="userId != null and userId != 0">user_id,</if>

cloud-modules/pom.xml

@@ -14,6 +14,7 @@
         <module>cloud-modules-file</module>
         <module>cloud-modules-fault</module>
         <module>cloud-modules-car</module>
+        <module>cloud-modules-many-datasource</module>
     </modules>
 
     <artifactId>cloud-modules</artifactId>

pom.xml

@@ -266,6 +266,13 @@
                 <artifactId>cloud-common-rabbit</artifactId>
                 <version>${muyu.version}</version>
             </dependency>
+
+            <!-- saas模块 -->
+            <dependency>
+                <groupId>com.muyu</groupId>
+                <artifactId>cloud-common-saas</artifactId>
+                <version>${muyu.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>