cloud-auth/pom.xml

@@ -16,6 +16,12 @@
 
     <dependencies>
 
+
+<!--        <dependency>-->
+<!--            <groupId>com.muyu</groupId>-->
+<!--            <artifactId>cloud-common-saas</artifactId>-->
+<!--        </dependency>-->
+
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -34,6 +40,7 @@
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
+
         <!-- SpringBoot Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -58,6 +65,50 @@
             <artifactId>cloud-common-api-doc</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>
+
+        <!-- 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>
+
+
     </dependencies>
 
     <build>

cloud-auth/src/main/java/com/muyu/auth/CloudAuthApplication.java

@@ -1,5 +1,8 @@
 package com.muyu.auth;
 
+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;
@@ -10,10 +13,18 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  *
  * @author muyu
  */
+@EnableCustomConfig
 @EnableMyFeignClients
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication(
+        exclude = {
+                DataSourceAutoConfiguration.class,
+                DruidDataSourceAutoConfigure.class,
+                DynamicDataSourceAutoConfiguration.class
+        }
+)
 public class CloudAuthApplication {
     public static void main (String[] args) {
         SpringApplication.run(CloudAuthApplication.class, args);
+        System.out.println("CloudAuth 模块启动成功!");
     }
 }

cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java

@@ -10,7 +10,11 @@ import com.muyu.common.security.auth.AuthUtil;
 import com.muyu.common.security.service.TokenService;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.LoginUser;
+
+import javax.annotation.Resource;
+
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,16 +29,20 @@ import jakarta.servlet.http.HttpServletRequest;
  */
 @RestController
 public class TokenController {
-    @Autowired
+
+    @Resource
     private TokenService tokenService;
 
     @Autowired
+
     private SysLoginService sysLoginService;
 
     @PostMapping("login")
     public Result<?> login (@RequestBody LoginBody form) {
         // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+
+        LoginUser userInfo = sysLoginService.login(form);
+
         // 获取登录token
         return Result.success(tokenService.createToken(userInfo));
     }

cloud-auth/src/main/java/com/muyu/auth/form/LoginBody.java

@@ -1,11 +1,21 @@
 package com.muyu.auth.form;
 
+
+import lombok.Data;
+
+
+
 /**
  * 用户登录对象
  *
  * @author muyu
  */
+
+@Data
 public class LoginBody {
+
+    private String firmCode;
+
     /**
      * 用户名
      */
@@ -16,6 +26,8 @@ public class LoginBody {
      */
     private String password;
 
+
+
     public String getUsername () {
         return username;
     }
@@ -24,11 +36,5 @@ public class LoginBody {
         this.username = username;
     }
 
-    public String getPassword () {
-        return password;
-    }
 
-    public void setPassword (String password) {
-        this.password = password;
-    }
 }

cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java

@@ -1,5 +1,6 @@
 package com.muyu.auth.service;
 
+import com.muyu.auth.form.LoginBody;
 import com.muyu.common.core.constant.CacheConstants;
 import com.muyu.common.core.constant.Constants;
 import com.muyu.common.core.constant.SecurityConstants;
@@ -12,12 +13,15 @@ import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.ip.IpUtils;
 import com.muyu.common.redis.service.RedisService;
 import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.remote.RemoteUserService;
-import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.domain.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.muyu.common.system.domain.SysUser;
+import com.muyu.common.system.remote.RemoteSaasService;
+import com.muyu.common.system.remote.RemoteUserService;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
+
 /**
  * 登录校验方法
  *
@@ -25,24 +29,30 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class SysLoginService {
-    @Autowired
+    @Resource
     private RemoteUserService remoteUserService;
 
-    @Autowired
+    @Resource
     private SysPasswordService passwordService;
 
-    @Autowired
+    @Resource
     private SysRecordLogService recordLogService;
 
-    @Autowired
+    @Resource
     private RedisService redisService;
 
+    @Resource
+    private RemoteSaasService remoteSaasService;
+
     /**
      * 登录
      */
-    public LoginUser login (String username, String password) {
+    public LoginUser login (LoginBody form) {
+        String firmCode = form.getFirmCode();
+        String username = form.getUsername();
+        String password = form.getPassword();
         // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password)) {
+        if (StringUtils.isAnyBlank(firmCode, username, password)) {
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
             throw new ServiceException("用户/密码必须填写");
         }
@@ -65,8 +75,7 @@ public class SysLoginService {
             throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
         }
         // 查询用户信息
-        Result<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
+        Result<LoginUser> userResult = remoteUserService.getUserInfo(firmCode, username, SecurityConstants.INNER);
-
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
             throw new ServiceException("登录用户：" + username + " 不存在");
@@ -76,8 +85,8 @@ public class SysLoginService {
             throw new ServiceException(userResult.getMsg());
         }
 
-        LoginUser userInfo = userResult.getData();
+        LoginUser loginUser = userResult.getData();
-        SysUser user = userResult.getData().getSysUser();
+        SysUser user = loginUser.getSysUser();
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
             throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
@@ -88,7 +97,8 @@ public class SysLoginService {
         }
         passwordService.validate(user, password);
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
-        return userInfo;
+
+        return loginUser;
     }
 
     public void logout (String loginName) {

cloud-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java

@@ -6,7 +6,11 @@ import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.redis.service.RedisService;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.SysUser;
+
+import javax.annotation.Resource;
+
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.stereotype.Component;
 
 import java.util.concurrent.TimeUnit;
@@ -18,14 +22,22 @@ import java.util.concurrent.TimeUnit;
  */
 @Component
 public class SysPasswordService {
+
+    @Resource
+
     @Autowired
+
     private RedisService redisService;
 
     private int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT;
 
     private Long lockTime = CacheConstants.PASSWORD_LOCK_TIME;
 
+
+    @Resource
+
     @Autowired
+
     private SysRecordLogService recordLogService;
 
     /**

cloud-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java

@@ -6,7 +6,11 @@ import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.ip.IpUtils;
 import com.muyu.common.system.remote.RemoteLogService;
 import com.muyu.common.system.domain.SysLogininfor;
+
+import javax.annotation.Resource;
+
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.stereotype.Component;
 
 /**
@@ -16,7 +20,11 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class SysRecordLogService {
+
+    @Resource
+
     @Autowired
+
     private RemoteLogService remoteLogService;
 
     /**

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

@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: nacos.muyu.icu:8848
+  addr: 47.116.173.119:8848
   user-name: nacos
   password: nacos
-  namespace: muyu-cloud
+  namespace: oneone
 # Spring
 spring:
   application:
@@ -22,26 +22,26 @@ spring:
         # 服务注册地址
         server-addr: ${nacos.addr}
         # nacos用户名
-        username: ${nacos.user-name}
+#        username: ${nacos.user-name}
-        # nacos密码
+#        # nacos密码
-        password: ${nacos.password}
+#        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
       config:
         # 服务注册地址
         server-addr: ${nacos.addr}
         # nacos用户名
-        username: ${nacos.user-name}
+#        username: ${nacos.user-name}
-        # nacos密码
+#        # nacos密码
-        password: ${nacos.password}
+#        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}
+          # 系统共享配置
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 

cloud-common/cloud-common-cache/pom.xml

@@ -0,0 +1,30 @@
+<?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-cache</artifactId>
+    <description>
+        cloud-common-cache 缓存基准
+    </description>
+    <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-redis</artifactId>
+        </dependency>
+
+    </dependencies>
+</project>

cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/AtomicSequenceCache.java

@@ -0,0 +1,37 @@
+package com.muyu.common.cache;
+
+import com.muyu.common.cache.decoration.DecorationKey;
+
+/**
+ * @author DongZl
+ * @description: 原子序列缓存基准
+ * @Date 2024-4-1 下午 08:07
+ */
+public interface AtomicSequenceCache<K> extends DecorationKey<K> {
+
+    /**
+     * 获取存储的值
+     * @param key 键
+     * @return 值
+     */
+    public Long get(K key);
+
+    /**
+     * 自增
+     */
+    public Long increment(K key);
+    /**
+     * 自减
+     */
+    public Long decrement(K key);
+
+    /**
+     * 增加数值
+     */
+    public Long increment(K key, Long number);
+
+    /**
+     * 减少数值
+     */
+    public Long decrement(K key, Long number);
+}

cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/BasicCacheData.java

@@ -0,0 +1,11 @@
+package com.muyu.common.cache;
+
+/**
+ * 数据转换接口
+ * @param <K> 数据键
+ * @param <V> 数据值
+ */
+public interface BasicCacheData <K,V>{
+
+    public V apply(K key);
+}

cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/Cache.java

@@ -0,0 +1,43 @@
+package com.muyu.common.cache;
+
+import com.muyu.common.cache.decoration.DecorationKey;
+
+/**
+ * @author DongZl
+ * @description: 缓存接口基类
+ * @Date 2024-3-26 下午 03:25
+ */
+public interface Cache <K, V> extends DecorationKey<K> {
+
+    /**
+     * 通过Key获取value值
+     * @param key 键
+     * @return 值
+     */
+    public V get(K key);
+
+    /**
+     * 缓存添加/修改
+     * @param key 键
+     * @param value 值
+     */
+    public void put(K key, V value);
+
+    /**
+     * 通过键删除
+     * @param key 键
+     */
+    public void remove(K key);
+
+    /**
+     * 刷新缓存时间
+     * @param key 键
+     */
+    public void refreshTime (K key);
+
+    /**
+     * 刷新缓存数据
+     * @param key 键
+     */
+    public void refreshData (K key);
+}

cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/HashCache.java

@@ -0,0 +1,104 @@
+package com.muyu.common.cache;
+
+import com.muyu.common.cache.decoration.DecorationKey;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * @author DongZl
+ * @description: Hash缓存基准
+ * @Date 2024-3-29 下午 03:16
+ */
+public interface HashCache <K, HK, HV> extends DecorationKey<K> {
+
+
+    /**
+     * 编码
+     * @param hashKey ID
+     * @return 键
+     */
+    public String encodeHashKey(HK hashKey);
+
+    /**
+     * 解码
+     * @param redisHashKey 数据库键
+     * @return ID
+     */
+    public HK decodeHashKey(String redisHashKey);
+
+    /**
+     * 通过Key获取所有的map
+     * @param key 数据库键
+     * @return 所有集合Map
+     */
+    public Map<HK, HV> get(K key);
+
+    /**
+     * 通过键和hashKey获取数据库hashValue
+     * @param key 键
+     * @param hashKey hash键
+     * @return hash值
+     */
+    public HV get(K key, HK hashKey);
+
+    /**
+     * 通过键和hashKey获取数据库hashValue
+     * @param key 键
+     * @param hashKeyList hash键集合
+     * @return hash值
+     */
+    public List<HV> get(K key, HK... hashKeyList);
+
+    /**
+     * 获取hash值集合
+     * @param key 键
+     * @return hash值集合
+     */
+    public List<HV> getToList(K key);
+
+    /**
+     * 存储数据
+     * @param key redis键
+     * @param map hashMap集合
+     */
+    public void put(K key, Map<HK, HV> map);
+
+    /**
+     * 存储数据
+     * @param key redis键
+     * @param dataList 数据值
+     * @param hashKey hash键
+     */
+    public void put(K key, List<HV> dataList, Function<HV, HK> hashKey);
+
+    /**
+     * 存储数据
+     * @param key redis键
+     * @param hashKey hash键
+     * @param hashValue hash值
+     */
+    public void put(K key, HK hashKey, HV hashValue);
+
+    /**
+     * 通过redis键删除
+     * @param key hash键
+     */
+    public void remove(K key);
+
+    /**
+     * 通过redis键和hash键删除
+     * @param key redis键
+     * @param hashKey hash键
+     */
+    public void remove(K key, HK hashKey);
+
+    /**
+     * 判断redis中hashKey是否存在
+     * @param key redis键
+     * @param hashKey hash键
+     */
+    public boolean hasKey(K key, HK hashKey);
+
+}

cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/abs/AtomicSequenceCacheAbs.java

@@ -0,0 +1,99 @@
+package com.muyu.common.cache.abs;
+
+import com.muyu.common.cache.AtomicSequenceCache;
+import com.muyu.common.redis.service.RedisService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @author DongZl
+ * @description: 原子序列缓存抽象类
+ * @Date 2024-4-1 下午 08:33
+ */
+public abstract class AtomicSequenceCacheAbs<K> implements AtomicSequenceCache<K> {
+
+    @Autowired
+    private RedisService redisService;
+
+    /**
+     * 获取存储的值
+     * @param key 键
+     * @return 值
+     */
+    @Override
+    public Long get (K key) {
+        Long cacheValue = this.redisService.getCacheObject(encode(key));
+        if (cacheValue == null){
+            Long data = getData(key);
+            cacheValue = data == null ? 0L : data;
+            this.redisService.setCacheObject(encode(key), cacheValue);
+        }
+        return cacheValue;
+    }
+
+    /**
+     * 自增
+     * @param key
+     */
+    @Override
+    public Long increment (K key) {
+        return this.increment(key, 1L);
+    }
+
+    /**
+     * 自减
+     *
+     * @param key
+     */
+    @Override
+    public Long decrement (K key) {
+        return this.decrement(key, 1L);
+    }
+
+    /**
+     * 增加数值
+     *
+     * @param key
+     * @param number
+     */
+    @Override
+    public Long increment (K key, Long number) {
+        Long numberValue = redisService.getCacheObject(encode(key));
+        if (numberValue == null){
+            Long data = getData(key);
+            data = data == null ? 0L : data;
+            redisService.setCacheObject(encode(key), data);
+        }
+        return redisService.increment(encode(key), number);
+    }
+
+    /**
+     * 减少数值
+     *
+     * @param key
+     * @param number
+     */
+    @Override
+    public Long decrement (K key, Long number) {
+        Long numberValue = redisService.getCacheObject(encode(key));
+        if (numberValue == null){
+            Long data = getData(key);
+            data = data == null ? 0L : data;
+            redisService.setCacheObject(encode(key), data);
+        }
+        return redisService.decrement(encode(key), number);
+    }
+
+    /**
+     * 编码
+     *
+     * @param key ID
+     *
+     * @return 键
+     */
+    @Override
+    public String encode (K key) {
+        return keyPre() + key;
+    }
+
+    public abstract Long getData(K key);
+}

cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/abs/CacheAbs.java

@@ -0,0 +1,96 @@
+package com.muyu.common.cache.abs;
+
+import com.muyu.common.cache.Cache;
+import com.muyu.common.redis.service.RedisService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author DongZl
+ * @description: 缓存抽象类
+ * @Date 2024-3-27 下午 03:10
+ */
+public abstract class CacheAbs<K, V> implements Cache<K, V> {
+
+    @Autowired
+    private RedisService redisService;
+
+    /**
+     * 编码
+     * @param key ID
+     * @return 键
+     */
+    @Override
+    public String encode (K key) {
+        return keyPre() + key;
+    }
+
+    /**
+     * 通过Key获取value值
+     * @param key 键
+     * @return 值
+     */
+    @Override
+    public V get (K key) {
+        V value = redisService.getCacheObject(encode(key));
+        if (value == null){
+            value = getData(key);
+            if (value == null){
+                value = defaultValue();
+            }
+        }
+        this.put(key, value);
+        return value;
+    }
+
+    /**
+     * 缓存添加/修改
+     * @param key   键
+     * @param value 值
+     */
+    @Override
+    public void put (K key, V value) {
+        this.redisService.setCacheObject(encode(key), value);
+    }
+
+    /**
+     * 通过键删除
+     * @param key 键
+     */
+    @Override
+    public void remove (K key) {
+        this.redisService.deleteObject(encode(key));
+    }
+
+    /**
+     * 刷新缓存
+     * @param key 键
+     */
+    @Override
+    public void refreshTime (K key) {
+        this.redisService.expire(encode(key), 60, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 刷新缓存数据
+     *
+     * @param key 键
+     */
+    @Override
+    public void refreshData (K key) {
+        this.put(key, getData(key));
+    }
+
+    /**
+     * 从数据库获取数据
+     * @param key ID
+     * @return 缓存对象
+     */
+    public abstract V getData(K key);
+
+    /**
+     * 默认值
+     */
+    public abstract V defaultValue();
+}

cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/abs/HashCacheAbs.java

@@ -0,0 +1,223 @@
+package com.muyu.common.cache.abs;
+
+import com.muyu.common.cache.HashCache;
+import com.muyu.common.redis.service.RedisService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * @author DongZl
+ * @description: hash缓存抽象类
+ * @Date 2024-3-29 下午 07:40
+ */
+public abstract class HashCacheAbs<K, HK, HV> implements HashCache<K, HK, HV> {
+
+    @Autowired
+    private RedisService redisService;
+
+    /**
+     * 编码
+     *
+     * @param key ID
+     *
+     * @return 键
+     */
+    @Override
+    public String encode (K key) {
+        return keyPre() + key;
+    }
+
+    /**
+     * 编码
+     * @param hashKey ID
+     * @return 键
+     */
+    @Override
+    public String encodeHashKey (HK hashKey) {
+        return hashKey.toString();
+    }
+
+    /**
+     * 通过Key获取所有的map
+     * @param key 数据库键
+     * @return 所有集合Map
+     */
+    @Override
+    public Map<HK, HV> get (K key) {
+        // 获取为null的情况
+        Map<String, HV> cacheMap = redisService.getCacheMap(encode(key));
+        if (cacheMap == null || cacheMap.isEmpty()){
+            Map<HK, HV> dataMap = getData(key);
+            if (dataMap != null && !dataMap.isEmpty()){
+                cacheMap = encodeMap(dataMap);
+            }else {
+                cacheMap = encodeMap(defaultValue());
+            }
+            redisService.setCacheMap(encode(key), cacheMap);
+        }
+        return decodeMap(cacheMap);
+    }
+
+    /**
+     * 通过键和hashKey获取数据库hashValue
+     *
+     * @param key     键
+     * @param hashKey hash键
+     *
+     * @return hash值
+     */
+    @Override
+    public HV get (K key, HK hashKey) {
+        HV hashValue = redisService.getCacheMapValue(encode(key), encodeHashKey(hashKey));
+        if (hashValue == null){
+            HV dataValue = getData(key, hashKey);
+            hashValue = dataValue != null ? dataValue : defaultHashValue();
+            put(key, hashKey, hashValue);
+        }
+        return hashValue;
+    }
+
+    /**
+     * 通过键和hashKey获取数据库hashValue
+     *
+     * @param key         键
+     * @param hashKeyList hash键集合
+     *
+     * @return hash值
+     */
+    @Override
+    public List<HV> get (K key, HK... hashKeyList) {
+        List<String> encodeHashKeyList = Arrays.stream(hashKeyList).map(this::encodeHashKey).toList();
+        return redisService.getMultiCacheMapValue(encode(key), encodeHashKeyList);
+    }
+
+    /**
+     * 获取hash值集合
+     *
+     * @param key 键
+     *
+     * @return hash值集合
+     */
+    @Override
+    public List<HV> getToList (K key) {
+        Map<HK, HV> hkhvMap = get(key);
+        return hkhvMap.values().stream().toList();
+    }
+
+    /**
+     * 存储数据
+     *
+     * @param key redis键
+     * @param map hashMap集合
+     */
+    @Override
+    public void put (K key, Map<HK, HV> map) {
+        redisService.setCacheMap(encode(key), encodeMap(map));
+    }
+
+    /**
+     * 存储数据
+     *
+     * @param key      redis键
+     * @param dataList 数据值
+     * @param hashKey  hash键
+     */
+    @Override
+    public void put (K key, List<HV> dataList, Function<HV, HK> hashKey) {
+        Map<HK, HV> dataMap = new HashMap<>();
+        dataList.forEach((data) -> dataMap.put(hashKey.apply(data), data));
+        redisService.setCacheMap(encode(key), encodeMap(dataMap));
+    }
+
+    /**
+     * 存储数据
+     *
+     * @param key       redis键
+     * @param hashKey   hash键
+     * @param hashValue hash值
+     */
+    @Override
+    public void put (K key, HK hashKey, HV hashValue) {
+        redisService.setCacheMapValue(encode(key), encodeHashKey(hashKey), hashValue);
+    }
+
+    /**
+     * 通过redis键删除
+     *
+     * @param key hash键
+     */
+    @Override
+    public void remove (K key) {
+        redisService.deleteObject(encode(key));
+    }
+
+    /**
+     * 通过redis键和hash键删除
+     *
+     * @param key     redis键
+     * @param hashKey hash键
+     */
+    @Override
+    public void remove (K key, HK hashKey) {
+        redisService.deleteCacheMapValue(encode(key), encodeHashKey(hashKey));
+    }
+
+    /**
+     * 判断redis中hashKey是否存在
+     *
+     * @param key     redis键
+     * @param hashKey hash键
+     */
+    @Override
+    public boolean hasKey (K key, HK hashKey) {
+        return redisService.hashKey(encode(key), encodeHashKey(hashKey));
+    }
+
+    /**
+     * 原始数据转编码数据
+     * @param dataMap 原始数据
+     * @return 编码数据
+     */
+    private Map<String, HV> encodeMap(Map<HK, HV> dataMap){
+        Map<String, HV> encodeDataMap = new HashMap<>();
+        dataMap.forEach((hashKey, HashValue) -> encodeDataMap.put(encodeHashKey(hashKey), HashValue));
+        return encodeDataMap;
+    }
+
+    /**
+     * 编码数据转原始数据
+     * @param encodeDataMap 编码数据
+     * @return 原始数据
+     */
+    private Map<HK, HV> decodeMap(Map<String, HV> encodeDataMap){
+        Map<HK, HV> dataMap = new HashMap<>();
+        encodeDataMap.forEach((hashKey, hashValue) -> dataMap.put(decodeHashKey(hashKey), hashValue));
+        return dataMap;
+    }
+
+    /**
+     * 通过键获取所有的hash数据
+     * @param key 键
+     * @return
+     */
+    public abstract Map<HK, HV> getData(K key);
+
+    /**
+     * 通过缓存键和hash键获取hash值
+     * @param key 缓存键
+     * @param hashKey hash键
+     * @return hash值
+     */
+    public abstract HV getData(K key, HK hashKey);
+
+    /**
+     * 默认值
+     */
+    public abstract Map<HK, HV> defaultValue();
+    public abstract HV defaultHashValue();
+}

cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/decoration/DecorationKey.java

@@ -0,0 +1,30 @@
+package com.muyu.common.cache.decoration;
+
+/**
+ * @author DongZl
+ * @description: 装饰Key
+ * @Date 2024-3-29 下午 03:19
+ */
+public interface DecorationKey <K>{
+
+    /**
+     * key前缀
+     * @return key前缀
+     */
+    public String keyPre();
+
+
+    /**
+     * 编码
+     * @param key ID
+     * @return 键
+     */
+    public String encode(K key);
+
+    /**
+     * 解码
+     * @param redisKey 数据库键
+     * @return ID
+     */
+    public K decode(String redisKey);
+}

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

@@ -0,0 +1,2 @@
+com.muyu.common.kafka.config.KafkaConsumerConfig
+com.muyu.common.kafka.config.KafkaProviderConfig

cloud-common/cloud-common-caffeine/pom.xml

@@ -0,0 +1,35 @@
+<?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-caffeine</artifactId>
+    <description>
+        cloud-common-caffeine caffeine缓存模块
+    </description>
+    <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-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/bean/CaffeineManager.java

@@ -0,0 +1,51 @@
+package com.muyu.common.caffeine.bean;
+
+
+import com.muyu.common.caffeine.enums.CacheNameEnums;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.caffeine.CaffeineCache;
+import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * Caffeine管理器
+ * @Author: 胡杨
+ * @Name: CaffeineCacheConfig
+ * @Description: Caffeine管理器
+ * @CreatedDate: 2024/9/26 上午11:52
+ * @FilePath: com.muyu.common.caffeine.config
+ */
+
+@Slf4j
+@Component
+public class CaffeineManager {
+
+    /**
+     * 创建缓存管理器
+     * @return  缓存管理器实例
+     */
+    @Bean
+    public SimpleCacheManager simpleCacheManager() {
+        SimpleCacheManager cacheManager = new SimpleCacheManager();
+        List<String> cacheNames = CacheNameEnums.getCodes();
+        cacheManager.setCaches(cacheNames.stream()
+                .map(name -> new CaffeineCache(
+                        name,
+                        Caffeine.newBuilder()
+                                .recordStats()
+                                .build()))
+                .toList());
+        log.info("缓存管理器初始化完成,缓存分区:{}", cacheNames);
+        return cacheManager;
+    }
+
+}

cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/constents/CaffeineContent.java

@@ -0,0 +1,17 @@
+package com.muyu.common.caffeine.constents;
+
+/**
+ * Caffeine常量
+ * @Author: 胡杨
+ * @Name: CaffeineContent
+ * @Description: Caffeine常量
+ * @CreatedDate: 2024/9/26 下午12:06
+ * @FilePath: com.muyu.common.caffeine.constents
+ */
+
+public class CaffeineContent {
+
+    public static final String CAR_VIN_KEY = "car:vin";
+
+    public static final String VIN = "vin";
+}

cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/enums/CacheNameEnums.java

@@ -0,0 +1,68 @@
+package com.muyu.common.caffeine.enums;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 缓存分区枚举
+ *
+ * @Author: 胡杨
+ * @Name: CacheNameEnums
+ * @Description: 缓存分区枚举
+ * @CreatedDate: 2024/10/2 上午9:17
+ * @FilePath: com.muyu.common.caffeine.enums
+ */
+
+@Getter
+public enum CacheNameEnums {
+    STORAGE("storage", "持久化"),
+    FAULT("fault", "故障"),
+    FENCE("fence", "围栏"),
+    WARMING("warming", "预警"),
+    REALTIME("realTime", "实时信息");
+
+    private final String code;
+    private final String info;
+
+    CacheNameEnums(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    /**
+     * 鉴别参数是否是枚举的值
+     *
+     * @param code 需鉴别参数
+     * @return 如果存在返回结果turn, 否则返回false
+     */
+    public static boolean isCode(String code) {
+        return Arrays.stream(values())
+                .map(CacheNameEnums::getCode)
+                .anyMatch(c -> c.equals(code));
+    }
+
+    /**
+     * 获取枚举Value
+     * @param code 编码
+     * @return  Value
+     */
+    public static String getInfo(String code) {
+        return Arrays.stream(values())
+                .filter(c -> c.getCode().equals(code))
+                .map(CacheNameEnums::getInfo)
+                .findFirst()
+                .orElse("");
+    }
+
+    /**
+     * 获取所有code
+     * @return code集合
+     */
+    public static List<String> getCodes() {
+        return Arrays.stream(values())
+                .map(CacheNameEnums::getCode)
+                .toList();
+    }
+}

cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/utils/CaffeineCacheUtils.java

@@ -0,0 +1,97 @@
+package com.muyu.common.caffeine.utils;
+
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.muyu.common.caffeine.constents.CaffeineContent;
+import com.muyu.common.caffeine.enums.CacheNameEnums;
+import com.muyu.common.redis.service.RedisService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.caffeine.CaffeineCache;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Caffeine缓存工具
+ * @Author: 胡杨
+ * @Name: CaffeineUtils
+ * @Description: 缓存工具类
+ * @CreatedDate: 2024/9/26 下午2:53
+ * @FilePath: com.muyu.common.caffeine
+ */
+@Slf4j
+@Component
+public class CaffeineCacheUtils {
+    @Resource
+    private CacheManager cacheManager;
+    @Resource
+    private RedisTemplate<String, String> redisTemplate;
+
+
+    /**
+     * 车辆上线 - 新增缓存
+     */
+    public void addCarCache(String vin) {
+        // 从Redis中获取缓存信息
+        for (String name : CacheNameEnums.getCodes()) {
+            String value = redisTemplate.opsForValue().get(name+":"+vin);
+            cacheManager.getCache(name).put(vin, value);
+            log.info("存储缓存, 缓存分区:[{}], 车辆编码:[{}], 存储值:[{}]", name, vin, value);
+        }
+        log.info("车辆编码:{},本地缓存完成...",vin);
+    }
+
+    /**
+     * 车辆下线 - 删除缓存
+     */
+    public void deleteCarCache(String cacheName) {
+        if (!hasCarVinCache(cacheName,null)) {
+            log.warn("车辆编码:{},本地缓存不存在该车辆信息...", cacheName);
+            return;
+        }
+        cacheManager.getCache(cacheName).invalidate();
+        log.info("车辆编码:{},本地缓存删除完成...", cacheName);
+    }
+
+    /**
+     * 获取车辆信息缓存
+     */
+    public Object getCarCache(String cacheName, String key) {
+        if (!hasCarVinCache(cacheName, key)){
+            log.warn("车辆编码:{},本地缓存不存在该车辆信息...",cacheName);
+            return null;
+        }
+        return cacheManager.getCache(cacheName).get(key).get();
+    }
+
+    /**
+     * 获取车辆信息缓存
+     */
+    public <T> T getCarCache(String cacheName, String key, Class<T> type) {
+        if (!hasCarVinCache(cacheName,key)){
+            log.warn("车辆编码:{},本地缓存不存在该车辆信息...",cacheName);
+            return null;
+        }
+        return cacheManager.getCache(cacheName).get(key, type);
+    }
+
+    /**
+     * 判断缓存存在与否
+     */
+    public Boolean hasCarVinCache(String cacheName,String key) {
+        boolean notEmpty = ObjectUtils.isNotEmpty(cacheManager.getCache(cacheName));
+        if (notEmpty && StringUtils.isNotEmpty(key)){
+            return ObjectUtils.isNotEmpty(cacheManager.getCache(cacheName).get(key).get());
+        }
+        return notEmpty;
+
+    }
+
+}

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

@@ -0,0 +1,2 @@
+com.muyu.common.caffeine.utils.CaffeineCacheUtils
+com.muyu.common.caffeine.bean.CaffeineManager

cloud-common/cloud-common-core/pom.xml

@@ -17,6 +17,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-boot-starter</artifactId>
+            <version>1.4.11</version>
+        </dependency>
+
         <!-- SpringCloud Openfeign -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -164,6 +170,13 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <version>1.2.2</version>
+        </dependency>
+
     </dependencies>
 
 </project>

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

@@ -45,4 +45,11 @@ 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,14 @@ public class ServiceNameConstants {
      * 文件服务的serviceid
      */
     public static final String FILE_SERVICE = "cloud-file";
+
+    /**
+     * 智能车联服务
+     */
+    public static final String SMART_SERVICE = "cloud-smart-car";
+
+    public static final String ENT_SERVICE = "cloud-ent";
+
+    public static final String SAAS_SERVICE = "cloud-system-saas";
+
 }

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/context/SecurityContextHolder.java

@@ -80,4 +80,14 @@ public class SecurityContextHolder {
     public static void remove () {
         THREAD_LOCAL.remove();
     }
+
+
+    public static String getSaasKey() {
+        return get(SecurityConstants.SAAS_KEY);
+    }
+    public static void setSaasKey(String saasKey) {
+        set(SecurityConstants.SAAS_KEY,saasKey);
+    }
+
+
 }

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/ClassType.java

@@ -0,0 +1,63 @@
+package com.muyu.common.core.enums;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 类型枚举
+ *
+ * @Author: 胡杨
+ * @Name: ClassType
+ * @Description: 类型枚举
+ * @CreatedDate: 2024/9/29 上午9:28
+ * @FilePath: com.muyu.common.core.enums
+ */
+
+@Getter
+public enum ClassType {
+    BYTE("byte", byte.class),
+    SHORT("short", short.class),
+    INT("int", int.class),
+    LONG("long", long.class),
+    FLOAT("float", float.class),
+    DOUBLE("double", double.class),
+    BOOLEAN("boolean", boolean.class),
+    CHAR("char", char.class),
+    STRING("String", String.class),
+    SET("Set", Set.class),
+    MAP("Map", Map.class),
+    LIST("List", List.class);
+
+    private final String code;
+    private final Class<?> info;
+
+    ClassType(String code, Class<?> info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    /**
+     * 鉴别参数是否是枚举的值
+     *
+     * @param code 需鉴别参数
+     * @return 如果存在返回结果turn, 否则返回false
+     */
+    public static boolean isCode(String code) {
+        return Arrays.stream(values())
+                .map(ClassType::getCode)
+                .anyMatch(c -> c.equals(code));
+    }
+
+
+    public static Class<?> getInfo(String code) {
+        return Arrays.stream(values())
+                .filter(c -> c.getCode().equals(code))
+                .findFirst()
+                .map(ClassType::getInfo)
+                .orElse(null);
+    }
+}

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,17 @@ 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-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java

@@ -58,7 +58,8 @@ public class IpUtils {
             ip = request.getRemoteAddr();
         }
 
-        return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip);
+
+        return "0:0:0:0:0:0:0:1".equals(ip) ? "106.54.193.225" : getMultistageReverseProxyIp(ip);
     }
 
     /**
@@ -70,7 +71,10 @@ public class IpUtils {
      */
     public static boolean internalIp (String ip) {
         byte[] addr = textToNumericFormatV4(ip);
-        return internalIp(addr) || "127.0.0.1".equals(ip);
+
+        return internalIp(addr) || "106.54.193.225".equals(ip);
+
+
     }
 
     /**
@@ -197,7 +201,8 @@ public class IpUtils {
             return InetAddress.getLocalHost().getHostAddress();
         } catch (UnknownHostException e) {
         }
-        return "127.0.0.1";
+
+        return "106.54.193.225";
     }
 
     /**

cloud-common/cloud-common-iotdb/pom.xml

@@ -0,0 +1,36 @@
+<?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-iotdb</artifactId>
+    <description>
+        cloud-common-iotdb 时序数据库模块
+    </description>
+    <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-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.iotdb</groupId>
+            <artifactId>iotdb-session</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+    </dependencies>
+
+</project>

cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/config/IotDBSessionConfig.java

@@ -0,0 +1,53 @@
+package com.muyu.common.iotdb.config;
+
+import org.apache.iotdb.rpc.IoTDBConnectionException;
+import org.apache.iotdb.rpc.StatementExecutionException;
+import org.apache.iotdb.session.Session;
+import org.apache.iotdb.session.pool.SessionPool;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 时序数据库配置
+ *
+ * @Author: 胡杨
+ * @Name: IotDBConfig
+ * @Description: 时序数据库配置
+ * @CreatedDate: 2024/9/29 下午9:30
+ * @FilePath: com.muyu.data.processing.config
+ */
+
+@Configuration
+public class IotDBSessionConfig {
+
+    @Value("${spring.iotdb.ip}")
+    private String ip;
+
+    @Value("${spring.iotdb.port}")
+    private int port;
+
+    @Value("${spring.iotdb.user}")
+    private String user;
+
+    @Value("${spring.iotdb.password}")
+    private String password;
+
+    @Value("${spring.iotdb.fetchSize}")
+    private int fetchSize;
+
+    private static SessionPool sessionPool;
+    @Bean
+    public SessionPool getSessionPool(){
+        if (sessionPool == null) {
+            sessionPool = new SessionPool(ip, port, user, password, fetchSize);
+            try {
+                sessionPool.setTimeZone("+08:00");
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return sessionPool;
+    }
+
+}

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

@@ -0,0 +1 @@
+com.muyu.common.iotdb.config.IotDBSessionConfig

cloud-common/cloud-common-kafka/pom.xml

@@ -0,0 +1,37 @@
+<?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-kafka</artifactId>
+    <description>
+        cloud-common-kafka kafka中间件模块
+    </description>
+    <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-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java

@@ -0,0 +1,54 @@
+package com.muyu.common.kafka.config;
+
+import com.muyu.common.kafka.constants.KafkaConstants;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.serialization.Deserializer;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * kafka 消息的消费者 配置类
+ */
+@Configuration
+public class KafkaConsumerConfig {
+
+    @Bean
+    public KafkaConsumer kafkaConsumer() {
+        Map<String, Object> configs = new HashMap<>();
+        //kafka服务端的IP和端口,格式:(ip:port)
+        configs.put("bootstrap.servers", "47.116.173.119:9092");
+        //开启consumer的偏移量(offset)自动提交到Kafka
+        configs.put("enable.auto.commit", true);
+        //consumer的偏移量(offset) 自动提交的时间间隔,单位毫秒
+        configs.put("auto.commit.interval", 5000);
+        //在Kafka中没有初始化偏移量或者当前偏移量不存在情况
+        //earliest, 在偏移量无效的情况下, 自动重置为最早的偏移量
+        //latest, 在偏移量无效的情况下, 自动重置为最新的偏移量
+        //none, 在偏移量无效的情况下, 抛出异常.
+        configs.put("auto.offset.reset", "latest");
+        //请求阻塞的最大时间(毫秒)
+        configs.put("fetch.max.wait", 500);
+        //请求应答的最小字节数
+        configs.put("fetch.min.size", 1);
+        //心跳间隔时间(毫秒)
+        configs.put("heartbeat-interval", 3000);
+        //一次调用poll返回的最大记录条数
+        configs.put("max.poll.records", 500);
+        //指定消费组
+        configs.put("group.id", KafkaConstants.KafkaGrop);
+        //指定key使用的反序列化类
+        Deserializer keyDeserializer = new StringDeserializer();
+        //指定value使用的反序列化类
+        Deserializer valueDeserializer = new StringDeserializer();
+        //创建Kafka消费者
+        KafkaConsumer kafkaConsumer = new KafkaConsumer(configs, keyDeserializer, valueDeserializer);
+        return kafkaConsumer;
+    }
+
+}

cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaProviderConfig.java

@@ -0,0 +1,45 @@
+package com.muyu.common.kafka.config;
+
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.common.serialization.Serializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * kafka 消息的生产者 配置类
+ */
+@Configuration
+public class KafkaProviderConfig {
+
+    @Bean
+    public KafkaProducer kafkaProducer() {
+        Map<String, Object> configs = new HashMap<>();
+        //#kafka服务端的IP和端口,格式:(ip:port)
+        configs.put("bootstrap.servers", "47.116.173.119:9092");
+        //客户端发送服务端失败的重试次数
+        configs.put("retries", 2);
+        //多个记录被发送到同一个分区时,生产者将尝试将记录一起批处理成更少的请求.
+        //此设置有助于提高客户端和服务器的性能,配置控制默认批量大小(以字节为单位)
+        configs.put("batch.size", 16384);
+        //生产者可用于缓冲等待发送到服务器的记录的总内存字节数(以字节为单位)
+        configs.put("buffer-memory", 33554432);
+        //生产者producer要求leader节点在考虑完成请求之前收到的确认数,用于控制发送记录在服务端的持久化
+        //acks=0,设置为0,则生产者producer将不会等待来自服务器的任何确认.该记录将立即添加到套接字(socket)缓冲区并视为已发送.在这种情况下,无法保证服务器已收到记录,并且重试配置(retries)将不会生效(因为客户端通常不会知道任何故障),每条记录返回的偏移量始终设置为-1.
+        //acks=1,设置为1,leader节点会把记录写入本地日志,不需要等待所有follower节点完全确认就会立即应答producer.在这种情况下,在follower节点复制前,leader节点确认记录后立即失败的话,记录将会丢失.
+        //acks=all,acks=-1,leader节点将等待所有同步复制副本完成再确认记录,这保证了只要至少有一个同步复制副本存活,记录就不会丢失.
+        configs.put("acks", "-1");
+        //指定key使用的序列化类
+        Serializer keySerializer = new StringSerializer();
+        //指定value使用的序列化类
+        Serializer valueSerializer = new StringSerializer();
+        //创建Kafka生产者
+        KafkaProducer kafkaProducer = new KafkaProducer(configs, keySerializer, valueSerializer);
+        return kafkaProducer;
+    }
+
+}

cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/constants/KafkaConstants.java

@@ -0,0 +1,14 @@
+package com.muyu.common.kafka.constants;
+
+/**
+ * @Author: 胡杨
+ * @date: 2024/7/10
+ * @Description: kafka常量
+ * @Version 1.0.0
+ */
+public class KafkaConstants {
+
+    public final static String KafkaTopic = "kafka_topic";
+
+    public final static String KafkaGrop = "kafka_grop";
+}

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

@@ -0,0 +1,2 @@
+com.muyu.common.kafka.config.KafkaConsumerConfig
+com.muyu.common.kafka.config.KafkaProviderConfig

cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java

@@ -18,7 +18,11 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import javax.annotation.Resource;
+
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.core.NamedThreadLocal;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
@@ -48,7 +52,11 @@ public class LogAspect {
      */
     private static final ThreadLocal<Long> TIME_THREADLOCAL = new NamedThreadLocal<Long>("Cost Time");
 
+
+    @Resource
+
     @Autowired
+
     private AsyncLogService asyncLogService;
 
     /**
@@ -82,7 +90,7 @@ public class LogAspect {
 
     protected void handleLog (final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) {
         try {
-            // *========数据库日志=========*//
+            // *=数据库日志==*//
             SysOperLog operLog = new SysOperLog();
             operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
             // 请求的地址

cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java

@@ -3,6 +3,7 @@ package com.muyu.common.log.service;
 import com.muyu.common.core.constant.SecurityConstants;
 import com.muyu.common.system.remote.RemoteLogService;
 import com.muyu.common.system.domain.SysOperLog;
+import javax.annotation.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;

cloud-common/cloud-common-rabbit/pom.xml

@@ -10,7 +10,9 @@
     </parent>
 
     <artifactId>cloud-common-rabbit</artifactId>
-
+    <description>
+        cloud-common-rabbit rabbit中间件模块
+    </description>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
@@ -32,4 +34,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/callback/ConfirmCallback.java

@@ -0,0 +1,44 @@
+package com.muyu.common.rabbit.callback;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.connection.CorrelationData;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Lenovo
+ * @Description 消息发送到broker确认回调
+ */
+
+@Slf4j
+@Component
+public class ConfirmCallback implements RabbitTemplate.ConfirmCallback {
+
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+
+    /**
+     * 初始化
+     */
+    @PostConstruct
+    public void init() {
+        this.rabbitTemplate.setConfirmCallback(this);
+    }
+
+    /**
+     * 回调确认方法（消息发送之后 消息无论发送成功还是失败都会执行这个回调方法）
+     * @param correlationData 回调的相关数据
+     * @param ack 确认结果（true表示消息已经被broker接收，false表示消息未被broker接收）
+     * @param cause 失败原因（当ack为false时，表示拒绝接收消息的原因；当ack为true时，该值为空）
+     */
+    @Override
+    public void confirm(CorrelationData correlationData, boolean ack, String cause) {
+        if (ack) {
+            log.info("消息发送到broker成功！");
+        } else {
+            log.info("消息发送到broker失败，失败原因：{}", cause);
+        }
+    }
+}

cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/callback/ReturnsCallback.java

@@ -0,0 +1,39 @@
+package com.muyu.common.rabbit.callback;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.ReturnedMessage;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Lenovo
+ * @Description 消息发送失败时回调
+ */
+
+@Slf4j
+@Component
+public class ReturnsCallback implements RabbitTemplate.ReturnsCallback {
+
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+
+    /**
+     * 初始化
+     */
+    @PostConstruct
+    public void init() {
+        rabbitTemplate.setReturnsCallback(this);
+    }
+
+    /**
+     * 消息发送到队列失败时执行
+     * @param returnedMessage 返回的消息和元数据
+     */
+    @Override
+    public void returnedMessage(ReturnedMessage returnedMessage) {
+        log.info("消息：{}被交换机：{}回退！回退原因：{}", returnedMessage.getMessage().toString(),
+                returnedMessage.getExchange(), returnedMessage.getReplyText());
+    }
+}

cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/config/RabbitAdminConfig.java

@@ -0,0 +1,72 @@
+package com.muyu.common.rabbit.config;
+
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Lenovo
+ * @Description RabbitMQ连接和管理功能配置
+ */
+
+@Configuration
+public class RabbitAdminConfig {
+
+    /**
+     * RabbitMQ服务器的主机地址
+     */
+    @Value("${spring.rabbitmq.host}")
+    private String host;
+
+    /**
+     * RabbitMQ的用户名
+     */
+    @Value("${spring.rabbitmq.username}")
+    private String username;
+
+    /**
+     * RabbitMQ的密码
+     */
+    @Value("${spring.rabbitmq.password}")
+    private String password;
+
+    /**
+     * RabbitMQ的虚拟主机
+     */
+    @Value("${spring.rabbitmq.virtualhost}")
+    private String virtualhost;
+
+    /**
+     * 创建并初始化RabbitAdmin实例
+     *
+     * @return RabbitAdmin 实例
+     */
+    @Bean
+    public RabbitAdmin rabbitAdmin() {
+        RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory());
+        rabbitAdmin.setAutoStartup(true);
+        return rabbitAdmin;
+    }
+
+    /**
+     * 创建RabbitMQ连接工厂
+     *
+     * @return ConnectionFactory 实例
+     */
+    @Bean
+    public ConnectionFactory connectionFactory() {
+        CachingConnectionFactory connectionFactory = new CachingConnectionFactory();
+        connectionFactory.setAddresses(host);
+        connectionFactory.setUsername(username);
+        connectionFactory.setPassword(password);
+        connectionFactory.setVirtualHost(virtualhost);
+
+        // 配置发送确认回调时，次配置必须配置，否则即使在RabbitTemplate配置了ConfirmCallback也不会生效
+        connectionFactory.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.CORRELATED);
+        connectionFactory.setPublisherReturns(true);
+        return connectionFactory;
+    }
+}

cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/config/RabbitListenerConfig.java

@@ -1,5 +1,6 @@
-package com.muyu.common.rabbit;
+package com.muyu.common.rabbit.config;
 
+import org.springframework.amqp.rabbit.annotation.RabbitListenerConfigurer;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistrar;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,21 +9,30 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.converter.MappingJackson2MessageConverter;
 import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory;
 
+/**
+ * @author Lenovo
+ * @Description rabbitMQ的监听器配置
+ */
+
 @Configuration
-public class RabbitListenerConfigurer implements org.springframework.amqp.rabbit.annotation.RabbitListenerConfigurer {
+public class RabbitListenerConfig implements RabbitListenerConfigurer {
 
     static {
+        // 设置为信任所有类型的反序列化，确保消息能够正确反序列化
         System.setProperty("spring.amqp.deserialization.trust.all", "true");
     }
 
-    //以下配置RabbitMQ消息服务
+    /**
+     * RabbitMQ连接工厂，用于创建连接
+     */
     @Autowired
     public ConnectionFactory connectionFactory;
 
 
     /**
-     * 处理器方法工厂
+     * 创建处理器方法工厂的bean
-     * @return
+     *
+     * @return DefaultMessageHandlerMethodFactory 实例，用于处理消息的转换和方法调用
      */
     @Bean
     public DefaultMessageHandlerMethodFactory handlerMethodFactory() {
@@ -32,8 +42,14 @@ public class RabbitListenerConfigurer implements org.springframework.amqp.rabbit
         return factory;
     }
 
+    /**
+     * 配置RabbitMQ监听器的消息处理方法工厂。
+     *
+     * @param rabbitListenerEndpointRegistrar 实例，用于注册监听器的配置
+     */
     @Override
     public void configureRabbitListeners(RabbitListenerEndpointRegistrar rabbitListenerEndpointRegistrar) {
+        // 注册自定义的消息处理方法工厂
         rabbitListenerEndpointRegistrar.setMessageHandlerMethodFactory(handlerMethodFactory());
     }
 

cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/config/RabbitMQMessageConverterConfig.java

@@ -0,0 +1,26 @@
+
+package com.muyu.common.rabbit.config;
+
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.MessageConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Lenovo
+ * @Description rabbitMQ消息转换器配置
+ */
+
+@Configuration
+public class RabbitMQMessageConverterConfig {
+
+    /**
+     * 消息转换配置
+     *
+     * @return 消息转换器
+     */
+    @Bean
+    public MessageConverter jsonMessageConverter() {
+        return new Jackson2JsonMessageConverter();
+    }
+}

cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/constants/RabbitConstants.java

@@ -0,0 +1,15 @@
+package com.muyu.common.rabbit.constants;
+
+/**
+ * rabbit常量
+ * @Author: 胡杨
+ * @date: 2024/7/10
+ * @Description: rabbit常量
+ * @Version 1.0.0
+ */
+public class RabbitConstants {
+
+    public final static String GO_ONLINE_QUEUE= "GoOnline";
+
+    public final static String DOWNLINE_QUEUE= "Downline";
+}

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

@@ -1 +1,3 @@
-com.muyu.common.rabbit.RabbitListenerConfigurer
+com.muyu.common.rabbit.config.RabbitListenerConfig
+com.muyu.common.rabbit.config.RabbitAdminConfig
+com.muyu.common.rabbit.config.RabbitMQMessageConverterConfig

cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java

@@ -1,5 +1,6 @@
 package com.muyu.common.redis.service;
 
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.HashOperations;
@@ -7,6 +8,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -18,7 +20,11 @@ import java.util.concurrent.TimeUnit;
 @SuppressWarnings(value = {"unchecked", "rawtypes"})
 @Component
 public class RedisService {
+
+    @Resource
+
     @Autowired
+
     public RedisTemplate redisTemplate;
 
     /**
@@ -229,7 +235,7 @@ public class RedisService {
      *
      * @return Hash对象集合
      */
-    public <T> List<T> getMultiCacheMapValue (final String key, final Collection<Object> hKeys) {
+    public <T> List<T> getMultiCacheMapValue (final String key, final Collection<String> hKeys) {
         return redisTemplate.opsForHash().multiGet(key, hKeys);
     }
 
@@ -255,4 +261,33 @@ public class RedisService {
     public Collection<String> keys (final String pattern) {
         return redisTemplate.keys(pattern);
     }
+
+
+    /**
+     * 判断redis中hashKey是否存在
+     * @param key redis键
+     * @param hashKey hash键
+     */
+    public boolean hashKey(final String key, final String hashKey){
+        return this.redisTemplate.opsForHash().hasKey(key, hashKey);
+    }
+
+    /**
+     * 减少序列值
+     * @param key key
+     * @param number 值
+     * @return 操作后的值
+     */
+    public Long decrement (final String key, Long number) {
+        return redisTemplate.opsForValue().decrement(key,number);
+    }
+    /**
+     * 增加序列值
+     * @param key key
+     * @param number 值
+     * @return 操作后的值
+     */
+    public Long increment (final String key, Long number) {
+        return redisTemplate.opsForValue().increment(key,number);
+    }
 }

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

@@ -0,0 +1,36 @@
+<?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>
+    <description>
+        cloud-common-saas saas数据源切换模块
+    </description>
+    <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,107 @@
+package com.muyu.cloud.common.many.datasource;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
+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.system.domain.SysEnt;
+import com.muyu.common.system.remote.RemoteUserService;
+import lombok.extern.log4j.Log4j2;
+import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
+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.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * @Author: DongZeLiang
+ * @date: 2024/6/3
+ * @Description: 多数据源
+ * @Version: 1.0
+ */
+@Log4j2
+@AutoConfiguration(before = {MybatisPlusAutoConfiguration.class, MybatisAutoConfiguration.class})
+@Component
+public class ManyDataSource implements ApplicationRunner{
+
+
+    private List<EntInfo> dataSourceInfoList(){
+        RemoteUserService remoteUserService = SpringUtils.getBean(RemoteUserService.class);
+        Result<List<SysEnt>> listResult = remoteUserService.list(new SysEnt());
+        if (listResult==null){
+            throw new SaaSException("saas远调数据源错误");
+        }
+        List<SysEnt> data = listResult.getData();
+        System.out.println(data);
+        if (listResult.getCode() == Result.SUCCESS && data !=null){
+            List<EntInfo> list = new ArrayList<>();
+            for (SysEnt row : data) {
+                list.add(
+                        EntInfo.builder()
+                                .entCode(row.getEntCode())
+                                .dbName(row.getDbName())
+                                .ip(row.getIp())
+                                .port(row.getPort())
+                                .userName(row.getUserName())
+                                .password(row.getPassword())
+                                .build()
+                );
+            }
+            return list;
+        }else {
+            log.error("远调数据源错误,远调数据为：{}", JSON.toJSONString(listResult));
+            return null;
+        }
+    }
+
+
+    @Bean
+    public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) {
+        // 企业列表 企业CODE，端口，IP
+        Map<Object, Object> dataSourceMap = new HashMap<>();
+        Objects.requireNonNull(dataSourceInfoList())
+                .stream()
+                .map(DataSourceInfo::hostAndPortBuild)
+                .map(druidDataSourceFactory::create)
+                .filter(Objects::nonNull)
+                .forEach( druidDataSource -> {
+                    dataSourceMap.put(druidDataSource.getName(), druidDataSource);
+                });
+        //设置动态数据源
+        DynamicDataSource dynamicDataSource = new DynamicDataSource();
+//        dynamicDataSource.setDefaultTargetDataSource(masterDataSource());
+        dynamicDataSource.setTargetDataSources(dataSourceMap);
+        //将数据源信息备份在defineTargetDataSources中
+        dynamicDataSource.setDefineTargetDataSources(dataSourceMap);
+        log.info("动态数据源加载完成,持有key：{}",dynamicDataSource.getKeys());
+        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);
+            DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo);
+            dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource);
+            log.info("存储数据连接池为：key:{}",dataSourceInfo.getKey());
+        }
+    }
+
+//    @Bean
+//    public SqlSessionFactory sqlSessionFactory(DynamicDataSource dataSource) throws Exception {
+//        SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+//        sessionFactory.setDataSource(dataSource);
+//        return sessionFactory.getObject();
+//    }
+}

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 = "bawei2112A";
+
+    public final static String IP = "106.54.193.225";
+
+    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,60 @@
+package com.muyu.cloud.common.many.datasource.domain.model;
+
+import com.muyu.cloud.common.many.datasource.constents.DatasourceContent;
+import com.muyu.cloud.common.saas.domain.model.EntInfo;
+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();
+//    }
+
+    public static DataSourceInfo hostAndPortBuild(EntInfo entInfo) {
+        return DataSourceInfo.builder()
+                .key(entInfo.getEntCode())
+                .url(StringUtils.format(DatasourceContent.DATASOURCE_URL, entInfo.getIp(), entInfo.getPort(), entInfo.getDbName()))
+                .userName(entInfo.getUserName())
+                .password(entInfo.getPassword())
+                .build();
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.muyu.cloud.common.many.datasource.factory;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.pool.DruidPooledConnection;
+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.setName(dataSourceInfo.getKey());
+        druidDataSource.setUrl(dataSourceInfo.getUrl());
+        druidDataSource.setConnectTimeout(10000);
+        druidDataSource.setMaxWait(60000);
+        druidDataSource.setUsername(dataSourceInfo.getUserName());
+        druidDataSource.setPassword(dataSourceInfo.getPassword());
+        druidDataSource.setBreakAfterAcquireFailure(true);
+        druidDataSource.setConnectionErrorRetryAttempts(0);
+        try {
+            DruidPooledConnection connection = druidDataSource.getConnection(2000);
+            log.info("{} -> 数据源连接成功", dataSourceInfo.getKey());
+            connection.close();
+            return druidDataSource;
+        } catch (SQLException throwables) {
+            log.error("数据源 {} 连接失败,用户名：{}，密码 {}, 原因:{}",dataSourceInfo.getUrl(),dataSourceInfo.getUserName(),dataSourceInfo.getPassword(), throwables);
+            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,66 @@
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 动态数据源
+ * 调用AddDefineDataSource组件的addDefineDynamicDataSource（）方法，获取原来targetdatasources的map，并将新的数据源信息添加到map中，并替换targetdatasources中的map
+ * 切换数据源时可以使用@DataSource(value = "数据源名称")，或者DynamicDataSourceContextHolder.setContextKey("数据源名称")
+ * @author Dongzl
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Slf4j
+@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) {
+        if (value!=null) {
+            defineTargetDataSources.put(key, value);
+            this.afterPropertiesSet();
+        }else{
+            log.warn("Key为 {} 的数据源为空!",key);
+        }
+    }
+
+    /**
+     * 决定当前线程使用哪个数据源
+     */
+    @Override
+    protected Object determineCurrentLookupKey() {
+        return DynamicDataSourceHolder.getDynamicDataSourceKey();
+    }
+
+    public List<Object> getKeys() {
+        return defineTargetDataSources.keySet().stream().toList();
+    }
+}

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,31 @@
+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;
+
+    private String dbName;
+
+    private String userName;
+
+    private String password;
+}

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,57 @@
+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.context.SecurityContextHolder;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
+
+
+/**
+ * @Author: DongZeLiang
+ * @date: 2024/6/3
+ * @Description: SAAS拦截器
+ * @Version: 1.0
+ */
+@Slf4j
+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);
+        log.info("访问路径：{}，携带SaaSKey：{}",request.getRequestURI(),saasKey);
+        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[] EXCLUDE_URLS = {"/user/info", "/login", "/logout", "/refresh"};
+
+    @Override
+    public void addInterceptors (InterceptorRegistry registry) {
+        registry.addInterceptor(getHeaderInterceptor())
+                .addPathPatterns("/**")
+                .excludePathPatterns(EXCLUDE_URLS)
+                .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/interceptor/HeaderInterceptor.java

@@ -28,6 +28,10 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor {
         }
 
         SecurityContextHolder.setUserId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USER_ID));
+
+        SecurityContextHolder.setSaasKey(ServletUtils.getHeader(request, SecurityConstants.SAAS_KEY));
+
+
         SecurityContextHolder.setUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USERNAME));
         SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY));
 

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

@@ -12,7 +12,7 @@ import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.LoginUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -34,7 +34,7 @@ public class TokenService {
     private final static long expireTime = CacheConstants.EXPIRATION;
 
     private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY;
-    @Autowired
+    @Resource
     private RedisService redisService;
 
     /**
@@ -55,10 +55,11 @@ 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().getFirmCode());
         // 接口返回信息
         Map<String, Object> rspMap = new HashMap<String, Object>();
         rspMap.put("access_token", JwtUtils.createToken(claimsMap));
+        rspMap.put("ent_code", loginUser.getSysUser().getFirmCode());
         rspMap.put("expires_in", expireTime);
         return rspMap;
     }

cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java

@@ -30,6 +30,13 @@ public class SecurityUtils {
         return SecurityContextHolder.getUserName();
     }
 
+
+    public static String getSaasKey () {
+        return SecurityContextHolder.getSaasKey();
+    }
+
+
+
     /**
      * 获取用户key
      */

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

@@ -63,4 +63,9 @@ public class LoginUser implements Serializable {
      */
     private SysUser sysUser;
 
+
+
+
+
+
 }

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

@@ -34,6 +34,11 @@ public class SysDept extends BaseEntity {
      */
     private Long parentId;
 
+
+    private String firmCode;
+
+
+
     /**
      * 祖级列表
      */

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

@@ -0,0 +1,38 @@
+package com.muyu.common.system.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: DongZeLiang
+ * @date: 2024/6/3
+ * @Description: 企业信息
+ * @Version: 1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("sys_ent")
+public class SysEnt {
+    @TableId( type = IdType.AUTO)
+    private Integer id;
+
+    private String entCode;
+
+    private String ip;
+
+    private Integer port;
+
+    private String dbName;
+
+    private String userName;
+
+    private String password;
+    
+}

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

@@ -0,0 +1,26 @@
+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/SysMember.java

@@ -0,0 +1,31 @@
+package com.muyu.common.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.common.core.annotation.Excel;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 会员表(SysMember)实体类
+ *
+ */
+@Data
+@Setter
+@Getter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("sys_member")
+public class SysMember {
+    @TableId(type = IdType.AUTO)
+    private Long memberId;
+    @Excel(name = "会员等级")
+    private String memberName;
+    @Excel(name = "可添加车辆数量")
+    private Integer memberCarNum;
+    @Excel(name = "可添加报文模板数量")
+    private Integer memberCarType;
+}
+

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

@@ -36,6 +36,11 @@ public class SysRole extends BaseEntity {
     @Excel(name = "角色名称")
     private String roleName;
 
+
+    private String firmCode;
+
+
+
     /**
      * 角色权限
      */

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

@@ -1,5 +1,8 @@
 package com.muyu.common.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.annotation.Excel.ColumnType;
 import com.muyu.common.core.annotation.Excel.Type;
@@ -28,6 +31,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
+@TableName("sys_user")
 public class SysUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -35,8 +39,11 @@ public class SysUser extends BaseEntity {
      * 用户ID
      */
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+    @TableId(type = IdType.AUTO)
     private Long userId;
 
+    private Integer isAdmin;
+
     /**
      * 部门ID
      */
@@ -49,6 +56,9 @@ public class SysUser extends BaseEntity {
     @Excel(name = "登录名称")
     private String userName;
 
+
+    private String firmCode;
+
     /**
      * 用户昵称
      */
@@ -135,6 +145,8 @@ public class SysUser extends BaseEntity {
      */
     private Long roleId;
 
+
+
     public SysUser (Long userId) {
         this.userId = userId;
     }
@@ -143,8 +155,9 @@ public class SysUser extends BaseEntity {
         return userId != null && 1L == userId;
     }
 
+
     public boolean isAdmin () {
-        return isAdmin(this.userId);
+        return isAdmin(this.userId) || (this.isAdmin != null && this.isAdmin == 1);
     }
 
     @Xss(message = "用户昵称不能包含脚本字符")

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

@@ -0,0 +1,28 @@
+package com.muyu.common.system.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户和岗位关联 sys_user_post
+ *
+ * @author muyu
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysUserPost {
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 岗位ID
+     */
+    private Long postId;
+
+}

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

@@ -0,0 +1,27 @@
+package com.muyu.common.system.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户和角色关联 sys_user_role
+ *
+ * @author muyu
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysUserRole {
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+}

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

@@ -0,0 +1,32 @@
+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.system.domain.SysUser;
+import com.muyu.common.system.remote.factory.RemoteSaasFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 文件服务
+ *
+ * @author muyu
+ */
+@FeignClient(contextId = "remoteSaasService", value = ServiceNameConstants.SAAS_SERVICE, fallbackFactory = RemoteSaasFallbackFactory.class)
+public interface RemoteSaasService {
+
+    /**
+     * 通过用户名查询用户信息
+     *
+     * @param firmCode
+     * @param userName 用户名
+     * @param source   请求来源
+     * @return 结果
+     */
+    @GetMapping("/user/info")
+    public Result<SysUser> getUserInfo (@RequestParam("firmCode") String firmCode, @RequestParam("userName") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+}

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

@@ -3,12 +3,23 @@ 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.system.domain.*;
+import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Set;
+
+
 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.*;
 
+
 /**
  * 用户服务
  *
@@ -16,6 +27,8 @@ import org.springframework.web.bind.annotation.*;
  */
 @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
 public interface RemoteUserService {
+
+
     /**
      * 通过用户名查询用户信息
      *
@@ -27,6 +40,7 @@ public interface RemoteUserService {
     @GetMapping("/user/info/{username}")
     public Result<LoginUser> getUserInfo (@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+
     /**
      * 注册用户信息
      *
@@ -37,4 +51,76 @@ 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 ();
+
+    @PostMapping("/ent/list")
+    public Result<List<SysEnt>> list (@RequestBody SysEnt sysEnt);
+
+
+    /**
+     * 通过用户名查询用户信息
+     *
+     * @param firmCode
+     * @param userName 用户名
+     * @param source   请求来源
+     * @return 结果
+     */
+    @GetMapping("/user/info")
+    public Result<LoginUser> getUserInfo (@RequestParam("firmCode") String firmCode, @RequestParam("userName") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 获取角色数据权限
+     *
+     * @param user 用户
+     *
+     * @return 角色权限信息
+     */
+    @PostMapping("/permission/getRole")
+    public Set<String> getRolePermission (@RequestBody SysUser user);
+
+    /**
+     * 获取菜单数据权限
+     *
+     * @param user 用户
+     *
+     * @return 菜单权限信息
+     */
+    @PostMapping("/permission/getMenu")
+    public Set<String> getMenuPermission (@RequestBody SysUser user);
+
+
+
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @GetMapping(value = "/dept/{deptId}")
+    public Result<SysDept> selectDeptById (@PathVariable("deptId") Long deptId);
+
+
+    /**
+     * 新增用户角色信息
+     *
+     * @param user 用户对象
+     */
+    @PostMapping("/user/insertUserRole")
+    public void insertUserRole (@RequestBody SysUser user);
+
+    /**
+     * 新增用户岗位信息
+     *
+     * @param user 用户对象
+     */
+    @PostMapping("/user/insertUserPost")
+    public void insertUserPost (@RequestBody SysUser user);
+
+    /**
+     * 注册用户
+     */
+    @PostMapping("/user")
+    public Result addUser (@RequestBody SysUser user);
+
+
 }

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

@@ -0,0 +1,36 @@
+package com.muyu.common.system.remote.factory;
+/**
+ * @Author: 胡杨
+ * @Name: RemoteEntFallbackFactory
+ * @Description:
+ * @CreatedDate: 2024/9/20 下午3:11
+ * @FilePath: com.muyu.common.system.remote
+ */
+
+
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.system.domain.SysUser;
+import com.muyu.common.system.remote.RemoteSaasService;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author: 胡杨
+ * @Name: RemoteEntFallbackFactory
+ * @Description:
+ * @CreatedDate: 2024/9/20 下午3:11
+ * @FilePath: com.muyu.common.system.remote
+ */
+@Component
+public class RemoteSaasFallbackFactory implements FallbackFactory<RemoteSaasService> {
+    @Override
+    public RemoteSaasService create(Throwable cause) {
+        return new RemoteSaasService() {
+
+            @Override
+            public Result<SysUser> getUserInfo(String firmCode, String username, String source) {
+                return Result.error("获取用户失败:" + cause.getMessage());
+            }
+        };
+    }
+}

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

@@ -1,14 +1,26 @@
 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.*;
+import com.muyu.common.system.remote.RemoteUserService;
+
 import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.domain.LoginUser;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+
+import java.util.List;
+import java.util.Set;
+
+
+
 /**
  * 用户服务降级处理
  *
@@ -22,15 +34,67 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
     public RemoteUserService create (Throwable throwable) {
         log.error("用户服务调用失败:{}", throwable.getMessage());
         return new RemoteUserService() {
+
+
             @Override
             public Result<LoginUser> getUserInfo (String username, String source) {
                 return Result.error("获取用户失败:" + throwable.getMessage());
             }
 
+
             @Override
             public Result<Boolean> registerUserInfo (SysUser sysUser, String source) {
                 return Result.error("注册用户失败:" + throwable.getMessage());
             }
+
+
+            @Override
+            public Result<List<SysUser>> companyList() {
+                return Result.error("获取企业列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public Result<List<SysEnt>> list(SysEnt sysEnt) {
+                return Result.error("获取企业列表失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public Result<LoginUser> getUserInfo(String firmCode, String userName, String source) {
+                return Result.error("获取用户信息失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public Set<String> getRolePermission(SysUser user) {
+                return Set.of();
+            }
+
+            @Override
+            public Set<String> getMenuPermission(SysUser user) {
+                return Set.of();
+            }
+
+            @Override
+            public Result<SysDept> selectDeptById(Long deptId) {
+                return Result.error();
+            }
+
+            @Override
+            public void insertUserRole(SysUser user) {
+                log.warn("新增用户角色失败!");
+            }
+
+            @Override
+            public void insertUserPost(SysUser user) {
+                log.warn("新增用户权限失败!");
+            }
+
+            @Override
+            public Result addUser(SysUser user) {
+                return Result.error(throwable);
+            }
+
+
+
         };
     }
 }

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

@@ -1,3 +1,7 @@
 com.muyu.common.system.remote.factory.RemoteUserFallbackFactory
 com.muyu.common.system.remote.factory.RemoteLogFallbackFactory
 com.muyu.common.system.remote.factory.RemoteFileFallbackFactory
+
+com.muyu.common.system.remote.factory.RemoteSaasFallbackFactory
+
+

cloud-common/pom.xml

@@ -20,6 +20,11 @@
         <module>cloud-common-system</module>
         <module>cloud-common-xxl</module>
         <module>cloud-common-rabbit</module>
+        <module>cloud-common-saas</module>
+        <module>cloud-common-cache</module>
+        <module>cloud-common-caffeine</module>
+        <module>cloud-common-iotdb</module>
+        <module>cloud-common-kafka</module>
     </modules>
 
     <artifactId>cloud-common</artifactId>

cloud-gateway/pom.xml

@@ -82,6 +82,7 @@
             <version>4.5.0</version>
         </dependency>
 
+
     </dependencies>
 
     <build>

cloud-gateway/src/main/java/com/muyu/gateway/CloudGatewayApplication.java

@@ -13,5 +13,9 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 public class CloudGatewayApplication {
     public static void main (String[] args) {
         SpringApplication.run(CloudGatewayApplication.class, args);
+
+        System.out.println("CloudGateway 模块启动成功!");
+
+
     }
 }

cloud-gateway/src/main/java/com/muyu/gateway/config/RouterFunctionConfiguration.java

@@ -1,7 +1,11 @@
 package com.muyu.gateway.config;
 
 import com.muyu.gateway.handler.ValidateCodeHandler;
+
+import javax.annotation.Resource;
+
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
@@ -16,7 +20,11 @@ import org.springframework.web.reactive.function.server.RouterFunctions;
  */
 @Configuration
 public class RouterFunctionConfiguration {
+
+    @Resource
+
     @Autowired
+
     private ValidateCodeHandler validateCodeHandler;
 
     @SuppressWarnings("rawtypes")

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

@@ -177,7 +177,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
         };
     }
 
-    // ========== 参考 ModifyRequestBodyGatewayFilterFactory 中的方法 ==========
+    // === 参考 ModifyRequestBodyGatewayFilterFactory 中的方法 ===
 
     /**
      * 请求装饰器，支持重新计算 headers、body 缓存
@@ -210,7 +210,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
         };
     }
 
-    // ========== 参考 ModifyResponseBodyGatewayFilterFactory 中的方法 ==========
+    // === 参考 ModifyResponseBodyGatewayFilterFactory 中的方法 ===
 
     private byte[] readContent(List<? extends DataBuffer> dataBuffers) {
         // 合并多个流集合，解决返回体分段传输

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

@@ -12,7 +12,7 @@ import com.muyu.gateway.config.properties.IgnoreWhiteProperties;
 import io.jsonwebtoken.Claims;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.core.Ordered;
@@ -31,10 +31,10 @@ public class AuthFilter implements GlobalFilter, Ordered {
     private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
 
     // 排除过滤的 uri 地址，nacos自行添加
-    @Autowired
+    @Resource
     private IgnoreWhiteProperties ignoreWhite;
 
-    @Autowired
+    @Resource
     private RedisService redisService;
 
 
@@ -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/filter/ValidateCodeFilter.java

@@ -6,7 +6,7 @@ import com.muyu.common.core.utils.ServletUtils;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.gateway.config.properties.CaptchaProperties;
 import com.muyu.gateway.service.ValidateCodeService;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
 import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
 import org.springframework.core.io.buffer.DataBuffer;
@@ -29,9 +29,9 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object> {
     private final static String[] VALIDATE_URL = new String[]{"/auth/login", "/auth/register"};
     private static final String CODE = "code";
     private static final String UUID = "uuid";
-    @Autowired
+    @Resource
     private ValidateCodeService validateCodeService;
-    @Autowired
+    @Resource
     private CaptchaProperties captchaProperties;
 
     @Override

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

@@ -4,7 +4,11 @@ import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.html.EscapeUtil;
 import com.muyu.gateway.config.properties.XssProperties;
 import io.netty.buffer.ByteBufAllocator;
+
+import javax.annotation.Resource;
+
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
@@ -31,7 +35,11 @@ import java.nio.charset.StandardCharsets;
 @ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true")
 public class XssFilter implements GlobalFilter, Ordered {
     // 跨站脚本的 xss 配置，nacos自行添加
+
+    @Resource
+
     @Autowired
+
     private XssProperties xss;
 
     @Override

cloud-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java

@@ -3,7 +3,11 @@ package com.muyu.gateway.handler;
 import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.common.core.domain.Result;
 import com.muyu.gateway.service.ValidateCodeService;
+
+import javax.annotation.Resource;
+
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.BodyInserters;
@@ -21,7 +25,11 @@ import java.io.IOException;
  */
 @Component
 public class ValidateCodeHandler implements HandlerFunction<ServerResponse> {
+
+    @Resource
+
     @Autowired
+
     private ValidateCodeService validateCodeService;
 
     @Override

cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -50,7 +50,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
         CaptchaCodeResp.CaptchaCodeRespBuilder respBuilder = CaptchaCodeResp.builder()
                 .captchaEnabled(captchaEnabled);
         if (!captchaEnabled) {
-            return Result.success(respBuilder);
+            return Result.success(respBuilder.build());
         }
 
         // 保存验证码信息

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

@@ -4,8 +4,11 @@ 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 +21,11 @@ import reactor.core.publisher.Mono;
 
 /**
  * Web 工具类
+
+
  *
  *
+
  */
 @Log4j2
 public class WebFrameworkUtils {
@@ -72,8 +78,11 @@ public class WebFrameworkUtils {
 
     /**
      * 获得客户端 IP
+
+
      *
      *
+
      * @param exchange 请求
      * @param otherHeaderNames 其它 header 名字的数组
      * @return 客户端 IP
@@ -92,6 +101,9 @@ public class WebFrameworkUtils {
             }
         }
 
+
+
+
         // 方式二，通过 remoteAddress 获取
         if (exchange.getRequest().getRemoteAddress() == null) {
             return null;
@@ -102,7 +114,10 @@ public class WebFrameworkUtils {
 
     /**
      * 获得请求匹配的 Route 路由
+
+
      *
+
      * @param exchange 请求
      * @return 路由
      */

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

@@ -1,13 +1,13 @@
 # Tomcat
 server:
-  port: 8080
+  port: 8081
 
 # nacos线上地址
 nacos:
-  addr: nacos.muyu.icu:8848
+  addr: 47.116.173.119:8848
   user-name: nacos
   password: nacos
-  namespace: muyu-cloud
+  namespace: oneone
 
 # Spring
 spring:
@@ -22,29 +22,29 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: ${nacos.addr}
-        # nacos用户名
+#        # nacos用户名
-        username: ${nacos.user-name}
+#        username: ${nacos.user-name}
-        # nacos密码
+#        # nacos密码
-        password: ${nacos.password}
+#        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
       config:
         # 服务注册地址
         server-addr: ${nacos.addr}
-        # nacos用户名
+#        # nacos用户名
-        username: ${nacos.user-name}
+#        username: ${nacos.user-name}
-        # nacos密码
+#        # nacos密码
-        password: ${nacos.password}
+#        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}
+          # 系统共享配置
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
     sentinel:
       # 取消控制台懒加载
       eager: true

cloud-modules/cloud-modules-car-gateway/pom.xml

@@ -0,0 +1,114 @@
+<?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-car-gateway</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-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-security</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>
+
+        <!-- 接口模块 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-api-doc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-rabbit</artifactId>
+        </dependency>
+
+        <!--        http协议 -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>ecs20140526</artifactId>
+            <version>5.1.8</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea-openapi</artifactId>
+            <version>0.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea-console</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea-util</artifactId>
+            <version>0.2.21</version>
+        </dependency>
+    </dependencies>
+
+</project>

cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/Aliyun/AliYunConfig.java

@@ -0,0 +1,41 @@
+package com.muyu.cargateway.Aliyun;
+
+import com.aliyun.ecs20140526.Client;
+import com.aliyun.teaopenapi.models.Config;
+import com.muyu.cargateway.config.AliProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Lenovo
+ * @ Tool：IntelliJ IDEA
+ * @ Author：CHX
+ * @ Date：2024-10-07-18:40
+ * @ Version：1.0
+ * @ Description：Ali客户端
+ */
+@Configuration
+public class AliYunConfig {
+
+    @Autowired
+    private AliProperties aliProperties;
+
+    @Bean
+    public Client createClient() {
+        // 工程代码泄露可能会导致 AccessKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考。
+        Config config = new Config()
+                // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID。
+                .setAccessKeyId(aliProperties.getAccessKeyId())
+                // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_SECRET。
+                .setAccessKeySecret(aliProperties.getAccessKeySecret());
+        // Endpoint 请参考 https://api.aliyun.com/product/Ecs
+        config.endpoint = aliProperties.getEndpoint();
+        try {
+            return new Client(config);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}

cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/Aliyun/service/AliYunEcsService.java

@@ -0,0 +1,199 @@
+package com.muyu.cargateway.Aliyun.service;
+
+import com.aliyun.ecs20140526.Client;
+import com.aliyun.ecs20140526.models.*;
+import com.aliyun.tea.TeaException;
+import com.aliyun.teautil.models.RuntimeOptions;
+import com.muyu.cargateway.config.AliProperties;
+import com.muyu.cargateway.domain.AliInstance;
+import com.muyu.common.core.exception.ServiceException;
+import com.muyu.common.redis.service.RedisService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Lenovo
+ * @ Tool：IntelliJ IDEA
+ * @ Author：CHX
+ * @ Date：2024-10-07-18:43
+ * @ Version：1.0
+ * @ Description：ali业务层
+ */
+@Log4j2
+@Service
+public class AliYunEcsService {
+    /**
+     * 阿里云配置
+     */
+    @Autowired
+    private AliProperties aliProperties;
+    /**
+     * 阿里云客户端
+     */
+    @Autowired
+    private Client client;
+    /**
+     * redis缓存
+     */
+    @Autowired
+    private RedisService redisService;
+
+    /**
+     * 生成实例
+     *
+     * @param amount 生成数量
+     * @return 实例id集合
+     */
+    public List<String> generateInstance(Integer amount) {
+        redisService.deleteObject("instanceIds");
+        redisService.deleteObject("instanceList");
+        // 检查生成实例的数量是否有效
+        if (amount == null || amount <= 0) {
+            throw new ServiceException("生成数量不能小于1");
+        }
+
+// 初始化系统盘配置
+        RunInstancesRequest.RunInstancesRequestSystemDisk systemDisk = new RunInstancesRequest.RunInstancesRequestSystemDisk();
+        systemDisk.setSize("40");
+        systemDisk.setCategory("cloud_essd");
+
+// 创建创建实例请求对象并设置参数
+        RunInstancesRequest runInstancesRequest = new RunInstancesRequest()
+                // 设置地域ID
+                .setRegionId(aliProperties.getRegionId())
+                // 设置镜像ID
+                .setImageId(aliProperties.getImageId())
+                // 设置实例规格类型
+                .setInstanceType(aliProperties.getInstanceType())
+                // 设置安全组ID
+                .setSecurityGroupId(aliProperties.getSecurityGroupId())
+                // 设置虚拟交换机ID
+                .setVSwitchId(aliProperties.getSwitchId())
+                // 设置实例名称
+                .setInstanceName("server-mqtt")
+                // 设置付费类型 按量付费
+                .setInstanceChargeType("PostPaid")
+                // 设置系统盘配置
+                .setSystemDisk(systemDisk)
+                // 设置用户名
+                .setHostName("root")
+                // 设置密码
+                .setPassword("10160810@a")
+                // 设置要创建的实例数量
+                .setAmount(amount)
+                .setInternetChargeType("PayByTraffic")
+                .setInternetMaxBandwidthOut(1);
+
+        // 创建运行时选项对象
+        RuntimeOptions runtimeOptions = new RuntimeOptions();
+
+        // 尝试执行创建实例请求
+        try {
+            // 复制代码运行请自行打印 API 的返回值
+            RunInstancesResponse runInstancesResponse = client.runInstancesWithOptions(runInstancesRequest, runtimeOptions);
+            if (runInstancesResponse.getStatusCode() != 200) {
+                throw new ServiceException("查询实例状态失败");
+            }
+            log.info("实例创建成功: {}", runInstancesResponse.getBody().getInstanceIdSets().instanceIdSet);
+            RunInstancesResponseBody body = runInstancesResponse.getBody();
+            RunInstancesResponseBody.RunInstancesResponseBodyInstanceIdSets instanceIdSets = body.getInstanceIdSets();
+            return new ArrayList<>(instanceIdSets.instanceIdSet);
+        } catch (Exception error) {
+            log.error("创建阿里云实例报错：[{}]", error.getMessage());
+            throw new ServiceException(error.getMessage());
+        }
+    }
+
+    /**
+     * 根据实例id查询实例信息
+     *
+     * @param instanceIds 实例id集合
+     */
+    public List<AliInstance> selectInstance(List<String> instanceIds) throws Exception {
+        // 检查实例ID列表是否为空，如果为空则抛出异常
+        if (instanceIds == null || instanceIds.isEmpty()) {
+            throw new ServiceException("实例id不能为空");
+        }
+        // 创建查询实例的请求对象
+        DescribeInstancesRequest request = new DescribeInstancesRequest()
+                .setRegionId(aliProperties.getRegionId());
+
+        // 创建运行时选项对象，用于配置请求的额外参数
+        RuntimeOptions runtimeOptions = new RuntimeOptions();
+        List<AliInstance> aliInstances = new ArrayList<>();
+        try {
+            // 发送请求并获取响应对象
+            DescribeInstancesResponse describeInstancesResponse = client.describeInstancesWithOptions(request, runtimeOptions);
+            // 检查响应状态码，如果为200则表示查询失败，抛出异常
+            if (describeInstancesResponse.getStatusCode() != 200) {
+                throw new ServiceException("查询实例状态失败");
+            }
+            List<DescribeInstancesResponseBody.DescribeInstancesResponseBodyInstancesInstance> instance = describeInstancesResponse.getBody().getInstances().getInstance();
+            for (DescribeInstancesResponseBody.DescribeInstancesResponseBodyInstancesInstance bodyInstance : instance) {
+                // 实例id
+                String instanceId = bodyInstance.getInstanceId();
+                log.info("实例id为：{}", instanceId);
+                // ip地址
+                String ipAddress = bodyInstance.getPublicIpAddress().getIpAddress().get(0);
+                log.info("实例ip为：{}", ipAddress);
+                // 实例状态
+                String status = bodyInstance.getStatus();
+                log.info("实例状态为：{}", status);
+                AliInstance aliInstance = new AliInstance(instanceId, ipAddress, status);
+                aliInstances.add(aliInstance);
+            }
+            log.info("查询成功");
+        } catch (Exception e) {
+            log.error("查询服务器实例错误：[{}]", e.getMessage(), e);
+            throw new RuntimeException(e);
+        }
+        return aliInstances;
+    }
+
+    /**
+     * 删除实例
+     */
+    public void deleteInstance() throws Exception {
+        DescribeInstancesRequest attributeRequest = new DescribeInstancesRequest();
+        attributeRequest.setRegionId(aliProperties.getRegionId());
+
+        RuntimeOptions runtimeOptions = new RuntimeOptions();
+
+        DescribeInstancesResponse instancesWithOptions = client.describeInstancesWithOptions(attributeRequest, runtimeOptions);
+        ArrayList<String> list = new ArrayList<>();
+        DescribeInstancesResponseBody body = instancesWithOptions.getBody();
+        for (DescribeInstancesResponseBody.DescribeInstancesResponseBodyInstancesInstance instance : body.instances.instance) {
+            list.add(instance.getInstanceId());
+        }
+        log.info("list:" + list);
+        DeleteInstancesRequest deleteInstancesRequest = new DeleteInstancesRequest();
+        deleteInstancesRequest.setRegionId(aliProperties.getRegionId())
+                .setDryRun(false)
+                .setForce(true)
+                .setTerminateSubscription(true)
+                .setInstanceId(list);
+        RuntimeOptions runtime = new RuntimeOptions();
+        try {
+            client.deleteInstancesWithOptions(deleteInstancesRequest, runtime);
+        } catch (TeaException error) {
+            // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。
+            // 错误 message
+            System.out.println(error.getMessage());
+            // 诊断地址
+            System.out.println(error.getData().get("Recommend"));
+            com.aliyun.teautil.Common.assertAsString(error.message);
+        } catch (Exception _error) {
+            TeaException error = new TeaException(_error.getMessage(), _error);
+            // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。
+            // 错误 message
+            System.out.println(error.getMessage());
+            // 诊断地址
+            System.out.println(error.getData().get("Recommend"));
+            com.aliyun.teautil.Common.assertAsString(error.message);
+        }
+    }
+}

cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/CloudVehicleGatewayApplication.java

@@ -0,0 +1,25 @@
+package com.muyu.cargateway;
+
+import com.muyu.common.security.annotation.EnableCustomConfig;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * @ Tool：IntelliJ IDEA
+ * @ Author：CHX
+ * @ Date：2024-09-17-15:00
+ * @ Version：1.0
+ * @ Description：故障启动类
+ * @author Lenovo
+ */
+@Log4j2
+@EnableCustomConfig
+@EnableFeignClients
+@SpringBootApplication
+public class CloudVehicleGatewayApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(CloudVehicleGatewayApplication.class, args);
+    }
+}

cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/config/AliProperties.java

@@ -0,0 +1,55 @@
+package com.muyu.cargateway.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Lenovo
+ * @ Tool：IntelliJ IDEA
+ * @ Author：CHX
+ * @ Date：2024-10-07-18:34
+ * @ Version：1.0
+ * @ Description：Ali配置类
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "aliyun")
+public class AliProperties {
+    /**
+     * key
+     */
+    private String accessKeyId;
+    /**
+     * secret
+     */
+    private String accessKeySecret;
+    /**
+     * 地域
+     */
+    private String endpoint;
+    /**
+     * 地域id
+     */
+    private String regionId;
+    /**
+     * 镜像id
+     */
+    private String imageId;
+    /**
+     * 实例规格
+     */
+    private String instanceType;
+    /**
+     * 安全组id
+     */
+    private String securityGroupId;
+    /**
+     * 虚拟交换机ID
+     */
+    private String switchId;
+    /**
+     * 生成实例数量
+     */
+    private Integer amount;
+}

cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/config/RabbitmqConfig.java

@@ -0,0 +1,100 @@
+package com.muyu.cargateway.config;
+
+import lombok.extern.log4j.Log4j2;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.core.*;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Lenovo
+ * @ Tool：IntelliJ IDEA
+ * @ Author：CHX
+ * @ Date：2024-10-04-15:13
+ * @ Version：1.0
+ * @ Description：rabbitmq配置类
+ */
+@Log4j2
+@Configuration
+public class RabbitmqConfig {
+    // 日志
+    private static final Logger logger = LoggerFactory.getLogger(RabbitmqConfig.class);
+
+    /**
+     * 队列
+     */
+    public static final String QUEUE_INFORM_EMAIL = "queue_inform_email";
+    /**
+     * 队列
+     */
+    public static final String QUEUE_INFORM_SMS = "queue_inform_sms";
+    /**
+     * 交换机
+     */
+    public static final String EXCHANGE_TOPICS_INFORM = "exchange_topics_inform";
+    /**
+     * 路由key
+     */
+    public static final String ROUTINGKEY_EMAIL = "inform.#.email.#";
+    /**
+     * 路由key
+     */
+    public static final String ROUTINGKEY_SMS = "inform.#.sms.#";
+
+    /**
+     * 声明交换机,做持久化
+     */
+    @Bean(EXCHANGE_TOPICS_INFORM)
+    public Exchange exchangeTopicsInform() {
+        try {
+            Exchange exchange = ExchangeBuilder.topicExchange(EXCHANGE_TOPICS_INFORM).durable(true).build();
+            log.info("创建的交换机为: {}", EXCHANGE_TOPICS_INFORM);
+            return exchange;
+        } catch (Exception e) {
+            log.error("创建该: {} 交换机失败", EXCHANGE_TOPICS_INFORM, e);
+            throw e;
+        }
+    }
+
+    // 声明QUEUE_INFORM_EMAIL队列
+    @Bean(QUEUE_INFORM_EMAIL)
+    public Queue queueInformEmail() {
+        try {
+            Queue queue = new Queue(QUEUE_INFORM_EMAIL);
+            log.info("创建的队列为: {}", QUEUE_INFORM_EMAIL);
+            return queue;
+        } catch (Exception e) {
+            log.error("创建该: {} 队列失败", QUEUE_INFORM_EMAIL, e);
+            throw e;
+        }
+    }
+
+    // 声明QUEUE_INFORM_SMS队列
+    @Bean(QUEUE_INFORM_SMS)
+    public Queue queueInformSms() {
+        try {
+            Queue queue = new Queue(QUEUE_INFORM_SMS);
+            log.info("创建的队列为: {}", QUEUE_INFORM_SMS);
+            return queue;
+        } catch (Exception e) {
+            log.error("创建该: {} 队列失败", QUEUE_INFORM_SMS, e);
+            throw e;
+        }
+    }
+
+    //ROUTINGKEY_EMAIL队列绑定交换机，指定routingKey
+    @Bean
+    public Binding bindingQueueInformEmail(@Qualifier(QUEUE_INFORM_EMAIL) Queue queue,
+                                           @Qualifier(EXCHANGE_TOPICS_INFORM) Exchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(ROUTINGKEY_EMAIL).noargs();
+    }
+
+    //ROUTINGKEY_SMS队列绑定交换机，指定routingKey
+    @Bean
+    public Binding bindingRoutingKeySms(@Qualifier(QUEUE_INFORM_SMS) Queue queue,
+                                        @Qualifier(EXCHANGE_TOPICS_INFORM) Exchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(ROUTINGKEY_SMS).noargs();
+    }
+}

cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/controller/CarOneClickOperationController.java

@@ -0,0 +1,42 @@
+package com.muyu.cargateway.controller;
+
+import com.muyu.cargateway.domain.model.MqttServerModel;
+import com.muyu.cargateway.domain.req.VehicleConnectionReq;
+import com.muyu.cargateway.service.CarOneClickOperationService;
+import com.muyu.common.core.domain.Result;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ Tool：IntelliJ IDEA
+ * @ Author：CHX
+ * @ Date：2024-09-26-20:14
+ * @ Version：1.0
+ * @ Description：车辆
+ * @author Lenovo
+ */
+@Log4j2
+@RestController
+@RequestMapping("/vehicleGateway")
+@Tag(name = "连接车辆控制层")
+public class CarOneClickOperationController {
+   @Autowired
+    private CarOneClickOperationService carOneClickOperationService;
+
+    /**
+     * 获取http连接的参数
+     * @param vehicleConnectionReq
+     * @return
+     */
+    @PostMapping("/receiveMsg/connect")
+    public Result<MqttServerModel> receiveMsg(@RequestBody VehicleConnectionReq vehicleConnectionReq){
+        log.info(">"+vehicleConnectionReq);
+        MqttServerModel mqttServerModel =carOneClickOperationService.getConnect(vehicleConnectionReq);
+        return Result.success(mqttServerModel);
+    }
+}