Przeglądaj źródła

update 移除自定义注解 改为框架统一配置

疯狂的狮子Li 4 lat temu
rodzic
commit
e167ba5539

+ 16 - 0
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 {
+
+}

+ 1 - 0
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
 

+ 0 - 18
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java

@@ -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 {
-
-}

+ 0 - 2
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 {

+ 0 - 2
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 {

+ 0 - 2
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 {