🎉 3.4.1.RELEASE 重构Swagger封装

2022-11-01 23:16:26 +08:00 · 2022-11-01 23:16:26 +08:00 · 6f587fd649
parent e59522a8ea
commit 6f587fd649
37 changed files with 53 additions and 53 deletions
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
 <p align="center">
-      <img src="https://img.shields.io/badge/Release-V3.4.0-green.svg" alt="Downloads">
+      <img src="https://img.shields.io/badge/Release-V3.4.1-green.svg" alt="Downloads">
      <img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status">
  <img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
   <img src="https://img.shields.io/badge/Spring%20Cloud-2021-blue.svg" alt="Coverage Status">
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@ -8,7 +8,7 @@
    <parent>
        <artifactId>SpringBlade</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>

    <artifactId>blade-auth</artifactId>
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>SpringBlade</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-common/src/main/java/org/springblade/common/config/BladeCommonConfiguration.java
+++ b/blade-common/src/main/java/org/springblade/common/config/BladeCommonConfiguration.java
@ -24,7 +24,7 @@ import org.springframework.context.annotation.Configuration;
 *
 * @author Chill
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AllArgsConstructor
 public class BladeCommonConfiguration {

--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>SpringBlade</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java
+++ b/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java
@ -39,7 +39,7 @@ import reactor.core.publisher.Mono;
 * @author Chill
 */
@Slf4j
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AllArgsConstructor
@EnableConfigurationProperties({AuthProperties.class})
 public class RouterFunctionConfiguration {
--- a/blade-gateway/src/main/java/org/springblade/gateway/handler/ErrorExceptionHandler.java
+++ b/blade-gateway/src/main/java/org/springblade/gateway/handler/ErrorExceptionHandler.java
@ -39,7 +39,7 @@ import reactor.core.publisher.Mono;
 * @author Chill
 */
@Order(-1)
-@Configuration
+@Configuration(proxyBeanMethods = false)
@RequiredArgsConstructor
 public class ErrorExceptionHandler implements ErrorWebExceptionHandler {

--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>blade-ops</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-ops/blade-report/pom.xml
+++ b/blade-ops/blade-report/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>blade-ops</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-ops/blade-report/src/main/java/org/springblade/report/config/BladeReportConfiguration.java
+++ b/blade-ops/blade-report/src/main/java/org/springblade/report/config/BladeReportConfiguration.java
@ -27,7 +27,7 @@ import javax.sql.DataSource;
 *
 * @author Chill
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = "report.enabled", havingValue = "true", matchIfMissing = true)
 public class BladeReportConfiguration {

--- a/blade-ops/blade-resource/pom.xml
+++ b/blade-ops/blade-resource/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-seata-order/pom.xml
+++ b/blade-ops/blade-seata-order/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-seata-storage/pom.xml
+++ b/blade-ops/blade-seata-storage/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-swagger/pom.xml
+++ b/blade-ops/blade-swagger/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>SpringBlade</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-ops</artifactId>
    <name>${project.artifactId}</name>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
    <packaging>pom</packaging>
    <modules>
        <module>blade-admin</module>
--- a/blade-service-api/blade-demo-api/pom.xml
+++ b/blade-service-api/blade-demo-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-desk-api/pom.xml
+++ b/blade-service-api/blade-desk-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-dict-api/pom.xml
+++ b/blade-service-api/blade-dict-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-scope-api/pom.xml
+++ b/blade-service-api/blade-scope-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/config/ScopeConfiguration.java
+++ b/blade-service-api/blade-scope-api/src/main/java/org/springblade/system/config/ScopeConfiguration.java
@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
 *
 * @author Chill
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AllArgsConstructor
@AutoConfigureBefore(RegistryConfiguration.class)
 public class ScopeConfiguration {
--- a/blade-service-api/blade-system-api/pom.xml
+++ b/blade-service-api/blade-system-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/blade-user-api/pom.xml
+++ b/blade-service-api/blade-user-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>SpringBlade</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-service-api</artifactId>
    <name>${project.artifactId}</name>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
    <packaging>pom</packaging>
    <description>SpringBlade 微服务API集合</description>

--- a/blade-service/blade-demo/pom.xml
+++ b/blade-service/blade-demo/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service/blade-demo/src/main/java/com/example/demo/config/DemoConfiguration.java
+++ b/blade-service/blade-demo/src/main/java/com/example/demo/config/DemoConfiguration.java
@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration;
 *
 * @author Chill
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@EnableFeignClients({"org.springblade", "com.example"})
@MapperScan({"org.springblade.**.mapper.**", "com.example.**.mapper.**"})
@EnableConfigurationProperties(DemoProperties.class)
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>blade-service</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-service/blade-log/pom.xml
+++ b/blade-service/blade-log/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@ -7,12 +7,12 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>SpringBlade</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
    </parent>

    <artifactId>blade-service</artifactId>
    <name>${project.artifactId}</name>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
    <packaging>pom</packaging>
    <description>SpringBlade 微服务集合</description>

--- a/doc/nacos/blade.yaml
+++ b/doc/nacos/blade.yaml
@ -63,13 +63,13 @@ knife4j:
    language: zh-CN
    enableFooter: false
    enableFooterCustom: true
-    footerCustomContent: Copyright © 2021 SpringBlade All Rights Reserved
+    footerCustomContent: Copyright © 2022 SpringBlade All Rights Reserved

 #swagger配置信息
 swagger:
  title: SpringBlade 接口文档系统
  description: SpringBlade 接口文档系统
-  version: 3.4.0
+  version: 3.4.1
  license: Powered By SpringBlade
  licenseUrl: https://bladex.vip
  terms-of-service-url: https://bladex.vip
--- a/pom.xml
+++ b/pom.xml
@ -5,12 +5,12 @@

    <groupId>org.springblade</groupId>
    <artifactId>SpringBlade</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
    <packaging>pom</packaging>

    <properties>
-        <blade.tool.version>3.4.0</blade.tool.version>
-        <blade.project.version>3.4.0</blade.project.version>
+        <blade.tool.version>3.4.1</blade.tool.version>
+        <blade.project.version>3.4.1</blade.project.version>

        <java.version>1.8</java.version>
        <maven.plugin.version>3.8.1</maven.plugin.version>
--- a/script/docker/.env
+++ b/script/docker/.env
@ -1,2 +1,2 @@
 REGISTER=192.168.0.157/blade
-TAG=3.4.0
+TAG=3.4.1
--- a/script/docker/deploy.sh
+++ b/script/docker/deploy.sh
--- a/script/fatjar/service.sh
+++ b/script/fatjar/service.sh
--- a/script/kuboard/kuboard_spring-blade.yaml
+++ b/script/kuboard/kuboard_spring-blade.yaml
@ -152,7 +152,7 @@ spec:
    spec:
      containers:
        - name: blade-admin
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -386,7 +386,7 @@ spec:
    spec:
      containers:
        - name: blade-auth
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -625,7 +625,7 @@ spec:
    spec:
      containers:
        - name: blade-desk
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -864,7 +864,7 @@ spec:
    spec:
      containers:
        - name: blade-develop
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1096,7 +1096,7 @@ spec:
    spec:
      containers:
        - name: blade-gateway
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1331,7 +1331,7 @@ spec:
    spec:
      containers:
        - name: blade-log
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1565,7 +1565,7 @@ spec:
    spec:
      containers:
        - name: blade-report
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1799,7 +1799,7 @@ spec:
    spec:
      containers:
        - name: blade-resource
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -2033,7 +2033,7 @@ spec:
    spec:
      containers:
        - name: blade-system
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -2267,7 +2267,7 @@ spec:
    spec:
      containers:
        - name: blade-user
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-user:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-user:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -2496,7 +2496,7 @@ spec:
    spec:
      containers:
        - name: saber-web
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:3.4.1'
          ports:
            - name: web
              containerPort: 80
@ -2721,7 +2721,7 @@ spec:
    spec:
      containers:
        - name: blade-swagger
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:3.4.1'
          args:
            - '--spring.profiles.active=${PROFILE}'
            - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -3749,7 +3749,7 @@ spec:
    spec:
      containers:
        - name: mysql
-          image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v3.4.0'
+          image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v3.4.1'
          ports:
            - name: mysql
              containerPort: 3306