From 724ceb5109790e4af72996ffd258174d305058f7 Mon Sep 17 00:00:00 2001 From: Parker Date: Tue, 2 Feb 2021 10:02:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=20@AutoConfigureAfter=20(?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E5=BA=94=E7=94=A8=E5=9C=A8Spring=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=B8=8D=E5=88=B0=E7=9A=84=E5=9C=B0=E6=96=B9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/autoconfigure/conf/RedisMessageListenerConfig.java | 2 -- .../src/main/java/org/opsli/core/cache/local/CacheUtil.java | 1 - .../src/main/java/org/opsli/core/utils/CaptchaUtil.java | 2 -- .../opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java | 2 -- .../opsli-core/src/main/java/org/opsli/core/utils/JwtUtil.java | 2 -- .../opsli-core/src/main/java/org/opsli/core/utils/MenuUtil.java | 1 - .../opsli-core/src/main/java/org/opsli/core/utils/OrgUtil.java | 2 -- .../src/main/java/org/opsli/core/utils/SearchHisUtil.java | 2 -- .../src/main/java/org/opsli/core/utils/TenantUtil.java | 1 - .../src/main/java/org/opsli/core/utils/UserTokenUtil.java | 2 -- .../opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java | 2 -- 11 files changed, 19 deletions(-) diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/RedisMessageListenerConfig.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/RedisMessageListenerConfig.java index b1216edc..24e65758 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/RedisMessageListenerConfig.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/RedisMessageListenerConfig.java @@ -18,7 +18,6 @@ package org.opsli.core.autoconfigure.conf; import lombok.extern.slf4j.Slf4j; import org.opsli.core.cache.pushsub.receiver.RedisPushSubReceiver; import org.opsli.plugins.redis.conf.RedisPluginConfig; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -37,7 +36,6 @@ import org.springframework.data.redis.listener.adapter.MessageListenerAdapter; **/ @Slf4j @Configuration -@AutoConfigureAfter(RedisPluginConfig.class) @ConditionalOnProperty(name = "spring.redis.pushsub.enable", havingValue = "true") public class RedisMessageListenerConfig { diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/cache/local/CacheUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/cache/local/CacheUtil.java index 9d3f2852..810a9234 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/cache/local/CacheUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/cache/local/CacheUtil.java @@ -59,7 +59,6 @@ import static org.opsli.common.constants.OrderConstants.UTIL_ORDER; @Slf4j @Order(UTIL_ORDER) @Component -@AutoConfigureAfter({RedisPlugin.class , EhCachePlugin.class}) public class CacheUtil { /** 热点数据缓存时间 秒 */ diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/CaptchaUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/CaptchaUtil.java index 0109bc98..392e38c1 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/CaptchaUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/CaptchaUtil.java @@ -23,7 +23,6 @@ import org.opsli.common.utils.Props; import org.opsli.core.msg.TokenMsg; import org.opsli.plugins.redis.RedisPlugin; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Lazy; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @@ -40,7 +39,6 @@ import static org.opsli.common.constants.OrderConstants.UTIL_ORDER; */ @Component @Order(UTIL_ORDER) -@AutoConfigureAfter({RedisPlugin.class}) @Lazy(false) public class CaptchaUtil{ diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java index fab4cd78..8cac4b11 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java @@ -32,7 +32,6 @@ import org.opsli.plugins.redis.RedisLockPlugins; import org.opsli.plugins.redis.RedisPlugin; import org.opsli.plugins.redis.lock.RedisLock; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Lazy; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @@ -53,7 +52,6 @@ import static org.opsli.common.constants.OrderConstants.UTIL_ORDER; @Slf4j @Order(UTIL_ORDER) @Component -@AutoConfigureAfter({RedisPlugin.class , RedisLockPlugins.class, DictDetailApi.class}) @Lazy(false) public class DictUtil { diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/JwtUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/JwtUtil.java index b7b5a12a..dbdb2e36 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/JwtUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/JwtUtil.java @@ -14,7 +14,6 @@ import org.opsli.common.constants.TokenTypeConstants; import org.opsli.common.exception.JwtException; import org.opsli.core.msg.JwtMsg; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Lazy; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import static org.opsli.common.constants.OrderConstants.UTIL_ORDER; @Order(UTIL_ORDER) @Lazy(false) @Component -@AutoConfigureAfter({GlobalProperties.class}) public class JwtUtil { diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/MenuUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/MenuUtil.java index b9f67c0c..2afc03ad 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/MenuUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/MenuUtil.java @@ -43,7 +43,6 @@ import static org.opsli.common.constants.OrderConstants.UTIL_ORDER; @Slf4j @Order(UTIL_ORDER) @Component -@AutoConfigureAfter({RedisPlugin.class , RedisLockPlugins.class, MenuApi.class}) @Lazy(false) public class MenuUtil { diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/OrgUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/OrgUtil.java index 0d24952c..f40531a0 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/OrgUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/OrgUtil.java @@ -26,7 +26,6 @@ import org.opsli.plugins.redis.RedisLockPlugins; import org.opsli.plugins.redis.RedisPlugin; import org.opsli.plugins.redis.lock.RedisLock; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Lazy; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @@ -43,7 +42,6 @@ import static org.opsli.common.constants.OrderConstants.UTIL_ORDER; @Slf4j @Order(UTIL_ORDER) @Component -@AutoConfigureAfter({RedisPlugin.class , RedisLockPlugins.class, UserApi.class}) @Lazy(false) public class OrgUtil { diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/SearchHisUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/SearchHisUtil.java index 1ee8ade3..ec3f824f 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/SearchHisUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/SearchHisUtil.java @@ -24,7 +24,6 @@ import org.opsli.common.utils.Props; import org.opsli.plugins.redis.RedisLockPlugins; import org.opsli.plugins.redis.RedisPlugin; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Lazy; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @@ -45,7 +44,6 @@ import static org.opsli.common.constants.OrderConstants.UTIL_ORDER; @Order(UTIL_ORDER) @Component @Lazy(false) -@AutoConfigureAfter({RedisPlugin.class , RedisLockPlugins.class}) public class SearchHisUtil { diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/TenantUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/TenantUtil.java index eac5268f..3ed17452 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/TenantUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/TenantUtil.java @@ -43,7 +43,6 @@ import static org.opsli.common.constants.OrderConstants.UTIL_ORDER; @Slf4j @Order(UTIL_ORDER) @Component -@AutoConfigureAfter({RedisPlugin.class , RedisLockPlugins.class, TenantApi.class}) @Lazy(false) public class TenantUtil { diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java index f0e88ae7..6f2feec4 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java @@ -36,7 +36,6 @@ import org.opsli.core.autoconfigure.properties.GlobalProperties; import org.opsli.core.msg.TokenMsg; import org.opsli.plugins.redis.RedisPlugin; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Lazy; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @@ -56,7 +55,6 @@ import static org.opsli.common.constants.OrderConstants.UTIL_ORDER; @Slf4j @Order(UTIL_ORDER) @Component -@AutoConfigureAfter({GlobalProperties.class, RedisPlugin.class}) @Lazy(false) public class UserTokenUtil { diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java index 261b27c7..16db86be 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java @@ -36,7 +36,6 @@ import org.opsli.plugins.redis.RedisLockPlugins; import org.opsli.plugins.redis.RedisPlugin; import org.opsli.plugins.redis.lock.RedisLock; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Lazy; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @@ -55,7 +54,6 @@ import static org.opsli.common.constants.OrderConstants.UTIL_ORDER; @Slf4j @Order(UTIL_ORDER) @Component -@AutoConfigureAfter({GlobalProperties.class, RedisPlugin.class , RedisLockPlugins.class, UserApi.class}) @Lazy(false) public class UserUtil {