初始化仓库

cloud-auth/src/main/resources/bootstrap.yml

@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 47.116.173.119:8848
+  addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: five
+  namespace: four
 # Spring
 spring:
   application:

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

@@ -45,4 +45,9 @@ public class SecurityConstants {
      * 角色权限
      */
     public static final String ROLE_PERMISSION = "role_permission";
+
+    /**
+     * SAAS请求头的key
+     */
+    public static final String SAAS_KEY = "ent-code";
 }

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

@@ -20,4 +20,9 @@ public class ServiceNameConstants {
      * 文件服务的serviceid
      */
     public static final String FILE_SERVICE = "cloud-file";
+
+    /**
+     * 智能车联服务
+     */
+    public static final String SMART_SERVICE = "cloud-smart-car";
 }

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java

@@ -5,7 +5,7 @@ package com.muyu.common.core.exception;
  *
  * @author muyu
  */
-public final class ServiceException extends RuntimeException {
+public class ServiceException extends RuntimeException {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -21,7 +21,7 @@ public final class ServiceException extends RuntimeException {
     /**
      * 错误明细，内部调试错误
      * <p>
-     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+     * 和 {CommonResult#getDetailMessage()} 一致的设计
      */
     private String detailMessage;
 

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java

@@ -162,4 +162,15 @@ public class JwtUtils {
     public static String getValue (Claims claims, String key) {
         return Convert.toStr(claims.get(key), "");
     }
+
+    /**
+     * 根据身份信息获取SAASKey
+     *
+     * @param claims 身份信息
+     *
+     * @return saas_key
+     */
+    public static String getSaasKey(Claims claims) {
+        return getValue(claims, SecurityConstants.SAAS_KEY);
+    }
 }

cloud-common/cloud-common-saas/pom.xml

@@ -0,0 +1,34 @@
+<?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-common</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>cloud-common-saas</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>
+        <!-- 多数据源依赖 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-datasource</artifactId>
+        </dependency>
+
+        <!-- 鉴权依赖 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-security</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,118 @@
+package com.muyu.cloud.common.many.datasource;
+
+import cn.hutool.json.JSONObject;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
+import com.muyu.cloud.common.many.datasource.constents.DatasourceContent;
+import com.muyu.cloud.common.saas.domain.model.EntInfo;
+import com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory;
+import com.muyu.cloud.common.many.datasource.domain.model.DataSourceInfo;
+import com.muyu.cloud.common.many.datasource.role.DynamicDataSource;
+import com.muyu.cloud.common.saas.exception.SaaSException;
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.utils.SpringUtils;
+import com.muyu.common.core.web.page.TableDataInfo;
+import com.muyu.common.system.domain.SysFirmUser;
+import com.muyu.common.system.domain.SysUser;
+import com.muyu.common.system.remote.RemoteUserService;
+import lombok.extern.log4j.Log4j2;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: DongZeLiang
+ * @date: 2024/6/3
+ * @Description: 多数据源
+ * @Version: 1.0
+ */
+@Log4j2
+@Component
+@AutoConfiguration(before = MybatisPlusAutoConfiguration.class)
+public class ManyDataSource implements ApplicationRunner{
+
+
+    private List<EntInfo> dataSourceInfoList(){
+        RemoteUserService remoteUserService = SpringUtils.getBean(RemoteUserService.class);
+        Result<List<SysUser>> tableDataInfoResult = remoteUserService.companyList();
+        if (tableDataInfoResult==null){
+            throw new SaaSException("saas远调数据源错误");
+        }
+        List<SysUser> data = tableDataInfoResult.getData();
+        if (tableDataInfoResult.getCode() ==Result.SUCCESS && data !=null){
+            List<EntInfo> list = new ArrayList<>();
+            for (SysUser row : data) {
+                list.add(
+                        EntInfo.builder()
+                                .entCode(row.getDatabaseName())
+                                .ip(DatasourceContent.IP)
+                                .port(DatasourceContent.PORT)
+                                .build()
+                );
+            }
+            return list;
+        }else {
+            log.error("远调数据源错误,远调数据为：{}", JSON.toJSONString(data));
+            return null;
+        }
+    }
+//    private List<EntInfo> dataPrimarySourceInfoList(){
+//        List<EntInfo> list = new ArrayList<>();
+//        list.add(
+//                EntInfo.builder()
+//                        .entCode()
+//                        .ip(DatasourceContent.IP)
+//                        .port(DatasourceContent.PORT)
+//                        .build()
+//        );
+//        return list;
+//    }
+
+    @Bean
+    public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) {
+        // 企业列表 企业CODE，端口，IP
+        Map<Object, Object> dataSourceMap = new HashMap<>();
+        dataSourceInfoList()
+                .stream()
+                .map(entInfo -> DataSourceInfo.hostAndPortBuild(entInfo.getEntCode(), entInfo.getIp(), entInfo.getPort()))
+                .forEach(dataSourceInfo -> {
+                    dataSourceMap.put(dataSourceInfo.getKey(), druidDataSourceFactory.create(dataSourceInfo));
+                });
+        //设置动态数据源
+        DynamicDataSource dynamicDataSource = new DynamicDataSource();
+//        dynamicDataSource.setDefaultTargetDataSource(masterDataSource());
+        dynamicDataSource.setTargetDataSources(dataSourceMap);
+        //将数据源信息备份在defineTargetDataSources中
+        dynamicDataSource.setDefineTargetDataSources(dataSourceMap);
+        return dynamicDataSource;
+    }
+
+    @Override
+    public void run(ApplicationArguments args) {
+        DruidDataSourceFactory druidDataSourceFactory = SpringUtils.getBean(DruidDataSourceFactory.class);
+        DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class);
+        for (EntInfo entInfo : dataSourceInfoList()) {
+            DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(
+                    entInfo.getEntCode(), entInfo.getIp(), entInfo.getPort()
+            );
+            DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo);
+            dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource);
+            log.info("存储数据连接池为：key:{}",dataSourceInfo.getKey());
+        }
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package com.muyu.cloud.common.many.datasource.constents;
+
+/**
+ * @author DongZl
+ * @description: 数据源常量
+ * @Date 2023-8-1 上午 11:02
+ */
+public class DatasourceContent {
+
+    public final static String DATASOURCE_URL = "jdbc:mysql://{}:{}/{}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
+
+    public final static String USER_NAME = "root";
+
+    public final static String PASSWORD = "Lw030106";
+
+    public final static String IP = "47.101.53.251";
+
+    public final static Integer PORT = 3306;
+}

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java

@@ -0,0 +1,50 @@
+package com.muyu.cloud.common.many.datasource.domain.model;
+
+import com.muyu.cloud.common.many.datasource.constents.DatasourceContent;
+import com.muyu.common.core.utils.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author DongZl
+ * @description: 数据源实体类
+ * @Date 2023-8-1 上午 11:15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DataSourceInfo {
+
+    /**
+     * 键
+     */
+    private String key;
+
+    /**
+     * 地址
+     */
+    private String url;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+
+    public static DataSourceInfo hostAndPortBuild(String key, String host, Integer port) {
+        return DataSourceInfo.builder()
+                .key(key)
+                .url(StringUtils.format(DatasourceContent.DATASOURCE_URL, host, port, key))
+                .password(DatasourceContent.PASSWORD)
+                .userName(DatasourceContent.USER_NAME)
+                .build();
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.muyu.cloud.common.many.datasource.factory;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.muyu.cloud.common.many.datasource.domain.model.DataSourceInfo;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Component;
+
+import java.sql.SQLException;
+
+/**
+ * @Author: DongZeLiang
+ * @date: 2024/6/3
+ * @Description: Druid工厂
+ * @Version: 1.0
+ */
+@Log4j2
+@Component
+public class DruidDataSourceFactory {
+
+    /**
+     * @Description: 根据传递的数据源信息测试数据库连接
+     * @Author Dongzl
+     */
+    public DruidDataSource create(DataSourceInfo dataSourceInfo) {
+        DruidDataSource druidDataSource = new DruidDataSource();
+        druidDataSource.setUrl(dataSourceInfo.getUrl());
+        druidDataSource.setUsername(dataSourceInfo.getUserName());
+        druidDataSource.setPassword(dataSourceInfo.getPassword());
+        druidDataSource.setBreakAfterAcquireFailure(true);
+        druidDataSource.setConnectionErrorRetryAttempts(0);
+        try {
+            druidDataSource.getConnection(2000);
+            log.info("{} -> 数据源连接成功", dataSourceInfo.getKey());
+            return druidDataSource;
+        } catch (SQLException throwables) {
+            log.error("数据源 {} 连接失败,用户名：{}，密码 {}",dataSourceInfo.getUrl(),dataSourceInfo.getUserName(),dataSourceInfo.getPassword());
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.muyu.cloud.common.many.datasource.holder;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.Assert;
+
+/**
+ * 数据源切换处理
+ *
+ * @author Dongzl
+ */
+@Slf4j
+public class DynamicDataSourceHolder {
+    /**
+     * 保存动态数据源名称
+     */
+    private static final ThreadLocal<String> DYNAMIC_DATASOURCE_KEY = new ThreadLocal<>();
+
+    /**
+     * 设置/切换数据源，决定当前线程使用哪个数据源
+     */
+    public static void setDynamicDataSourceKey(String key){
+        log.info("数据源切换为：{}",key);
+        DYNAMIC_DATASOURCE_KEY.set(key);
+    }
+
+    /**
+     * 获取动态数据源名称，默认使用mater数据源
+     */
+    public static String getDynamicDataSourceKey(){
+        String key = DYNAMIC_DATASOURCE_KEY.get();
+        Assert.notNull(key, "请携带数据标识");
+        return key;
+    }
+
+    /**
+     * 移除当前数据源
+     */
+    public static void removeDynamicDataSourceKey(){
+        log.info("移除数据源：{}",DYNAMIC_DATASOURCE_KEY.get());
+        DYNAMIC_DATASOURCE_KEY.remove();
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.muyu.cloud.common.many.datasource.role;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
+
+import java.util.Map;
+
+/**
+ * 动态数据源
+ * 调用AddDefineDataSource组件的addDefineDynamicDataSource（）方法，获取原来targetdatasources的map，并将新的数据源信息添加到map中，并替换targetdatasources中的map
+ * 切换数据源时可以使用@DataSource(value = "数据源名称")，或者DynamicDataSourceContextHolder.setContextKey("数据源名称")
+ * @author Dongzl
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DynamicDataSource extends AbstractRoutingDataSource {
+    /**
+     * 备份所有数据源信息 备份的是个 指针 ！！！
+     */
+    private Map<Object, Object> defineTargetDataSources;
+
+    /**
+     * 判定键是否出站了
+     * @param key 键
+     * @return 存在结果 true存在 false不存在
+     */
+    public boolean hashKey(String key){
+        return defineTargetDataSources.containsKey(key);
+    }
+
+    /**
+     * 添加数据库
+     * @param key 键
+     * @param value 数据源
+     */
+    public void put(String  key, DruidDataSource value) {
+        defineTargetDataSources.put(key, value);
+        this.afterPropertiesSet();
+    }
+
+    /**
+     * 决定当前线程使用哪个数据源
+     */
+    @Override
+    protected Object determineCurrentLookupKey() {
+        return DynamicDataSourceHolder.getDynamicDataSourceKey();
+    }
+}

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/contents/SaaSConstant.java

@@ -0,0 +1,12 @@
+package com.muyu.cloud.common.saas.contents;
+
+/**
+ * @Author: DongZeLiang
+ * @date: 2024/6/3
+ * @Description: SAAS常量
+ * @Version: 1.0
+ */
+public class SaaSConstant {
+
+    public final static String SAAS_KEY = "ent-code";
+}

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/domain/model/EntInfo.java

@@ -0,0 +1,25 @@
+package com.muyu.cloud.common.saas.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: DongZeLiang
+ * @date: 2024/6/3
+ * @Description: 企业信息
+ * @Version: 1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EntInfo {
+
+    private String entCode;
+
+    private String ip;
+
+    private Integer port;
+}

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/exception/SaaSException.java

@@ -0,0 +1,28 @@
+package com.muyu.cloud.common.saas.exception;
+
+
+import com.muyu.common.core.exception.ServiceException;
+
+/**
+ * @Author: DongZeLiang
+ * @date: 2024/6/3
+ * @Description: SaaS异常类
+ * @Version: 1.0
+ */
+public class SaaSException extends ServiceException {
+
+    public SaaSException (String message, Integer code) {
+        super(message, code);
+    }
+
+    public SaaSException (String message) {
+        super(message);
+    }
+
+    /**
+     * 空构造方法，避免反序列化问题
+     */
+    public SaaSException () {
+        super();
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.muyu.cloud.common.saas.interceptor;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.muyu.cloud.common.saas.contents.SaaSConstant;
+import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder;
+import com.muyu.cloud.common.saas.exception.SaaSException;
+import com.muyu.cloud.common.many.datasource.role.DynamicDataSource;
+import com.muyu.common.core.utils.ServletUtils;
+import com.muyu.common.core.utils.SpringUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
+
+
+/**
+ * @Author: DongZeLiang
+ * @date: 2024/6/3
+ * @Description: SAAS拦截器
+ * @Version: 1.0
+ */
+public class SaaSInterceptor implements AsyncHandlerInterceptor {
+
+    /**
+     * 之前
+     */
+    @Override
+    public boolean preHandle (HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        if (!(handler instanceof HandlerMethod)) {
+            return true;
+        }
+
+        String SaaSKey = ServletUtils.getHeader(request, SaaSConstant.SAAS_KEY);
+        if (SaaSKey == null) {
+            throw new SaaSException("SaaS非法访问");
+        }else {
+            DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class);
+            if (!dynamicDataSource.hashKey(SaaSKey)){
+                throw new SaaSException("SaaS非法访问");
+            }
+        }
+        DynamicDataSourceHolder.setDynamicDataSourceKey(SaaSKey);
+        return true;
+    }
+
+    /**
+     * 之后
+     */
+    @Override
+    public void afterConcurrentHandlingStarted (HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        DynamicDataSourceHolder.removeDynamicDataSourceKey();
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.muyu.cloud.common.saas.interceptor;
+
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 拦截器配置
+ *
+ * @author muyu
+ */
+public class WebMvcSaaSConfig implements WebMvcConfigurer {
+    /**
+     * 不需要拦截的地址
+     */
+    public static final String[] excludeUrls = {"/login", "/logout", "/refresh"};
+
+    @Override
+    public void addInterceptors (InterceptorRegistry registry) {
+        registry.addInterceptor(getHeaderInterceptor())
+                .addPathPatterns("/**")
+                .excludePathPatterns(excludeUrls)
+                .order(-10);
+    }
+
+    /**
+     * 自定义请求头拦截器
+     */
+    public SaaSInterceptor getHeaderInterceptor () {
+        return new SaaSInterceptor();
+    }
+}

cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,3 @@
+com.muyu.cloud.common.saas.interceptor.WebMvcSaaSConfig
+com.muyu.cloud.common.many.datasource.ManyDataSource
+com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory

cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java

@@ -55,7 +55,7 @@ public class TokenService {
         claimsMap.put(SecurityConstants.USER_KEY, token);
         claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
         claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
-
+        claimsMap.put(SecurityConstants.SAAS_KEY,loginUser.getSysUser().getDatabaseName());
         // 接口返回信息
         Map<String, Object> rspMap = new HashMap<String, Object>();
         rspMap.put("access_token", JwtUtils.createToken(claimsMap));

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java

@@ -0,0 +1,25 @@
+package com.muyu.common.system.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @Author WangXin
+ * @Data 2024/9/18
+ * @Description 企业用户
+ * @Version 1.0.0
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysFirmUser extends SysUser {
+    /**
+     * 用户数据库
+     */
+    private String databaseName;
+}

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java

@@ -135,6 +135,11 @@ public class SysUser extends BaseEntity {
      */
     private Long roleId;
 
+    /**
+     * 数据库名称
+     */
+    private String databaseName;
+
     public SysUser (Long userId) {
         this.userId = userId;
     }

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java

@@ -3,12 +3,16 @@ package com.muyu.common.system.remote;
 import com.muyu.common.core.constant.SecurityConstants;
 import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.web.page.TableDataInfo;
+import com.muyu.common.system.domain.SysFirmUser;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
 import com.muyu.common.system.domain.LoginUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 用户服务
  *
@@ -37,4 +41,7 @@ public interface RemoteUserService {
      */
     @PostMapping("/user/register")
     public Result<Boolean> registerUserInfo (@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @GetMapping("/user/companyList")
+    public Result<List<SysUser>> companyList ();
 }

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java

@@ -1,6 +1,8 @@
 package com.muyu.common.system.remote.factory;
 
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.web.page.TableDataInfo;
+import com.muyu.common.system.domain.SysFirmUser;
 import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.domain.LoginUser;
@@ -9,6 +11,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 用户服务降级处理
  *
@@ -31,6 +35,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             public Result<Boolean> registerUserInfo (SysUser sysUser, String source) {
                 return Result.error("注册用户失败:" + throwable.getMessage());
             }
+
+            @Override
+            public Result<List<SysUser>> companyList() {
+                return Result.error("获取企业列表失败:" + throwable.getMessage());
+            }
+
         };
     }
 }

cloud-common/pom.xml

@@ -20,6 +20,7 @@
         <module>cloud-common-system</module>
         <module>cloud-common-xxl</module>
         <module>cloud-common-rabbit</module>
+        <module>cloud-common-saas</module>
     </modules>
 
     <artifactId>cloud-common</artifactId>

cloud-gateway/pom.xml

@@ -81,7 +81,6 @@
             <artifactId>knife4j-gateway-spring-boot-starter</artifactId>
             <version>4.5.0</version>
         </dependency>
-
     </dependencies>
 
     <build>

cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java

@@ -63,6 +63,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
         }
         String userid = JwtUtils.getUserId(claims);
         String username = JwtUtils.getUserName(claims);
+        String saasKey = JwtUtils.getSaasKey(claims);
         if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) {
             return unauthorizedResponse(exchange, "令牌验证失败");
         }
@@ -71,6 +72,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
         addHeader(mutate, SecurityConstants.USER_KEY, userkey);
         addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid);
         addHeader(mutate, SecurityConstants.DETAILS_USERNAME, username);
+        addHeader(mutate,SecurityConstants.SAAS_KEY,saasKey);
         // 内部请求来源参数清除
         removeHeader(mutate, SecurityConstants.FROM_SOURCE);
         return chain.filter(exchange.mutate().request(mutate.build()).build());

cloud-gateway/src/main/java/com/muyu/gateway/utils/WebFrameworkUtils.java

@@ -4,8 +4,6 @@ import cn.hutool.core.net.NetUtil;
 import cn.hutool.core.util.ArrayUtil;
 import com.alibaba.fastjson2.JSONObject;
 import lombok.extern.log4j.Log4j2;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.cloud.gateway.route.Route;
 import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.core.io.buffer.DataBufferFactory;
@@ -18,8 +16,6 @@ import reactor.core.publisher.Mono;
 
 /**
  * Web 工具类
- *
- *
  */
 @Log4j2
 public class WebFrameworkUtils {
@@ -72,8 +68,6 @@ public class WebFrameworkUtils {
 
     /**
      * 获得客户端 IP
-     *
-     *
      * @param exchange 请求
      * @param otherHeaderNames 其它 header 名字的数组
      * @return 客户端 IP
@@ -91,7 +85,6 @@ public class WebFrameworkUtils {
                 return NetUtil.getMultistageReverseProxyIp(ip);
             }
         }
-
         // 方式二，通过 remoteAddress 获取
         if (exchange.getRequest().getRemoteAddress() == null) {
             return null;
@@ -102,7 +95,6 @@ public class WebFrameworkUtils {
 
     /**
      * 获得请求匹配的 Route 路由
-     *
      * @param exchange 请求
      * @return 路由
      */

cloud-gateway/src/main/resources/bootstrap.yml

@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 47.116.173.119:8848
+  addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: five
+  namespace: four
 
 # Spring
 spring:

cloud-modules/cloud-car/pom.xml

@@ -0,0 +1,99 @@
+<?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-car</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>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-saas</artifactId>
+        </dependency>
+        <!-- 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>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/CarApplication.java

@@ -0,0 +1,25 @@
+package com.muyu.cloud.car;
+
+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;
+
+@EnableCustomConfig
+//@EnableCustomSwagger2
+@EnableMyFeignClients
+@SpringBootApplication(
+        exclude = {
+                DataSourceAutoConfiguration.class,
+                DruidDataSourceAutoConfigure.class,
+                DynamicDataSourceAutoConfiguration.class
+        }
+)
+public class CarApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(CarApplication.class, args);
+    }
+}

cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/controller/CarController.java

@@ -0,0 +1,30 @@
+package com.muyu.cloud.car.controller;
+
+import com.muyu.cloud.car.domain.User;
+import com.muyu.cloud.car.service.CarService;
+import com.muyu.common.core.web.controller.BaseController;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author WangXin
+ * @Data 2024/9/19
+ * @Description 车控制层
+ * @Version 1.0.0
+ */
+@RestController
+@RequestMapping("/test")
+public class CarController extends BaseController {
+
+    @Resource
+    private CarService carService;
+
+    @GetMapping("/sel")
+    public List<User> sel() {
+        return carService.list();
+    }
+}

cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/domain/User.java

@@ -0,0 +1,28 @@
+package com.muyu.cloud.car.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 WangXin
+ * @Data 2024/9/19
+ * @Description
+ * @Version 1.0.0
+ */
+@TableName("user")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class User {
+
+    @TableId(type = IdType.AUTO)
+    private Integer userId;
+
+    private String userName;
+}

cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/mapper/CarMapper.java

@@ -0,0 +1,20 @@
+package com.muyu.cloud.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.cloud.car.domain.User;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author WangXin
+ * @Data 2024/9/19
+ * @Description
+ * @Version 1.0.0
+ */
+public interface CarMapper extends BaseMapper<User> {
+
+    List<User> selectMyList();
+
+
+}

cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/service/CarService.java

@@ -0,0 +1,19 @@
+package com.muyu.cloud.car.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.cloud.car.domain.User;
+
+import java.util.List;
+
+/**
+ * @Author WangXin
+ * @Data 2024/9/19
+ * @Description
+ * @Version 1.0.0
+ */
+public interface CarService extends IService<User> {
+
+    List<User> selectList();
+
+
+}

cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/service/impl/CarServiceImpl.java

@@ -0,0 +1,28 @@
+package com.muyu.cloud.car.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.cloud.car.domain.User;
+import com.muyu.cloud.car.mapper.CarMapper;
+import com.muyu.cloud.car.service.CarService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author WangXin
+ * @Data 2024/9/19
+ * @Description
+ * @Version 1.0.0
+ */
+@Service
+public class CarServiceImpl extends ServiceImpl<CarMapper, User> implements CarService {
+
+    @Resource
+    private CarMapper carMapper;
+
+    @Override
+    public List<User> selectList() {
+        return carMapper.selectMyList();
+    }
+}

cloud-modules/cloud-car/src/main/resources/banner.txt

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

cloud-modules/cloud-car/src/main/resources/bootstrap.yml

@@ -0,0 +1,58 @@
+# Tomcat
+server:
+  port: 49701
+
+# nacos线上地址
+nacos:
+  addr: 47.101.53.251:8848
+  user-name: nacos
+  password: nacos
+  namespace: four
+# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
+# Spring
+spring:
+  amqp:
+    deserialization:
+      trust:
+        all: true
+  main:
+    allow-bean-definition-overriding: true
+  application:
+    # 应用名称
+    name: cloud-saas
+  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.cloud.mapper: DEBUG

cloud-modules/cloud-car/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-car"/>
+    <!-- 日志输出格式 -->
+    <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-car/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-car"/>
+    <!-- 日志输出格式 -->
+    <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-car/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-car"/>
+    <!-- 日志输出格式 -->
+    <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-car/src/main/resources/mapper/car/CarMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.muyu.cloud.car.mapper.CarMapper">
+
+    <select id="selectMyList" resultType="com.muyu.cloud.car.domain.User">
+        select * from user
+    </select>
+</mapper>

cloud-modules/cloud-modules-fence/pom.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>cloud-modules</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cloud-modules-fence</artifactId>
+
+    <description>
+        cloud-modules-fence
+    </description>
+
+    <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>
+
+        <!-- XllJob定时任务 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-xxl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-rabbit</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/FenceApplication.java

@@ -0,0 +1,19 @@
+package com.muyu.fence;
+
+import com.muyu.common.security.annotation.EnableMyFeignClients;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @Author YuPing
+ * @Description 电子围栏启动类
+ * @Version 1.0
+ * @Data 2024-09-18 11:27:38
+ */
+@SpringBootApplication
+@EnableMyFeignClients
+public class FenceApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(FenceApplication.class, args);
+    }
+}

cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/TbFenceController.java

@@ -0,0 +1,112 @@
+package com.muyu.fence.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import javax.annotation.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.muyu.common.security.annotation.RequiresPermissions;
+import com.muyu.fence.domain.TbFence;
+import com.muyu.fence.service.ITbFenceService;
+import com.muyu.common.core.web.controller.BaseController;
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.utils.poi.ExcelUtil;
+import com.muyu.common.security.utils.SecurityUtils;
+import org.springframework.validation.annotation.Validated;
+import com.muyu.common.core.web.page.TableDataInfo;
+
+/**
+ * 电子围栏Controller
+ *
+ * @author muyu
+ * @date 2024-09-18
+ */
+@RestController
+@RequestMapping("/fence")
+public class TbFenceController extends BaseController
+{
+    @Resource
+    private ITbFenceService tbFenceService;
+
+    /**
+     * 查询电子围栏列表
+     */
+    @RequiresPermissions("fence:fence:list")
+    @GetMapping("/list")
+    public Result<TableDataInfo<TbFence>> list(TbFence tbFence)
+    {
+        startPage();
+        List<TbFence> list = tbFenceService.selectTbFenceList(tbFence);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出电子围栏列表
+     */
+    @RequiresPermissions("fence:fence:export")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TbFence tbFence)
+    {
+        List<TbFence> list = tbFenceService.selectTbFenceList(tbFence);
+        ExcelUtil<TbFence> util = new ExcelUtil<TbFence>(TbFence.class);
+        util.exportExcel(response, list, "电子围栏数据");
+    }
+
+    /**
+     * 获取电子围栏详细信息
+     */
+    @RequiresPermissions("fence:fence:query")
+    @GetMapping(value = "/{fenceId}")
+    public Result<List<TbFence>> getInfo(@PathVariable("fenceId") Long fenceId)
+    {
+        return success(tbFenceService.selectTbFenceByFenceId(fenceId));
+    }
+
+    /**
+     * 新增电子围栏
+     */
+    @RequiresPermissions("fence:fence:add")
+    @PostMapping
+    public Result<Integer> add(
+            @Validated @RequestBody TbFence tbFence)
+    {
+        if (tbFenceService.checkIdUnique(tbFence)) {
+            return error("新增 电子围栏 '" + tbFence + "'失败，电子围栏已存在");
+        }
+        tbFence.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(tbFenceService.save(tbFence));
+    }
+
+    /**
+     * 修改电子围栏
+     */
+    @RequiresPermissions("fence:fence:edit")
+    @PutMapping
+    public Result<Integer> edit(
+            @Validated @RequestBody TbFence tbFence)
+    {
+        if (!tbFenceService.checkIdUnique(tbFence)) {
+            return error("修改 电子围栏 '" + tbFence + "'失败，电子围栏不存在");
+        }
+        tbFence.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(tbFenceService.updateById(tbFence));
+    }
+
+    /**
+     * 删除电子围栏
+     */
+    @RequiresPermissions("fence:fence:remove")
+	@DeleteMapping("/{fenceIds}")
+    public Result<Integer> remove(@PathVariable("fenceIds") Long[] fenceIds)
+    {
+        tbFenceService.removeBatchByIds(Arrays.asList(fenceIds));
+        return success();
+    }
+}

cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/TbFence.java

@@ -0,0 +1,72 @@
+package com.muyu.fence.domain;
+
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+/**
+ * 电子围栏对象 tb_fence
+ *
+ * @author muyu
+ * @date 2024-09-18
+ */
+
+@Data
+@Setter
+@Getter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("tb_fence")
+public class TbFence extends BaseEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 围栏编号 */
+    @TableId( type = IdType.AUTO)
+    private Long fenceId;
+
+    /** 围栏名称 */
+    @Excel(name = "围栏名称")
+    private String fenceName;
+
+    /** 围栏类型1.驶入2驶出 */
+    @Excel(name = "围栏类型1.驶入2驶出")
+    private Long fenceType;
+
+    /** 围栏状态1.正常2.停用 */
+    @Excel(name = "围栏状态1.正常2.停用")
+    private Long fenceFlag;
+
+    /** 经纬度信息 */
+    @Excel(name = "经纬度信息")
+    private String longitudeAndLatitudeInformation;
+
+    /** 优先级 */
+    @Excel(name = "优先级")
+    private Long fencePriority;
+
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fenceId", getFenceId())
+            .append("fenceName", getFenceName())
+            .append("fenceType", getFenceType())
+            .append("fenceFlag", getFenceFlag())
+            .append("longitudeAndLatitudeInformation", getLongitudeAndLatitudeInformation())
+            .append("fencePriority", getFencePriority())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/TbFenceMapper.java

@@ -0,0 +1,17 @@
+package com.muyu.fence.mapper;
+
+import java.util.List;
+import com.muyu.fence.domain.TbFence;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 电子围栏Mapper接口
+ *
+ * @author muyu
+ * @date 2024-09-18
+ */
+@Mapper
+public interface TbFenceMapper extends BaseMapper<TbFence>{
+
+}

cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ITbFenceService.java

@@ -0,0 +1,37 @@
+package com.muyu.fence.service;
+
+import java.util.List;
+import com.muyu.fence.domain.TbFence;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 电子围栏Service接口
+ *
+ * @author muyu
+ * @date 2024-09-18
+ */
+public interface ITbFenceService extends IService<TbFence> {
+    /**
+     * 精确查询电子围栏
+     *
+     * @param fenceId 电子围栏主键
+     * @return 电子围栏
+     */
+    public TbFence selectTbFenceByFenceId(Long fenceId);
+
+    /**
+     * 查询电子围栏列表
+     *
+     * @param tbFence 电子围栏
+     * @return 电子围栏集合
+     */
+    public List<TbFence> selectTbFenceList(TbFence tbFence);
+
+    /**
+     * 判断 电子围栏 id是否唯一
+     * @param tbFence 电子围栏
+     * @return 结果
+     */
+    Boolean checkIdUnique(TbFence tbFence);
+
+}

cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/TbFenceServiceImpl.java

@@ -0,0 +1,80 @@
+package com.muyu.fence.service.impl;
+
+import java.util.List;
+import org.springframework.stereotype.Service;
+import com.muyu.fence.mapper.TbFenceMapper;
+import com.muyu.fence.domain.TbFence;
+import com.muyu.fence.service.ITbFenceService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.common.core.utils.StringUtils;
+import org.springframework.util.Assert;
+
+/**
+ * 电子围栏Service业务层处理
+ *
+ * @author muyu
+ * @date 2024-09-18
+ */
+@Service
+public class TbFenceServiceImpl
+        extends ServiceImpl<TbFenceMapper, TbFence>
+        implements ITbFenceService {
+
+    /**
+     * 精确查询电子围栏
+     *
+     * @param fenceId 电子围栏主键
+     * @return 电子围栏
+     */
+    @Override
+    public TbFence selectTbFenceByFenceId(Long fenceId)
+    {
+        LambdaQueryWrapper<TbFence> queryWrapper = new LambdaQueryWrapper<>();
+        Assert.notNull(fenceId, "fenceId不可为空");
+        queryWrapper.eq(TbFence::getFenceId, fenceId);
+        return this.getOne(queryWrapper);
+    }
+
+
+    /**
+     * 查询电子围栏列表
+     *
+     * @param tbFence 电子围栏
+     * @return 电子围栏
+     */
+    @Override
+    public List<TbFence> selectTbFenceList(TbFence tbFence)
+    {
+        LambdaQueryWrapper<TbFence> queryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotEmpty(tbFence.getFenceName())){
+            queryWrapper.like(TbFence::getFenceName, tbFence.getFenceName());
+        }
+        if (tbFence.getFenceType()!=null){
+            queryWrapper.eq(TbFence::getFenceType, tbFence.getFenceType());
+        }
+        if (tbFence.getFenceFlag()!=null){
+            queryWrapper.eq(TbFence::getFenceFlag, tbFence.getFenceFlag());
+        }
+        if (StringUtils.isNotEmpty(tbFence.getLongitudeAndLatitudeInformation())){
+            queryWrapper.eq(TbFence::getLongitudeAndLatitudeInformation, tbFence.getLongitudeAndLatitudeInformation());
+        }
+        if (tbFence.getFencePriority()!=null){
+            queryWrapper.eq(TbFence::getFencePriority, tbFence.getFencePriority());
+        }
+        return this.list(queryWrapper);
+    }
+
+    /**
+    * 唯一 判断
+    * @param tbFence 电子围栏
+     * @return 电子围栏
+    */
+    @Override
+    public Boolean checkIdUnique(TbFence tbFence) {
+        LambdaQueryWrapper<TbFence> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TbFence::getFenceId, tbFence.getFenceId());
+        return this.count(queryWrapper) > 0;
+    }
+
+}

cloud-modules/cloud-modules-fence/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-fence/src/main/resources/bootstrap.yml

@@ -0,0 +1,60 @@
+# Tomcat
+server:
+  port: 10003
+
+# nacos线上地址
+nacos:
+  addr: 47.101.53.251:8848
+  user-name: nacos
+  password: nacos
+  namespace: four
+# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
+# Spring
+spring:
+  amqp:
+    deserialization:
+      trust:
+        all: true
+  main:
+    allow-bean-definition-overriding: true
+  application:
+    # 应用名称
+    name: cloud-fence
+  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}
+          # xxl-job 配置文件
+          - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          # rabbit 配置文件
+          - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+logging:
+  level:
+    com.muyu.fence.mapper: DEBUG

cloud-modules/cloud-modules-fence/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-fence"/>
+    <!-- 日志输出格式 -->
+    <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-fence/src/main/resources/logback/prod.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/cloud-fence"/>
+    <!-- 日志输出格式 -->
+    <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.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>
+
+    <!-- 使用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>
+
+    <root level="info">
+        <appender-ref ref="GRPC_LOG"/>
+    </root>
+
+    <!-- 系统模块日志级别控制  -->
+    <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-fence/src/main/resources/logback/test.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/cloud-fence"/>
+    <!-- 日志输出格式 -->
+    <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.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>
+
+    <!-- 使用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>
+
+    <root level="info">
+        <appender-ref ref="GRPC_LOG"/>
+    </root>
+
+    <!-- 系统模块日志级别控制  -->
+    <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-file/src/main/resources/bootstrap.yml

@@ -1,13 +1,13 @@
 # Tomcat
 server:
-  port: 9300
+  port: 9301
 
 # nacos线上地址
 nacos:
-  addr: 47.116.173.119:8848
+  addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: five
+  namespace: four
 
 # Spring
 spring:

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

@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 47.116.173.119:8848
+  addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: five
+  namespace: four
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:

cloud-modules/cloud-modules-system/pom.xml

@@ -77,10 +77,6 @@
             <artifactId>cloud-common-xxl</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-rabbit</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java

@@ -1,9 +1,11 @@
 package com.muyu.system;
 
+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;
 
 /**
  * 系统模块

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java

@@ -67,6 +67,12 @@ public class SysUserController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/companyList")
+    public Result<List<SysUser>> companyList () {
+        List<SysUser> list = userService.selectCompanyList();
+        return Result.success(list);
+    }
+
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @RequiresPermissions("system:user:export")
     @PostMapping("/export")

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

@@ -139,4 +139,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return 结果
      */
     public SysUser checkEmailUnique (String email);
+
+    List<SysUser> selectCompanyList();
+
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java

@@ -1,53 +1,53 @@
-package com.muyu.system.rabbit;
+//package com.muyu.system.rabbit;
-
+//
-import com.alibaba.fastjson2.JSONObject;
+//import com.alibaba.fastjson2.JSONObject;
-import com.muyu.system.domain.SysConfig;
+//import com.muyu.system.domain.SysConfig;
-import jakarta.annotation.PostConstruct;
+//import jakarta.annotation.PostConstruct;
-import lombok.extern.log4j.Log4j2;
+//import lombok.extern.log4j.Log4j2;
-import org.springframework.amqp.core.Queue;
+//import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
+//import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Bean;
-import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.bind.annotation.RestController;
-
+//
-@Log4j2
+//@Log4j2
-@RestController
+//@RestController
-@RequestMapping("/rabbit/test")
+//@RequestMapping("/rabbit/test")
-public class RabbitTest {
+//public class RabbitTest {
-
+//
-    @Autowired
+//    @Autowired
-    private RabbitTemplate rabbitTemplate;
+//    private RabbitTemplate rabbitTemplate;
-
+//
-    @Bean
+//    @Bean
-    public Queue initQueue(){
+//    public Queue initQueue(){
-        return new Queue("rabbit.test.init");
+//        return new Queue("rabbit.test.init");
-    }
+//    }
-
+//
-    @RabbitListener(queues = "rabbit.test.init")
+//    @RabbitListener(queues = "rabbit.test.init")
-    public void msg(SysConfig sysConfig){
+//    public void msg(SysConfig sysConfig){
-        log.info("消息队列：[{}], 消息内容：[{}]", "rabbit.test.init", JSONObject.toJSONString(sysConfig));
+//        log.info("消息队列：[{}], 消息内容：[{}]", "rabbit.test.init", JSONObject.toJSONString(sysConfig));
-    }
+//    }
-
+//
-    @PostConstruct
+//    @PostConstruct
-    public void init(){
+//    public void init(){
-        new Thread(() -> {
+//        new Thread(() -> {
-            try {
+//            try {
-                Thread.sleep(5000);
+//                Thread.sleep(5000);
-            } catch (InterruptedException e) {
+//            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
+//                throw new RuntimeException(e);
-            }
+//            }
-            SysConfig sysConfig = SysConfig.builder()
+//            SysConfig sysConfig = SysConfig.builder()
-                    .configId(1L)
+//                    .configId(1L)
-                    .configKey("ceshi-key")
+//                    .configKey("ceshi-key")
-                    .configName("测试名称")
+//                    .configName("测试名称")
-                    .configType("测试类型")
+//                    .configType("测试类型")
-                    .configValue("测试值")
+//                    .configValue("测试值")
-                    .build();
+//                    .build();
-            rabbitTemplate.convertAndSend("rabbit.test.init",sysConfig);
+//            rabbitTemplate.convertAndSend("rabbit.test.init",sysConfig);
-        }).start();
+//        }).start();
-    }
+//    }
-
+//
-}
+//}

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

@@ -225,4 +225,7 @@ public interface SysUserService extends IService<SysUser> {
      * @return 结果
      */
     public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    List<SysUser> selectCompanyList();
+
 }

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

@@ -500,4 +500,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return successMsg.toString();
     }
 
+    @Override
+    public List<SysUser> selectCompanyList() {
+
+        return userMapper.selectCompanyList();
+    }
+
 }

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

@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 47.116.173.119:8848
+  addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: five
+  namespace: four
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:
@@ -53,8 +53,7 @@ spring:
           - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
           # xxl-job 配置文件
           - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-          # rabbit 配置文件
+
-          - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 logging:
   level:
     com.muyu.system.mapper: DEBUG

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

@@ -14,6 +14,7 @@
         <result property="sex" column="sex"/>
         <result property="avatar" column="avatar"/>
         <result property="password" column="password"/>
+        <result property="databaseName" column="database_name"/>
         <result property="status" column="status"/>
         <result property="delFlag" column="del_flag"/>
         <result property="loginIp" column="login_ip"/>
@@ -57,6 +58,7 @@
                u.password,
                u.sex,
                u.status,
+               u.database_name,
                u.del_flag,
                u.login_ip,
                u.login_date,
@@ -84,7 +86,7 @@
 
     <select id="selectUserList" parameterType="com.muyu.common.system.domain.SysUser" 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, d.dept_name, d.leader from sys_user
+        u.del_flag,u.database_name, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 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'
@@ -184,6 +186,10 @@
         limit 1
     </select>
 
+    <select id="selectCompanyList" resultType="com.muyu.common.system.domain.SysUser">
+        select * from sys_user where sys_user.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

@@ -12,6 +12,9 @@
         <module>cloud-modules-system</module>
         <module>cloud-modules-gen</module>
         <module>cloud-modules-file</module>
+        <module>cloud-modules-template</module>
+        <module>cloud-modules-fence</module>
+        <module>cloud-car</module>
     </modules>
 
     <artifactId>cloud-modules</artifactId>

cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml

@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 47.116.173.119:8848
+  addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: five
+  namespace: four
 
 # Spring
 spring:

pom.xml

@@ -42,11 +42,17 @@
         <hutool.version>5.8.27</hutool.version>
         <knife4j-openapi3.version>4.1.0</knife4j-openapi3.version>
         <xxl-job-core.version>2.4.1</xxl-job-core.version>
+        <dynamic.datasource.version>4.2.0</dynamic.datasource.version>
     </properties>
 
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+                <version>${dynamic.datasource.version}</version>
+            </dependency>
             <!-- SpringBoot 依赖配置 -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -266,6 +272,12 @@
                 <artifactId>cloud-common-rabbit</artifactId>
                 <version>${muyu.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.muyu</groupId>
+                <artifactId>cloud-common-saas</artifactId>
+                <version>${muyu.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>