cloud-auth/pom.xml

@@ -16,10 +16,23 @@
 
     <dependencies>
 
-<!--        <dependency>-->
+        <!-- SpringCloud Alibaba Nacos -->
-<!--            <groupId>com.muyu</groupId>-->
+        <dependency>
-<!--            <artifactId>cloud-common-saas</artifactId>-->
+            <groupId>com.alibaba.cloud</groupId>
-<!--        </dependency>-->
+            <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 Web -->
         <dependency>
@@ -45,48 +58,6 @@
             <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,8 +1,5 @@
 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;
@@ -13,18 +10,10 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  *
  * @author muyu
  */
-@EnableCustomConfig
 @EnableMyFeignClients
-@SpringBootApplication(
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-        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,7 @@ 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 +25,16 @@ import jakarta.servlet.http.HttpServletRequest;
  */
 @RestController
 public class TokenController {
-    @Resource
+    @Autowired
     private TokenService tokenService;
 
-    @Resource
+    @Autowired
     private SysLoginService sysLoginService;
 
     @PostMapping("login")
     public Result<?> login (@RequestBody LoginBody form) {
         // 用户登录
-        LoginUser userInfo = sysLoginService.login(form);
+        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
         // 获取登录token
         return Result.success(tokenService.createToken(userInfo));
     }

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

@@ -1,16 +1,11 @@
 package com.muyu.auth.form;
 
-import lombok.Data;
-
 /**
  * 用户登录对象
  *
  * @author muyu
  */
-@Data
 public class LoginBody {
-
-    private String firmCode;
     /**
      * 用户名
      */
@@ -20,4 +15,20 @@ public class LoginBody {
      * 用户密码
      */
     private String password;
+
+    public String getUsername () {
+        return username;
+    }
+
+    public void setUsername (String username) {
+        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,6 +1,5 @@
 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;
@@ -13,16 +12,12 @@ 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.RemoteSaasService;
 import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.domain.LoginUser;
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Set;
-
-
 /**
  * 登录校验方法
  *
@@ -30,30 +25,24 @@ import java.util.Set;
  */
 @Component
 public class SysLoginService {
-    @Resource
+    @Autowired
     private RemoteUserService remoteUserService;
 
-    @Resource
+    @Autowired
     private SysPasswordService passwordService;
 
-    @Resource
+    @Autowired
     private SysRecordLogService recordLogService;
 
-    @Resource
+    @Autowired
     private RedisService redisService;
 
-    @Resource
-    private RemoteSaasService remoteSaasService;
-
     /**
      * 登录
      */
-    public LoginUser login (LoginBody form) {
+    public LoginUser login (String username, String password) {
-        String firmCode = form.getFirmCode();
-        String username = form.getUsername();
-        String password = form.getPassword();
         // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(firmCode, username, password)) {
+        if (StringUtils.isAnyBlank(username, password)) {
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
             throw new ServiceException("用户/密码必须填写");
         }
@@ -76,7 +65,8 @@ public class SysLoginService {
             throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
         }
         // 查询用户信息
-        Result<LoginUser> userResult = remoteUserService.getUserInfo(firmCode, username, SecurityConstants.INNER);
+        Result<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
+
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
             throw new ServiceException("登录用户：" + username + " 不存在");
@@ -86,8 +76,8 @@ public class SysLoginService {
             throw new ServiceException(userResult.getMsg());
         }
 
-        LoginUser loginUser = userResult.getData();
+        LoginUser userInfo = userResult.getData();
-        SysUser user = loginUser.getSysUser();
+        SysUser user = userResult.getData().getSysUser();
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
             throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
@@ -98,8 +88,7 @@ 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,7 @@ 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 +18,14 @@ 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,7 @@ 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 +16,7 @@ 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: 49.235.136.60:8848
+  addr: nacos.muyu.icu:8848
   user-name: nacos
   password: nacos
-  namespace: wyh
+  namespace: muyu-cloud
 # 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:
-          # 系统环境Config共享配置
-          - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
           # 系统共享配置
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          # 系统环境Config共享配置
+          - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 

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

@@ -1,46 +0,0 @@
-<?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.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>33.0.0-jre</version>
-        </dependency>
-
-        <dependency>
-            <groupId>logkit</groupId>
-            <artifactId>logkit</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
-            <version>2.9.3</version>
-        </dependency>
-
-
-    </dependencies>
-</project>

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

@@ -1,37 +0,0 @@
-package com.muyu.common.cache;
-
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.concurrent.TimeUnit;
-
-@Slf4j
-public class CaffeineTest {
-    public static void main(String[] args) {
-        Cache<String, String> cache = Caffeine.newBuilder()
-                .initialCapacity(5)
-                // 超出时淘汰
-                .maximumSize(10)
-                //设置写缓存后n秒钟过期
-                .expireAfterWrite(60, TimeUnit.SECONDS)
-                //设置读写缓存后n秒钟过期,实际很少用到,类似于expireAfterWrite
-                //.expireAfterAccess(17, TimeUnit.SECONDS)
-                .build();
-
-        String orderId = String.valueOf(123456789);
-        String orderInfo = cache.get(orderId, key -> getInfo(key));
-        System.out.println(orderInfo);
-    }
-
-    private static String getInfo(String orderId) {
-        String info = "";
-        // 先查询redis缓存
-        log.info("get data from redis");
-
-        // 当redis缓存不存在查db
-        log.info("get data from mysql");
-        info = String.format("{orderId=%s}", orderId);
-        return info;
-    }
-}

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

@@ -1,36 +0,0 @@
-package com.muyu.common.cache;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-@Slf4j
-public class GuavaCacheTest {
-    public static void main(String[] args) throws ExecutionException {
-        Cache<String, String> cache = CacheBuilder.newBuilder()
-                .initialCapacity(5)  // 初始容量
-                .maximumSize(10)     // 最大缓存数，超出淘汰
-                .expireAfterWrite(60, TimeUnit.SECONDS) // 过期时间
-                .build();
-
-        String orderId = String.valueOf(123456789);
-        // 获取orderInfo，如果key不存在，callable中调用getInfo方法返回数据
-        String orderInfo = cache.get(orderId, () -> getInfo(orderId));
-        log.info("orderInfo = {}", orderInfo);
-
-    }
-
-    private static String getInfo(String orderId) {
-        String info = "";
-        // 先查询redis缓存
-        log.info("get data from redis");
-
-        // 当redis缓存不存在查db
-        log.info("get data from mysql");
-        info = String.format("{orderId=%s}", orderId);
-        return info;
-    }
-}

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

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

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

@@ -1,35 +0,0 @@
-<?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

@@ -1,51 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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

@@ -1,97 +0,0 @@
-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

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

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

@@ -16,11 +16,6 @@
     </description>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.yulichang</groupId>
-            <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.11</version>
-        </dependency>
 
         <!-- SpringCloud Openfeign -->
         <dependency>

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

@@ -45,9 +45,4 @@ 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,13 +20,4 @@ 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,12 +80,4 @@ 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

@@ -1,63 +0,0 @@
-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 class ServiceException extends RuntimeException {
+public final class ServiceException extends RuntimeException {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -21,7 +21,7 @@ public class ServiceException extends RuntimeException {
     /**
      * 错误明细，内部调试错误
      * <p>
-     * 和 {CommonResult#getDetailMessage()} 一致的设计
+     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
      */
     private String detailMessage;
 

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

@@ -162,15 +162,4 @@ 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-iotdb/pom.xml

@@ -1,36 +0,0 @@
-<?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

@@ -1,53 +0,0 @@
-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

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

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

@@ -1,37 +0,0 @@
-<?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

@@ -1,54 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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

@@ -1,2 +0,0 @@
-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,7 @@ 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 +48,7 @@ public class LogAspect {
      */
     private static final ThreadLocal<Long> TIME_THREADLOCAL = new NamedThreadLocal<Long>("Cost Time");
 
-    @Resource
+    @Autowired
     private AsyncLogService asyncLogService;
 
     /**

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

@@ -3,7 +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;
 
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AsyncLogService {
-    @Resource
+    @Autowired
     private RemoteLogService remoteLogService;
 
     /**

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

@@ -10,9 +10,7 @@
     </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>
@@ -34,4 +32,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/RabbitListenerConfigurer.java

@@ -1,8 +1,8 @@
-package com.muyu.common.rabbit.config;
+package com.muyu.common.rabbit;
 
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistrar;
-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.messaging.converter.MappingJackson2MessageConverter;
@@ -16,7 +16,7 @@ public class RabbitListenerConfigurer implements org.springframework.amqp.rabbit
     }
 
     //以下配置RabbitMQ消息服务
-    @Resource
+    @Autowired
     public ConnectionFactory connectionFactory;
 
 

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

@@ -1,48 +0,0 @@
-package com.muyu.common.rabbit.config;
-
-import lombok.extern.log4j.Log4j2;
-import org.springframework.amqp.rabbit.connection.CorrelationData;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-/**
- * 消息发送确认配置
- * 消息发送到交换机的回调
- */
-@Component
-@Log4j2
-public class ConfirmCallbackConfig implements RabbitTemplate.ConfirmCallback {
-
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
-
-    /**
-     * @PostContruct是spring框架的注解，在⽅法上加该注解会在项⽬启动的时候执⾏该⽅法，也可以理解为在spring容器初始化的时候执
-     */
-    @PostConstruct
-    public void init() {
-        rabbitTemplate.setConfirmCallback(this);
-    }
-
-    /**
-     * 交换机不管是否收到消息的一个回调方法
-     *
-     * @param correlationData 消息相关数据
-     * @param ack             交换机是否收到消息
-     * @param cause           失败原因
-     */
-    @Override
-    public void confirm(CorrelationData correlationData, boolean ack, String cause) {
-        if (!ack) {
-            String exchange = correlationData.getReturned().getExchange();
-            String message = correlationData.getReturned().getMessage().getBody().toString();
-            // 发送异常
-            log.error("消息：{}，发送到交换机：{}失败，原因是：{}", message, exchange, cause);
-            // TODO 可以把异常信息 以及 消息的内容直接添加到 MYSQL
-        }
-    }
-
-}

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

@@ -1,41 +0,0 @@
-package com.muyu.common.rabbit.config;
-
-import lombok.extern.log4j.Log4j2;
-import org.springframework.amqp.core.ReturnedMessage;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-/**
- * 消息发送到队列的确认
- */
-@Component
-@Log4j2
-public class ReturnCallbackConfig implements RabbitTemplate.ReturnsCallback {
-
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
-
-    /**
-     * @PostContruct是spring框架的注解，在⽅法上加该注解会在项⽬启动的时候执⾏该⽅法，也可以理解为在spring容器初始化的时候执
-     */
-    @PostConstruct
-    public void init() {
-        rabbitTemplate.setReturnsCallback(this);
-    }
-
-    /**
-     * 消息发送失败 则会执行这个方法
-     *
-     * @param returnedMessage the returned message and metadata.
-     */
-    @Override
-    public void returnedMessage(ReturnedMessage returnedMessage) {
-        log.error("消息：{}，被交换机：{} 回退！退回原因为：{}",
-                returnedMessage.getMessage().toString(), returnedMessage.getExchange(), returnedMessage.getReplyText());
-        // TODO 回退了所有的信息，可做补偿机制
-    }
-
-}

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

@@ -1,15 +0,0 @@
-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,3 +1 @@
-com.muyu.common.rabbit.config.RabbitListenerConfigurer
+com.muyu.common.rabbit.RabbitListenerConfigurer
-com.muyu.common.rabbit.config.ConfirmCallbackConfig
-com.muyu.common.rabbit.config.ReturnCallbackConfig

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

@@ -1,6 +1,6 @@
 package com.muyu.common.redis.service;
 
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit;
 @SuppressWarnings(value = {"unchecked", "rawtypes"})
 @Component
 public class RedisService {
-    @Resource
+    @Autowired
     public RedisTemplate redisTemplate;
 
     /**

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

@@ -1,36 +0,0 @@
-<?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

@@ -1,105 +0,0 @@
-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)
-                .forEach(dataSourceInfo -> {
-                    dataSourceMap.put(dataSourceInfo.getKey(), druidDataSourceFactory.create(dataSourceInfo));
-                });
-        //设置动态数据源
-        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

@@ -1,19 +0,0 @@
-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 = "127.0.0.1";
-
-    public final static Integer PORT = 3306;
-}

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

@@ -1,60 +0,0 @@
-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

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

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

@@ -1,42 +0,0 @@
-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

@@ -1,66 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,31 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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

@@ -1,57 +0,0 @@
-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

@@ -1,31 +0,0 @@
-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

@@ -1,3 +0,0 @@
-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,7 +28,6 @@ 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 javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 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;
-    @Resource
+    @Autowired
     private RedisService redisService;
 
     /**
@@ -55,11 +55,10 @@ 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,10 +30,6 @@ 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,6 +63,4 @@ public class LoginUser implements Serializable {
      */
     private SysUser sysUser;
 
-
-
 }

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

@@ -34,8 +34,6 @@ 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

@@ -1,38 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

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

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

@@ -1,28 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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,14 +3,12 @@ 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.domain.SysUser;
 import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
+import com.muyu.common.system.domain.LoginUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Set;
-
 /**
  * 用户服务
  *
@@ -18,6 +16,16 @@ import java.util.Set;
  */
 @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
 public interface RemoteUserService {
+    /**
+     * 通过用户名查询用户信息
+     *
+     * @param username 用户名
+     * @param source   请求来源
+     *
+     * @return 结果
+     */
+    @GetMapping("/user/info/{username}")
+    public Result<LoginUser> getUserInfo (@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 注册用户信息
@@ -29,73 +37,4 @@ 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

@@ -1,36 +0,0 @@
-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,17 +1,14 @@
 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.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;
-
 /**
  * 用户服务降级处理
  *
@@ -25,57 +22,15 @@ 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,4 +1,3 @@
 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/cloud-common-xxl/src/main/java/com/muyu/common/xxl/XXLJobConfig.java

@@ -7,9 +7,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
 @Log4j2
-//@Component
+@Component
 public class XXLJobConfig {
-//    @Bean
+    @Bean
     public XxlJobSpringExecutor xxlJobExecutor(XxlJobProperties xxlJobProperties) {
         if (StringUtils.isEmpty(xxlJobProperties.getAdminAddresses())){
             throw new RuntimeException("请在bootstrap.yml当中配置shared-configs项，xxl-job共享配置[application-xxl-config]");

cloud-common/pom.xml

@@ -20,11 +20,6 @@
         <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

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

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

@@ -13,6 +13,5 @@ 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,7 @@
 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 +16,7 @@ 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/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 javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 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自行添加
-    @Resource
+    @Autowired
     private IgnoreWhiteProperties ignoreWhite;
 
-    @Resource
+    @Autowired
     private RedisService redisService;
 
 
@@ -63,7 +63,6 @@ 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, "令牌验证失败");
         }
@@ -72,7 +71,6 @@ 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 javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 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";
-    @Resource
+    @Autowired
     private ValidateCodeService validateCodeService;
-    @Resource
+    @Autowired
     private CaptchaProperties captchaProperties;
 
     @Override

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

@@ -4,7 +4,7 @@ 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 +31,7 @@ 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,7 @@ 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 +21,7 @@ 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

@@ -12,7 +12,7 @@ import com.muyu.common.redis.service.RedisService;
 import com.muyu.gateway.config.properties.CaptchaProperties;
 import com.muyu.gateway.model.resp.CaptchaCodeResp;
 import com.muyu.gateway.service.ValidateCodeService;
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.FastByteArrayOutputStream;
 
@@ -35,10 +35,10 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
     @Resource(name = "captchaProducerMath")
     private Producer captchaProducerMath;
 
-    @Resource
+    @Autowired
     private RedisService redisService;
 
-    @Resource
+    @Autowired
     private CaptchaProperties captchaProperties;
 
     /**
@@ -50,7 +50,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
         CaptchaCodeResp.CaptchaCodeRespBuilder respBuilder = CaptchaCodeResp.builder()
                 .captchaEnabled(captchaEnabled);
         if (!captchaEnabled) {
-            return Result.success(respBuilder.build());
+            return Result.success(respBuilder);
         }
 
         // 保存验证码信息

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

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

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

@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 49.235.136.60:8848
+  addr: nacos.muyu.icu:8848
   user-name: nacos
   password: nacos
-  namespace: wyh
+  namespace: muyu-cloud
 
 # 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:
-          # 系统环境Config共享配置
-          - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
           # 系统共享配置
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          # 系统环境Config共享配置
+          - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
     sentinel:
       # 取消控制台懒加载
       eager: true

cloud-modules/cloud-modules-data-processing/pom.xml

@@ -1,155 +0,0 @@
-<?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-server</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-modules-data-processing</artifactId>
-
-    <description>
-        cloud-data-processing 数据处理模块
-    </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-kafka</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-caffeine</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-rabbit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-iotdb</artifactId>
-            <version>3.6.3</version>
-        </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>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataScope -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datascope</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datasource</artifactId>
-        </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>org.apache.iotdb</groupId>-->
-<!--            <artifactId>iotdb-jdbc</artifactId>-->
-<!--            <version>0.12.1</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>druid-spring-boot-starter</artifactId>-->
-<!--            <version>1.2.20</version>-->
-<!--        </dependency>-->
-
-
-<!--        <dependency>-->
-<!--            <groupId>org.mybatis</groupId>-->
-<!--            <artifactId>mybatis-spring</artifactId>-->
-<!--            <version>3.0.3</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
-<!--            <version>3.5.5</version>-->
-<!--        </dependency>-->
-
-<!--&lt;!&ndash;        <dependency>&ndash;&gt;-->
-<!--&lt;!&ndash;            <groupId>org.apache.iotdb</groupId>&ndash;&gt;-->
-<!--&lt;!&ndash;            <artifactId>iotdb-session</artifactId>&ndash;&gt;-->
-<!--&lt;!&ndash;            <version>1.3.2</version>&ndash;&gt;-->
-<!--&lt;!&ndash;        </dependency>&ndash;&gt;-->
-
-<!--        &lt;!&ndash; Druid &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>druid-spring-boot-3-starter</artifactId>-->
-<!--            <version>${druid.version}</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash; Dynamic DataSource &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>-->
-<!--            <version>${dynamic-ds.version}</version>-->
-<!--        </dependency>-->
-
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/MyDataApplication.java

@@ -1,32 +0,0 @@
-package com.muyu.data.processing;
-
-import com.muyu.common.kafka.constants.KafkaConstants;
-
-import com.muyu.common.security.annotation.EnableCustomConfig;
-import com.muyu.common.security.annotation.EnableMyFeignClients;
-import jakarta.annotation.PostConstruct;
-import org.springframework.amqp.rabbit.annotation.EnableRabbit;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-/**
- * 数据处理模块启动器
- * @Author: 胡杨
- * @Name: MyData
- * @Description: 数据处理模块启动器
- * @CreatedDate: 2024/9/26 下午7:31
- * @FilePath: com.muyu.data.processing
- */
-@EnableRabbit
-@EnableCustomConfig
-@EnableMyFeignClients
-@SpringBootApplication(scanBasePackages = {"com.muyu"})
-public class MyDataApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(MyDataApplication.class, args);
-
-        System.out.println("MyData 模块启动成功!");
-    }
-
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/controller/DataProcessingController.java

@@ -1,100 +0,0 @@
-package com.muyu.data.processing.controller;
-
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.data.processing.domain.BasicData;
-import com.muyu.data.processing.domain.IotDbData;
-import com.muyu.data.processing.service.DataProcessingService;
-
-import javax.annotation.Resource;
-
-import org.springframework.web.bind.annotation.*;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 数据处理控制层
- *
- * @Author: 胡杨
- * @Name: DataProcessing
- * @Description: 数据处理控制层
- * @CreatedDate: 2024/9/28 下午3:53
- * @FilePath: com.muyu.data.processing.controller
- */
-
-@Slf4j
-@RestController
-@RequestMapping("/DataProcessing")
-public class DataProcessingController {
-    @Resource
-    private DataProcessingService service;
-
-    /**
-     * 查看数据库有多少组
-     *
-     * @return
-     */
-    @GetMapping("/selectStorageGroup")
-    public Result selectStorageGroup() {
-        List<String> v = service.selectStorageGroup();if (v.size() > 0) {v.forEach(x -> {
-            System.out.println("group------------------" + x.toString());
-        });
-            return Result.success(v);
-        } else {
-            return Result.error(false);
-        }
-    }
-
-    @GetMapping("/selectCarData")
-    public Result selectCarData(@RequestParam("vin") String vin) {
-//        String firmCode = SecurityUtils.getSaasKey();
-        String firmCode = "firm01";
-        return Result.success(service.selectCarData(firmCode,vin));
-    }
-
-    @PostMapping("/addCarData")
-    public Result addCarData(@RequestBody IotDbData data) {
-        HashMap<String, BasicData> hashMap = new HashMap<>();
-        hashMap.put("timestamp", BasicData
-                .builder()
-                .key("timestamp")
-                .label("时间戳")
-                .value(String.valueOf(data.getTimestamp()))
-                .type("string")
-                .build());
-        hashMap.put("vin", BasicData
-                .builder()
-                .key("vin")
-                .label("VIN码")
-                .value(data.getVin())
-                .type("string")
-                .build());
-        hashMap.put("latitude", BasicData
-                .builder()
-                .key("latitude")
-                .label("纬度")
-                .value(data.getLatitude())
-                .type("long")
-                .build());
-        hashMap.put("longitude", BasicData
-                .builder()
-                .key("longitude")
-                .label("经度")
-                .value(data.getLongitude())
-                .type("long")
-                .build());
-        hashMap.put("firmCode", BasicData
-                .builder()
-                .key("firmCode")
-                .label("企业编码")
-                .value("firm01")
-                .type("string")
-                .build());
-        return Result.success(service.addCarData(hashMap));
-    }
-
-
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/controller/TestController.java

@@ -1,165 +0,0 @@
-package com.muyu.data.processing.controller;
-
-
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.muyu.common.caffeine.enums.CacheNameEnums;
-import com.muyu.common.core.utils.uuid.UUID;
-import com.muyu.common.iotdb.config.IotDBSessionConfig;
-import com.muyu.common.kafka.constants.KafkaConstants;
-import com.muyu.common.rabbit.constants.RabbitConstants;
-import jakarta.annotation.Resource;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.cache.Cache;
-import org.springframework.cache.caffeine.CaffeineCache;
-import org.springframework.cache.support.SimpleCacheManager;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.*;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.ArrayList;
-
-/**
- * 测试控制层
- * @Author: 胡杨
- * @Name: Test
- * @Description:
- * @CreatedDate: 2024/9/27 上午10:54
- * @FilePath: com.muyu.data.processing.controller
- */
-@Slf4j
-@RestController
-@RequestMapping("/Test")
-public class TestController {
-    @Resource
-    private KafkaProducer<String,String> kafkaProducer;
-    @Resource
-    private RabbitTemplate rabbitTemplate;
-    @Resource
-    private IotDBSessionConfig iotDBSessionConfig;
-    @Resource
-    private RedisTemplate<String,String> redisTemplate;
-//    @Resource
-//    private CaffeineCacheUtils cacheUtils;
-
-    @Resource
-    private SimpleCacheManager cacheManager;
-
-    @GetMapping("/testKafka")
-    public void sendMsg() {
-        try {
-            // 测试数据
-            String jsonString = """
-                    [{
-                        "key": "vin",
-                        "label": "VIN码",
-                        "type": "String",
-                        "value": "vin999999"
-                    },{
-                        "key": "timestamp",
-                        "label": "时间戳",
-                        "type": "long",
-                        "value": "1727534036893"
-                    },{
-                        "key": "latitude",
-                        "label": "纬度",
-                        "type": "int",
-                        "value": "66.898"
-                    },{
-                        "key": "longitude",
-                        "label": "经度",
-                        "type": "int",
-                        "value": "99.12"
-                    }]""";
-            ProducerRecord<String, String> producerRecord = new ProducerRecord<>(KafkaConstants.KafkaTopic, jsonString);
-            kafkaProducer.send(producerRecord);
-            System.out.println("同步消息发送成功: " + jsonString);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.out.println("同步消息发送失败");
-        }
-    }
-
-    @GetMapping("/testRabbit/GoOnline")
-    public void testRabbitGoOnline(@RequestParam("msg") String msg) {
-        rabbitTemplate.convertAndSend(RabbitConstants.GO_ONLINE_QUEUE, msg, message -> {
-            message.getMessageProperties().setMessageId(UUID.randomUUID().toString().replace("-",""));
-            return message;
-        });
-    }
-
-    @GetMapping("/testRabbit/Downline")
-    public void testRabbitDownline(@RequestParam("msg") String msg) {
-        rabbitTemplate.convertAndSend(RabbitConstants.DOWNLINE_QUEUE, msg, message -> {
-            message.getMessageProperties().setMessageId(UUID.randomUUID().toString().replace("-",""));
-            return message;
-        });
-    }
-
-    @GetMapping("/insertData")
-    public void insertData(@RequestParam("deviceId") String deviceId, @RequestParam("time") long time, @RequestParam("value") double value) throws Exception {
-        String sql = String.format("insert into root.one.%s(timestamp, temperature) values (%d, %f)", deviceId, time, value);
-        iotDBSessionConfig.getSessionPool().executeNonQueryStatement(sql);
-    }
-
-    @GetMapping("/testSetRedis")
-    public void testSetRedis(@RequestParam("key") String key,@RequestParam("value") String value) {
-        redisTemplate.opsForValue().set(key,value);
-    }
-
-    @GetMapping("/testGetCache")
-    public void testGetCache(@RequestParam("cacheName") String cacheName,@RequestParam("key") String key) {
-        Cache cache = cacheManager.getCache(cacheName);
-        if (cache != null) {
-            String v = cache.get(key,String.class);
-            log.info("缓存值为: {}",v);
-        }else {
-            log.info("无缓存");
-        }
-    }
-
-    @GetMapping("/textSetCache")
-    public void textSetCache(
-            @RequestParam("cacheName") String cacheName,
-            @RequestParam("key") String key,
-            @RequestParam("value") String value) {
-        Cache cache = cacheManager.getCache(cacheName);
-        if (cache != null){
-            cache.put(key, value);
-            log.info("设置缓存成功");
-        }else {
-            log.info("无缓存");
-        }
-    }
-
-    @GetMapping("/testDelCache")
-    public void testDelCache(@RequestParam("cacheName") String cacheName) {
-        if (!CacheNameEnums.isCode(cacheName)){
-            log.info("缓存分区不存在");
-            return;
-        }
-        Cache cache = cacheManager.getCache(cacheName);
-        if (cache != null) {
-            cache.invalidate();
-            log.info("删除缓存成功");
-        }else{
-            log.info("无缓存");
-        }
-    }
-
-
-    @GetMapping("/testAddCache")
-    public void testAddCache(@RequestParam("vin") String vin) {
-        ArrayList<CaffeineCache> caches = new ArrayList<>();
-        caches.add(new CaffeineCache(vin, Caffeine.newBuilder().recordStats().build()));
-        cacheManager.setCaches(caches);
-        log.info("缓存管理器创建新分区: {}", vin);
-    }
-
-    @GetMapping("/testGetCacheNames")
-    public void testGetCacheNames() {
-        cacheManager.initializeCaches();
-        log.info("缓存分区列表: {}", cacheManager.getCacheNames());
-    }
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/domain/BasicData.java

@@ -1,36 +0,0 @@
-package com.muyu.data.processing.domain;
-
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * 报文信息 时序实体类
- *
- * @Author: 胡杨
- * @Name: DataProcessing
- * @Description: 报文信息 时序实体类
- * @CreatedDate: 2024/9/28 下午3:48
- * @FilePath: com.muyu.data.processing.domain
- */
-
-@Data
-@ToString
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class BasicData implements Serializable {
-
-    private String key;
-    private String label;
-    private String value;
-    private String type;
-
-//    public void setValueClass() {
-//        Class<?> info = ClassType.getInfo(type);
-//        if (info.isInstance(value)){
-//            value = info.cast(value);
-//        }
-//    }
-}
-

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/domain/CarData.java

@@ -1,25 +0,0 @@
-package com.muyu.data.processing.domain;
-
-import lombok.*;
-
-/**
- * 车辆信息
- *
- * @Author: 胡杨
- * @Name: CarData
- * @Description: 车辆信息
- * @CreatedDate: 2024/10/2 下午2:34
- * @FilePath: com.muyu.data.processing.domain
- */
-
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class CarData {
-    private String vin;
-    private long timestamp;
-    private String latitude;
-    private String longitude;
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/domain/IotDbData.java

@@ -1,35 +0,0 @@
-package com.muyu.data.processing.domain;
-
-import com.muyu.common.core.web.domain.BaseEntity;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
-import java.util.Date;
-
-/**
- * 报文信息 时序实体类
- *
- * @Author: 胡杨
- * @Name: DataProcessing
- * @Description: 报文信息 时序实体类
- * @CreatedDate: 2024/9/28 下午3:48
- * @FilePath: com.muyu.data.processing.domain
- */
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ToString
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-public class IotDbData extends BaseEntity {
-    private long timestamp;
-
-    private String vin;
-
-    private String latitude;
-    private String longitude;
-
-
-}
-

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/domain/Temporary2.java

@@ -1,22 +0,0 @@
-package com.muyu.data.processing.domain;
-
-import lombok.*;
-
-/**
- * 临时类2
- *
- * @Author: 胡杨
- * @Name: Temporary2
- * @Description: 临时类2
- * @CreatedDate: 2024/9/30 下午7:27
- * @FilePath: com.muyu.data.processing.domain
- */
-
-@Data
-@ToString
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class Temporary2 {
-    private String test;
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/kafka/KafkaConsumerService.java

@@ -1,71 +0,0 @@
-package com.muyu.data.processing.kafka;
-
-
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
-import com.muyu.common.kafka.constants.KafkaConstants;
-import com.muyu.data.processing.domain.BasicData;
-import com.muyu.data.processing.service.DataProcessingService;
-import com.muyu.data.processing.strategy.core.StartStrategy;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.stereotype.Component;
-
-import java.time.Duration;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * kafka消费者
- * @Author: 胡杨
- * @Name: KafkaConsumerService
- * @Description: kafka消费者
- * @CreatedDate: 2024/9/27 上午9:27
- * @FilePath: com.muyu.data.processing.kafka
- */
-
-@Slf4j
-@Component
-public class KafkaConsumerService implements InitializingBean {
-    @Resource
-    private KafkaConsumer kafkaConsumer;
-    @Resource
-    private StartStrategy startStrategy;
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        Thread thread = new Thread(() -> {
-            log.info("启动线程监听Topic: {}", KafkaConstants.KafkaTopic);
-            ThreadUtil.sleep(1000);
-            Collection<String> topics = Lists.newArrayList(KafkaConstants.KafkaTopic);
-            kafkaConsumer.subscribe(topics);
-            while (true) {
-                System.out.println("开始消费数据,等待中...");
-                ConsumerRecords<String, String> consumerRecords = kafkaConsumer.poll(Duration.ofMillis(1000));
-                for (ConsumerRecord consumerRecord : consumerRecords) {
-                    //1.从ConsumerRecord中获取消费数据
-                    String originalMsg = (String) consumerRecord.value();
-                    log.info("从Kafka中消费的原始数据: " + originalMsg);
-                    //2.把消费数据转换为DTO对象
-                    List<BasicData> dataList = JSONUtil.toList(originalMsg, BasicData.class);
-                    log.info("从Kafka中消费的实体数据: " + dataList);
-                    // 执行策略
-                    startStrategy.applyStrategy(getDataMap(dataList));
-                }
-            }
-        });
-        thread.start();
-    }
-
-    private HashMap<String, BasicData> getDataMap(List<BasicData> dataList) {
-        HashMap<String, BasicData> basicDataHashMap = new HashMap<>();
-        dataList.forEach(data -> basicDataHashMap.put(data.getKey(), data));
-        return basicDataHashMap;
-    }
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/mapper/DataProcessingMapper.java

@@ -1,35 +0,0 @@
-package com.muyu.data.processing.mapper;
-
-import com.muyu.data.processing.domain.CarData;
-import com.muyu.data.processing.domain.IotDbData;
-import com.muyu.data.processing.domain.BasicData;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 数据处理持久层
- *
- * @Author: 胡杨
- * @Name: DataPeocessingMapper
- * @Description: 数据处理持久层
- * @CreatedDate: 2024/9/28 下午3:47
- * @FilePath: com.muyu.data.processing.mapper
- */
-
-@Repository
-@Mapper
-public interface DataProcessingMapper{
-
-    List<String> selectStorageGroup();
-
-    Integer insIotDbData(@Param("key") String key, @Param("value") String value);
-
-    void strategyCheck(@Param("dataList") List<BasicData> dataList);
-
-    Integer insIotDbDataVo(IotDbData build);
-
-    List<CarData> selectCarData(@Param("tableName") String tableName);
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/rebbit/DownlineRabbitConsumer.java

@@ -1,74 +0,0 @@
-package com.muyu.data.processing.rebbit;
-
-
-import com.muyu.common.caffeine.enums.CacheNameEnums;
-import com.muyu.common.rabbit.constants.RabbitConstants;
-import com.rabbitmq.client.Channel;
-import jakarta.annotation.Resource;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.util.HashSet;
-
-/**
- * 下线事件监听
- * @Author: 胡杨
- * @Name: DownlineRabbitConsumer
- * @Description: 车辆下线监听器
- * @CreatedDate: 2024/9/26 下午8:21
- * @FilePath: com.muyu.data.processing.rebbit
- */
-@Slf4j
-@Component
-@Setter
-public class DownlineRabbitConsumer {
-    @Resource
-    private RedisTemplate<String,String> redisTemplate;
-    @Resource
-    private CacheManager cacheManager;
-
-    @RabbitListener(queuesToDeclare = {@Queue(RabbitConstants.DOWNLINE_QUEUE)})
-    public void downline(String vin, Message message, Channel channel) {
-        log.info("车辆 {} 下线, 配置信息准备中。。。",vin);
-        try {
-            // 重复性校验
-            Long add = redisTemplate.opsForSet().add(RabbitConstants.DOWNLINE_QUEUE, message.getMessageProperties().getMessageId());
-            if (add>0) {
-                deleteCarCache(vin);
-                log.info("车辆 {} 下线, 消息已确认。。。",vin);
-            } else {
-                log.info("车辆 {} 下线, 消息重复消费，已确认。。。",vin);
-            }
-            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-            log.info("车辆 {} 下线, 配置信息已准备完毕。。。",vin);
-        } catch (IOException e) {
-            try {
-                log.warn("车辆 {} 下线, 配置信息准备失败，返回队列，原因：{}", vin, e.getMessage());
-                channel.basicAck(message.getMessageProperties().getDeliveryTag(), true);
-            } catch (IOException ex) {
-                log.warn("车辆 {} 下线, 消息返回队列失败，原因：{}", vin, ex.getMessage());
-            }
-        }
-    }
-
-
-    /**
-     * 车辆下线 - 删除缓存
-     */
-    public void deleteCarCache(String vin) {
-        Cache cache = cacheManager.getCache(vin);
-        if (ObjectUtils.isNotEmpty(cache)){
-            cache.invalidate();
-        }
-        log.info("车辆编码:{},本地缓存删除完成...", vin);
-    }
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/rebbit/GoOnlineRabbitConsumer.java

@@ -1,74 +0,0 @@
-package com.muyu.data.processing.rebbit;
-
-
-import com.muyu.common.caffeine.enums.CacheNameEnums;
-import com.muyu.common.rabbit.constants.RabbitConstants;
-import com.rabbitmq.client.Channel;
-import jakarta.annotation.Resource;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.CacheManager;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * 上线事件监听
- * @Author: 胡杨
- * @Name: GoOnlineRabbitConsumer
- * @Description: 上线事件
- * @CreatedDate: 2024/9/26 下午7:38
- * @FilePath: com.muyu.data.processing.rebbit
- */
-@Slf4j
-@Component
-@Setter
-public class GoOnlineRabbitConsumer {
-    @Resource
-    private RedisTemplate<String,String> redisTemplate;
-    @Resource
-    private CacheManager cacheManager;
-
-    @RabbitListener(queuesToDeclare = {@Queue(RabbitConstants.GO_ONLINE_QUEUE)})
-    public void goOnline(String vin, Message message, Channel channel){
-        log.info("车辆 {} 上线, 配置信息准备中。。。",vin);
-        try {
-            // 重复性校验
-            Long add = redisTemplate.opsForSet().add(RabbitConstants.GO_ONLINE_QUEUE, message.getMessageProperties().getMessageId());
-            if (add>0) {
-                addCarCache(vin);
-                log.info("车辆 {} 上线, 消息已确认。。。",vin);
-            } else {
-                log.info("车辆 {} 上线, 消息重复消费，已确认。。。",vin);
-            }
-            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-            log.info("车辆 {} 上线, 配置信息已准备完毕。。。",vin);
-        } catch (IOException e) {
-            try {
-                log.warn("车辆 {} 上线, 配置信息准备失败，返回队列，原因：{}", vin, e.getMessage());
-                channel.basicAck(message.getMessageProperties().getDeliveryTag(), true);
-            } catch (IOException ex) {
-                log.warn("车辆 {} 上线, 消息返回队列失败，原因：{}", vin, ex.getMessage());
-            }
-        }
-    }
-
-    /**
-     * 车辆上线 - 新增缓存
-     */
-    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);
-    }
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/service/DataProcessingService.java

@@ -1,36 +0,0 @@
-package com.muyu.data.processing.service;
-
-
-import com.muyu.data.processing.domain.BasicData;
-import com.muyu.data.processing.domain.CarData;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 数据处理业务层
- *
- * @Author: 胡杨
- * @Name: DataProcessing
- * @Description: 数据处理业务层
- * @CreatedDate: 2024/9/28 下午3:52
- * @FilePath: com.muyu.data.processing.server
- */
-
-public interface DataProcessingService{
-
-    /**
-     * 选择存储组
-     *
-     * @return {@link List }<{@link String }>
-     */
-    List<String> selectStorageGroup();
-
-    void strategyCheck(List<BasicData> dataList);
-
-    Integer insIotDbData(String key, String value);
-
-    List<CarData> selectCarData(String firmCode, String vin);
-
-    Object addCarData(HashMap<String, BasicData> hashMap);
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/service/impl/DataProcessingServiceImpl.java

@@ -1,148 +0,0 @@
-package com.muyu.data.processing.service.impl;
-
-
-import javax.annotation.Resource;
-
-import com.muyu.common.iotdb.config.IotDBSessionConfig;
-import com.muyu.data.processing.domain.CarData;
-import com.muyu.data.processing.domain.IotDbData;
-import com.muyu.data.processing.domain.BasicData;
-import org.apache.iotdb.isession.SessionDataSet;
-import org.apache.iotdb.isession.pool.SessionDataSetWrapper;
-import org.apache.iotdb.rpc.IoTDBConnectionException;
-import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.pool.SessionPool;
-import org.apache.iotdb.tsfile.read.common.Field;
-import org.apache.iotdb.tsfile.read.common.RowRecord;
-import org.springframework.stereotype.Service;
-import lombok.extern.slf4j.Slf4j;
-import com.muyu.data.processing.mapper.DataProcessingMapper;
-import com.muyu.data.processing.service.DataProcessingService;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 数据处理实现层
- *
- * @Author: 胡杨
- * @Name: DataProcessing
- * @Description: 数据处理实现层
- * @CreatedDate: 2024/9/28 下午3:52
- * @FilePath: com.muyu.data.processing.server.impl
- */
-
-@Slf4j
-@Service
-public class DataProcessingServiceImpl implements DataProcessingService {
-    @Resource
-    private DataProcessingMapper mapper;
-    @Resource
-    private SessionPool sessionPool;
-
-
-    @Override
-    public List<String> selectStorageGroup() {
-        return mapper.selectStorageGroup();
-    }
-
-    @Override
-    public void strategyCheck(List<BasicData> dataList) {
-        HashMap<String, BasicData> kafkaDataHashMap = new HashMap<>();
-        dataList.forEach(data -> kafkaDataHashMap.put(data.getKey(), data));
-//        Result<String[]> result = rootStrategy.applyStrategy(kafkaDataHashMap);
-//        String[] data = result.getData();
-//        insIotDbData(data[0],data[1]);
-        IotDbData build = IotDbData.builder()
-                .vin(kafkaDataHashMap.get("vin").getValue())
-                .timestamp(Long.parseLong(kafkaDataHashMap.get("timestamp").getValue()))
-                .latitude(kafkaDataHashMap.get("latitude").getValue())
-                .longitude(kafkaDataHashMap.get("longitude").getValue())
-                .build();
-        mapper.insIotDbDataVo(build);
-//        dataList.forEach(KafkaData::setValueClass);
-//        mapper.strategyCheck(dataList);
-    }
-
-    @Override
-    public Integer insIotDbData(String key, String value) {
-        return mapper.insIotDbData(key, value);
-    }
-
-    @Override
-    public List<CarData> selectCarData(String firmCode, String vin) {
-        ArrayList<CarData> carDataList = new ArrayList<>();
-        String sql = "select * from root.one."+firmCode+"."+vin;
-        try {
-            SessionDataSetWrapper dataSetWrapper = sessionPool.executeQueryStatement(sql);
-            List<String> columnNames = dataSetWrapper.getColumnNames();
-            while (dataSetWrapper.hasNext()){
-                RowRecord next = dataSetWrapper.next();
-                CarData data = getCarData(vin, next, columnNames);
-                carDataList.add(data);
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return carDataList;
-    }
-
-    @Override
-    public Object addCarData(HashMap<String, BasicData> hashMap) {
-//        StringBuilder sql = new StringBuilder("insert into root.one.");
-//        sql.append(hashMap.get("firmCode").getValue())
-//                .append(".")
-//                .append(hashMap.get("vin").getValue())
-//                .append("(");
-//        hashMap.remove("firmCode");
-//        hashMap.remove("vin");
-//        StringBuilder keys = new StringBuilder();
-//        StringBuilder values = new StringBuilder();
-//        hashMap.keySet().forEach(key -> {
-//            if (hashMap.get(key) != null) {
-//                keys.append(key).append(",");
-//                if ("String".equals(hashMap.get(key).getType())) {
-//                    values.append("'")
-//                            .append(hashMap.get(key).getValue())
-//                            .append("'")
-//                            .append(",");
-//                }else {
-//                    values.append(hashMap.get(key).getValue())
-//                            .append(",");
-//                }
-//            }
-//        });
-//        sql.append(keys.substring(0, keys.length() - 1))
-//                .append(") values (")
-//                .append(values.substring(0, values.length() - 1))
-//                .append(")");
-//        try {
-//            sessionPool.executeNonQueryStatement(sql.toString());
-//        } catch (StatementExecutionException e) {
-//            throw new RuntimeException(e);
-//        } catch (IoTDBConnectionException e) {
-//            throw new RuntimeException(e);
-//        }
-//        log.info("成功执行sql语句: [{}]", sql);
-//        return sql;
-        return null;
-    }
-
-    private static CarData getCarData(String vin, RowRecord next, List<String> columnNames) {
-        List<Field> fields = next.getFields();
-        CarData data = new CarData();
-        data.setVin(vin);
-        data.setTimestamp(next.getTimestamp());
-        for (int i = 0; i < columnNames.size(); i++) {
-            if (columnNames.get(i).contains("latitude")) {
-                data.setLatitude(fields.get(i-1).getStringValue());
-            }else if (columnNames.get(i).contains("longitude")) {
-                data.setLongitude(fields.get(i-1).getStringValue());
-            }
-        }
-        return data;
-    }
-
-
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/StrategyHandler.java

@@ -1,24 +0,0 @@
-package com.muyu.data.processing.strategy;
-
-import com.muyu.data.processing.strategy.core.EndStrategy;
-
-/**
- * 策略控制者接口
- * @Author: 胡杨
- * @Name: StrategyHandler
- * @Description: 策略控制者接口
- * @CreatedDate: 2024/9/28 上午9:35
- * @FilePath: com.muyu.data.processing.strategy
- */
-public interface StrategyHandler<T,R> {
-
-    @SuppressWarnings("rawtypes")
-    StrategyHandler DEFAULT = param -> new EndStrategy();
-
-    /**
-     * 执行方法
-     * @param t 入参
-     * @return  返回结果
-     */
-    R apply(T t);
-}

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/strategy/abstractStrategyRouter.java

@@ -1,60 +0,0 @@
-package com.muyu.data.processing.strategy;
-
-import jakarta.annotation.PostConstruct;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Objects;
-/**
- * 抽象策略路由
- * @Author: 胡杨
- * @Name: abstractStrategyRouter
- * @Description: 抽象策略路由
- * @CreatedDate: 2024/9/28 上午9:26
- * @FilePath: com.muyu.data.processing.strategy
- */
-@Slf4j
-@Component
-public abstract class abstractStrategyRouter<T,R> {
-
-    /**
-     * 策略映射器, 指定入参与出参以决定策略处理者
-     * @param <T>   策略入参
-     * @param <R>   策略出参
-     */
-    public interface StrategyMapper<T,R>{
-        // 通过入参获取对应策略处理方法,使用Map实现
-        StrategyHandler<T,R> getHandler(T param);
-    }
-
-    /**
-     * 选择下级策略
-     * @return
-     */
-    protected abstract StrategyMapper<T,R> registerStrategy();
-
-    /**
-     * 默认策略处理者
-     */
-    @SuppressWarnings("unchecked")
-    private StrategyHandler<T,R> defaultStrategyHandler = StrategyHandler.DEFAULT;
-
-
-    /**
-     * 选择策略处理者
-     * @param param 入参
-     * @return 策略处理结果
-     */
-    public R applyStrategy(T param) {
-        StrategyMapper<T, R> trStrategyMapper = registerStrategy();
-        if (trStrategyMapper == null) {
-            return defaultStrategyHandler.apply(param);
-        }
-        final StrategyHandler<T,R> strategyHandler = trStrategyMapper.getHandler(param);
-        if (strategyHandler != null) {
-            return strategyHandler.apply(param);
-        }
-        // 使用默认策略处理者
-        return defaultStrategyHandler.apply(param);
-    }
-}