diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index ef257af85..3a614bdb1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/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: diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 221749949..6f134c9a4 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -13,6 +13,7 @@ ruoyi-common-bom ruoyi-common-social ruoyi-common-core + ruoyi-common-core-api ruoyi-common-doc ruoyi-common-excel ruoyi-common-idempotent diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index ac9a44baa..a1dd69d16 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -25,6 +25,12 @@ ruoyi-common-core ${revision} + + + org.dromara + ruoyi-common-core-api + ${revision} + diff --git a/ruoyi-common/ruoyi-common-core-api/pom.xml b/ruoyi-common/ruoyi-common-core-api/pom.xml new file mode 100644 index 000000000..059727842 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core-api/pom.xml @@ -0,0 +1,46 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-core-api + + + ruoyi-common-core-api + + + + + org.projectlombok + lombok + compile + + + jakarta.servlet + jakarta.servlet-api + + + + jakarta.validation + jakarta.validation-api + provided + + + org.hibernate.validator + hibernate-validator + provided + + + cn.hutool + hutool-core + provided + + + + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/CacheConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/CacheConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/CacheNames.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/CacheNames.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/Constants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/Constants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/GlobalConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/GlobalConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/HttpStatus.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/HttpStatus.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/RegexConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/RegexConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/TenantConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/TenantConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/UserConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/constant/UserConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessEvent.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessEvent.java index 61c7efc39..6b4ee6421 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java +++ b/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; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessTaskEvent.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessTaskEvent.java index 019ca823b..14a6dedaf 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java +++ b/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; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/R.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/R.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/LoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/LoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/LoginUser.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/LoginUser.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index ad37e90db..2b61544ee 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -93,6 +93,11 @@ org.lionsoul ip2region + + org.dromara + ruoyi-common-core-api + ${revision} + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java index 48dfc08d7..ead368752 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java +++ b/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; } } diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/ruoyi-common/ruoyi-common-excel/pom.xml index 14b9410bb..416a1c125 100644 --- a/ruoyi-common/ruoyi-common-excel/pom.xml +++ b/ruoyi-common/ruoyi-common-excel/pom.xml @@ -20,7 +20,11 @@ org.dromara ruoyi-common-json - + + org.dromara + ruoyi-common-core + provided + com.alibaba easyexcel diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/ruoyi-common/ruoyi-common-idempotent/pom.xml index 64418b42d..d1f6afc12 100644 --- a/ruoyi-common/ruoyi-common-idempotent/pom.xml +++ b/ruoyi-common/ruoyi-common-idempotent/pom.xml @@ -16,6 +16,11 @@ + + org.dromara + ruoyi-common-core + provided + org.dromara ruoyi-common-json diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java index c76c83a98..5231fb144 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java +++ b/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 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 { diff --git a/ruoyi-common/ruoyi-common-sms/pom.xml b/ruoyi-common/ruoyi-common-sms/pom.xml index 932cb9d52..bbd000f09 100644 --- a/ruoyi-common/ruoyi-common-sms/pom.xml +++ b/ruoyi-common/ruoyi-common-sms/pom.xml @@ -26,6 +26,17 @@ org.dromara ruoyi-common-redis + provided + + + org.dromara + ruoyi-common-core-api + provided + + + org.springframework + spring-web + provided diff --git a/ruoyi-common/ruoyi-common-social/pom.xml b/ruoyi-common/ruoyi-common-social/pom.xml index 9f9a965e3..14bc11c9b 100644 --- a/ruoyi-common/ruoyi-common-social/pom.xml +++ b/ruoyi-common/ruoyi-common-social/pom.xml @@ -26,6 +26,12 @@ ruoyi-common-json + + org.dromara + ruoyi-common-core-api + provided + + org.dromara ruoyi-common-redis diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java index b95c19ee8..a585b23a7 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java +++ b/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"); /** * 设定归属域 diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java index 13649f9fd..21512fefa 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java +++ b/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"); /** * 设定归属域 diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java index 9191fca77..85c6621fa 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java +++ b/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 loginAuth(String source, String code, String state, SocialProperties socialProperties) throws AuthException {