Просмотр исходного кода

修复注释 @EnableCustomSwagger2 后,项目启动失败

Signed-off-by: Gelis <806938079@qq.com>
Gelis лет назад: 3
Родитель
Сommit
1eeed86b65

+ 2 - 8
ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java

@@ -26,8 +26,9 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
26 26
 
27 27
 @Configuration
28 28
 @EnableSwagger2
29
-@EnableAutoConfiguration
29
+@EnableConfigurationProperties(SwaggerProperties.class)
30 30
 @ConditionalOnProperty(name = "swagger.enabled", matchIfMissing = true)
31
+@Import({SwaggerBeanPostProcessor.class, SwaggerWebConfiguration.class})
31 32
 public class SwaggerAutoConfiguration
32 33
 {
33 34
     /**
@@ -38,13 +39,6 @@ public class SwaggerAutoConfiguration
38 39
     private static final String BASE_PATH = "/**";
39 40
 
40 41
     @Bean
41
-    @ConditionalOnMissingBean
42
-    public SwaggerProperties swaggerProperties()
43
-    {
44
-        return new SwaggerProperties();
45
-    }
46
-
47
-    @Bean
48 42
     public Docket api(SwaggerProperties swaggerProperties)
49 43
     {
50 44
         // base-path处理

+ 0 - 1
ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java

@@ -16,7 +16,6 @@ import java.util.stream.Collectors;
16 16
  *
17 17
  * @author ruoyi
18 18
  */
19
-@Component
20 19
 public class SwaggerBeanPostProcessor implements BeanPostProcessor
21 20
 {
22 21
     @Override

+ 0 - 1
ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java

@@ -5,7 +5,6 @@ import java.util.List;
5 5
 import org.springframework.boot.context.properties.ConfigurationProperties;
6 6
 import org.springframework.stereotype.Component;
7 7
 
8
-@Component
9 8
 @ConfigurationProperties("swagger")
10 9
 public class SwaggerProperties
11 10
 {

+ 0 - 1
ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java

@@ -9,7 +9,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
9 9
  * 
10 10
  * @author ruoyi
11 11
  */
12
-@Configuration
13 12
 public class SwaggerWebConfiguration implements WebMvcConfigurer
14 13
 {
15 14
     @Override

+ 3 - 3
ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,3 @@
1
-com.ruoyi.common.swagger.config.SwaggerAutoConfiguration
2
-com.ruoyi.common.swagger.config.SwaggerWebConfiguration
3
-com.ruoyi.common.swagger.config.SwaggerBeanPostProcessor
1
+# com.ruoyi.common.swagger.config.SwaggerAutoConfiguration
2
+# com.ruoyi.common.swagger.config.SwaggerWebConfiguration
3
+# com.ruoyi.common.swagger.config.SwaggerBeanPostProcessor