diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java index 35f091ef2..853ea7386 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java @@ -14,6 +14,7 @@ import org.springdoc.core.customizers.GlobalOpenApiCustomizer; import org.springdoc.core.filters.GlobalOpenApiMethodFilter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -26,6 +27,7 @@ import java.util.Set; */ @Slf4j @Configuration +@PropertySource("classpath:config/default-spring-doc.properties") public class Swagger3Config implements WebMvcConfigurer { // 定义不需要注入安全要求的路径集合 Set excludedPaths = new HashSet<>(Arrays.asList( diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/resources/config/default-spring-doc.properties b/jeecg-boot/jeecg-boot-base-core/src/main/resources/config/default-spring-doc.properties new file mode 100644 index 000000000..91f214b50 --- /dev/null +++ b/jeecg-boot/jeecg-boot-base-core/src/main/resources/config/default-spring-doc.properties @@ -0,0 +1,2 @@ +springdoc.auto-tag-classes: false +springdoc.packages-to-scan: org.jeecg \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 608a9580c..045658f52 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -306,10 +306,6 @@ logging: level: org.flywaydb: debug org.jeecg.modules.system.mapper: info -# springdoc-openapi项目配置 -springdoc: - auto-tag-classes: false - packages-to-scan: org.jeecg knife4j: #开启增强配置 enable: true diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dm8.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dm8.yml index 2c65a5648..abafede67 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dm8.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dm8.yml @@ -140,10 +140,6 @@ spring: host: 127.0.0.1 port: 6379 password: '' -# springdoc-openapi项目配置 -springdoc: - auto-tag-classes: false - packages-to-scan: org.jeecg #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-kingbase8.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-kingbase8.yml index 4114cf1fc..e6945c051 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-kingbase8.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-kingbase8.yml @@ -154,10 +154,6 @@ spring: host: 127.0.0.1 port: 6379 password: '' -# springdoc-openapi项目配置 -springdoc: - auto-tag-classes: false - packages-to-scan: org.jeecg #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 0d27f89b3..525e86256 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -184,10 +184,6 @@ spring: host: 127.0.0.1 port: 6379 password: '' -# springdoc-openapi项目配置 -springdoc: - auto-tag-classes: false - packages-to-scan: org.jeecg #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml index 095968c46..a07d01af0 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml @@ -184,10 +184,6 @@ spring: host: 192.168.1.188 port: 6379 password: '' -# springdoc-openapi项目配置 -springdoc: - auto-tag-classes: false - packages-to-scan: org.jeecg #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml b/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml index 9841caa38..21d0336f8 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml +++ b/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml @@ -1,11 +1,6 @@ server: port: 7001 -springdoc: - packages-to-exclude: - - org.jeecg.modules.drag - - org.jeecg.modules.online - - org.jeecg.modules.jmreport spring: application: name: jeecg-system