From e167ba55391a7e2885b0c85bc1ebfd9f9d067f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Sun, 27 Feb 2022 22:58:56 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=A7=BB=E9=99=A4=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=B3=A8=E8=A7=A3=20=E6=94=B9=E4=B8=BA=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E7=BB=9F=E4=B8=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/config/ApplicationConfig.java | 16 ++++++++++++++++ .../main/resources/META-INF/spring.factories | 1 + .../annotation/EnableCustomConfig.java | 18 ------------------ .../com/ruoyi/gen/RuoYiGenApplication.java | 2 -- .../com/ruoyi/job/RuoYiJobApplication.java | 2 -- .../ruoyi/system/RuoYiSystemApplication.java | 2 -- 6 files changed, 17 insertions(+), 24 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java delete mode 100644 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java new file mode 100644 index 00000000..7dedbb98 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java @@ -0,0 +1,16 @@ +package com.ruoyi.common.core.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.EnableAspectJAutoProxy; + +/** + * 程序注解配置 + * + * @author Lion Li + */ +@Configuration +// 表示通过aop框架暴露该代理对象,AopContext能够访问 +@EnableAspectJAutoProxy(exposeProxy = true) +public class ApplicationConfig { + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories index f5e2a73f..2cceb286 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories +++ b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring.factories @@ -1,5 +1,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.ruoyi.common.core.utils.SpringUtils,\ + com.ruoyi.common.core.config.ApplicationConfig,\ com.ruoyi.common.core.config.JacksonConfig,\ com.ruoyi.common.core.config.ValidatorConfig diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java deleted file mode 100644 index 21ba351b..00000000 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi.common.security.annotation; - -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.scheduling.annotation.EnableAsync; - -import java.lang.annotation.*; - -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Inherited -// 表示通过aop框架暴露该代理对象,AopContext能够访问 -@EnableAspectJAutoProxy(exposeProxy = true) -// 开启线程异步执行 -@EnableAsync -public @interface EnableCustomConfig { - -} diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java index db874097..d8001862 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java @@ -1,6 +1,5 @@ package com.ruoyi.gen; -import com.ruoyi.common.security.annotation.EnableCustomConfig; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -10,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * * @author ruoyi */ -@EnableCustomConfig @EnableDubbo @SpringBootApplication public class RuoYiGenApplication { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java index 9b365160..80fa9ef2 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java @@ -1,6 +1,5 @@ package com.ruoyi.job; -import com.ruoyi.common.security.annotation.EnableCustomConfig; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -10,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * * @author Lion Li */ -@EnableCustomConfig @EnableDubbo @SpringBootApplication public class RuoYiJobApplication { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java index d83855e6..2d1eaa48 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java @@ -1,6 +1,5 @@ package com.ruoyi.system; -import com.ruoyi.common.security.annotation.EnableCustomConfig; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -10,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * * @author ruoyi */ -@EnableCustomConfig @EnableDubbo @SpringBootApplication public class RuoYiSystemApplication {