调整

ruoyi-admin/src/main/resources/application.yml

@@ -3,6 +3,9 @@ spring:
     active: ${profiles.active}
   application:
     name: ruoyi-admin
+  config:
+    import:
+      - optional:nacos:${spring.application.name}.yaml
 
 # 开发环境配置
 server:

ruoyi-common/pom.xml

@@ -13,6 +13,7 @@
         <module>ruoyi-common-bom</module>
         <module>ruoyi-common-social</module>
         <module>ruoyi-common-core</module>
+        <module>ruoyi-common-core-api</module>
         <module>ruoyi-common-doc</module>
         <module>ruoyi-common-excel</module>
         <module>ruoyi-common-idempotent</module>

ruoyi-common/ruoyi-common-bom/pom.xml

@@ -25,6 +25,12 @@
                 <artifactId>ruoyi-common-core</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <!-- 核心模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-core-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <!-- 接口模块 -->
             <dependency>

ruoyi-common/ruoyi-common-core-api/pom.xml

@@ -0,0 +1,46 @@
+<?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">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-core-api</artifactId>
+
+    <description>
+        ruoyi-common-core-api
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+<!--            <scope>provided</scope>-->
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>

ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessEvent.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.event;
+package org.dromara.common.core.domain;
 
 import lombok.Data;
 

ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessTaskEvent.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.event;
+package org.dromara.common.core.domain;
 
 import lombok.Data;
 

ruoyi-common/ruoyi-common-core/pom.xml

@@ -93,6 +93,11 @@
             <groupId>org.lionsoul</groupId>
             <artifactId>ip2region</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
     </dependencies>
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java

@@ -2,6 +2,7 @@ package org.dromara.common.core.utils;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.MessageSource;
 import org.springframework.context.NoSuchMessageException;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -12,6 +13,7 @@ import org.springframework.context.i18n.LocaleContextHolder;
  * @author Lion Li
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Slf4j
 public class MessageUtils {
 
     private static final MessageSource MESSAGE_SOURCE = SpringUtils.getBean(MessageSource.class);
@@ -27,6 +29,7 @@ public class MessageUtils {
         try {
             return MESSAGE_SOURCE.getMessage(code, args, LocaleContextHolder.getLocale());
         } catch (NoSuchMessageException e) {
+            log.warn("获取国际化失败，code：{}", code, e);
             return code;
         }
     }

ruoyi-common/ruoyi-common-excel/pom.xml

@@ -20,7 +20,11 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-json</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>

ruoyi-common/ruoyi-common-idempotent/pom.xml

@@ -16,6 +16,11 @@
     </description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-json</artifactId>

ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java

@@ -1,13 +1,13 @@
 package org.dromara.common.sensitive.handler;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.sensitive.annotation.Sensitive;
 import org.dromara.common.sensitive.core.SensitiveService;
 import org.dromara.common.sensitive.core.SensitiveStrategy;
@@ -32,7 +32,7 @@ public class SensitiveHandler extends JsonSerializer<String> implements Contextu
     @Override
     public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
         try {
-            SensitiveService sensitiveService = SpringUtils.getBean(SensitiveService.class);
+            SensitiveService sensitiveService = SpringUtil.getBean(SensitiveService.class);
             if (ObjectUtil.isNotNull(sensitiveService) && sensitiveService.isSensitive(roleKey, perms)) {
                 gen.writeString(strategy.desensitizer().apply(value));
             } else {

ruoyi-common/ruoyi-common-sms/pom.xml

@@ -26,6 +26,17 @@
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-redis</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>

ruoyi-common/ruoyi-common-social/pom.xml

@@ -26,6 +26,12 @@
             <artifactId>ruoyi-common-json</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-redis</artifactId>

ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java

@@ -1,6 +1,7 @@
 package org.dromara.common.social.maxkey;
 
 import cn.hutool.core.lang.Dict;
+import cn.hutool.extra.spring.SpringUtil;
 import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.exception.AuthException;
@@ -8,7 +9,6 @@ import me.zhyd.oauth.model.AuthCallback;
 import me.zhyd.oauth.model.AuthToken;
 import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.AuthDefaultRequest;
-import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.json.utils.JsonUtils;
 
 /**
@@ -16,7 +16,7 @@ import org.dromara.common.json.utils.JsonUtils;
  */
 public class AuthMaxKeyRequest extends AuthDefaultRequest {
 
-    public static final String SERVER_URL = SpringUtils.getProperty("justauth.type.maxkey.server-url");
+    public static final String SERVER_URL = SpringUtil.getProperty("justauth.type.maxkey.server-url");
 
     /**
      * 设定归属域

ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java

@@ -2,6 +2,7 @@ package org.dromara.common.social.topiam;
 
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.xkcoding.http.support.HttpHeader;
 import lombok.extern.slf4j.Slf4j;
 import me.zhyd.oauth.cache.AuthStateCache;
@@ -13,7 +14,6 @@ import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.AuthDefaultRequest;
 import me.zhyd.oauth.utils.HttpUtils;
 import me.zhyd.oauth.utils.UrlBuilder;
-import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.json.utils.JsonUtils;
 
 import static org.dromara.common.social.topiam.AuthTopiamSource.TOPIAM;
@@ -27,7 +27,7 @@ import static org.dromara.common.social.topiam.AuthTopiamSource.TOPIAM;
 @Slf4j
 public class AuthTopIamRequest extends AuthDefaultRequest {
 
-    public static final String SERVER_URL = SpringUtils.getProperty("justauth.type.topiam.server-url");
+    public static final String SERVER_URL = SpringUtil.getProperty("justauth.type.topiam.server-url");
 
     /**
      * 设定归属域

ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java

@@ -1,13 +1,13 @@
 package org.dromara.common.social.utils;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.exception.AuthException;
 import me.zhyd.oauth.model.AuthCallback;
 import me.zhyd.oauth.model.AuthResponse;
 import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.*;
-import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
 import org.dromara.common.social.config.properties.SocialProperties;
 import org.dromara.common.social.maxkey.AuthMaxKeyRequest;
@@ -20,7 +20,7 @@ import org.dromara.common.social.topiam.AuthTopIamRequest;
  */
 public class SocialUtils  {
 
-    private static final AuthRedisStateCache STATE_CACHE = SpringUtils.getBean(AuthRedisStateCache.class);
+    private static final AuthRedisStateCache STATE_CACHE = SpringUtil.getBean(AuthRedisStateCache.class);
 
     @SuppressWarnings("unchecked")
     public static AuthResponse<AuthUser> loginAuth(String source, String code, String state, SocialProperties socialProperties) throws AuthException {