|
|
@@ -1,15 +1,11 @@
|
|
1
|
1
|
package com.ruoyi.common.security.annotation;
|
|
2
|
2
|
|
|
3
|
|
-import java.lang.annotation.Documented;
|
|
4
|
|
-import java.lang.annotation.ElementType;
|
|
5
|
|
-import java.lang.annotation.Inherited;
|
|
6
|
|
-import java.lang.annotation.Retention;
|
|
7
|
|
-import java.lang.annotation.RetentionPolicy;
|
|
8
|
|
-import java.lang.annotation.Target;
|
|
|
3
|
+import java.lang.annotation.*;
|
|
9
|
4
|
import org.mybatis.spring.annotation.MapperScan;
|
|
10
|
5
|
import org.springframework.context.annotation.EnableAspectJAutoProxy;
|
|
11
|
6
|
import org.springframework.context.annotation.Import;
|
|
12
|
7
|
import org.springframework.scheduling.annotation.EnableAsync;
|
|
|
8
|
+import com.ruoyi.common.security.feign.OAuth2FeignConfig;
|
|
13
|
9
|
import com.ruoyi.common.security.config.ApplicationConfig;
|
|
14
|
10
|
import com.ruoyi.common.security.config.SecurityImportBeanDefinitionRegistrar;
|
|
15
|
11
|
|
|
|
@@ -24,7 +20,7 @@ import com.ruoyi.common.security.config.SecurityImportBeanDefinitionRegistrar;
|
|
24
|
20
|
// 开启线程异步执行
|
|
25
|
21
|
@EnableAsync
|
|
26
|
22
|
// 自动加载类
|
|
27
|
|
-@Import({ SecurityImportBeanDefinitionRegistrar.class, ApplicationConfig.class })
|
|
|
23
|
+@Import({ SecurityImportBeanDefinitionRegistrar.class, OAuth2FeignConfig.class, ApplicationConfig.class })
|
|
28
|
24
|
public @interface EnableCustomConfig
|
|
29
|
25
|
{
|
|
30
|
26
|
|