diff --git a/README.md b/README.md index d1e62b7..4311957 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Downloads + Downloads Build Status Build Status Coverage Status diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 2c75188..42ed9b0 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 3.4.0 + 3.4.1 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 91184fa..148f8a9 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-common/src/main/java/org/springblade/common/config/BladeCommonConfiguration.java b/blade-common/src/main/java/org/springblade/common/config/BladeCommonConfiguration.java index e8bfb1a..90a25b1 100644 --- 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 { diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 149312c..5be07b0 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java b/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java index 116115e..784e490 100644 --- 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 { diff --git a/blade-gateway/src/main/java/org/springblade/gateway/handler/ErrorExceptionHandler.java b/blade-gateway/src/main/java/org/springblade/gateway/handler/ErrorExceptionHandler.java index ba0978e..9a84773 100644 --- 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 { diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index b9722ec..517fd33 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index cfabc54..a44ece6 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml index ed83049..a684997 100644 --- a/blade-ops/blade-report/pom.xml +++ b/blade-ops/blade-report/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-ops - 3.4.0 + 3.4.1 4.0.0 diff --git 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 index 28171a9..443efa0 100644 --- 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 { diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index d1c85a7..f65af4f 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml index 704518b..eca092b 100644 --- a/blade-ops/blade-seata-order/pom.xml +++ b/blade-ops/blade-seata-order/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml index 1ce3a7a..6907cab 100644 --- a/blade-ops/blade-seata-storage/pom.xml +++ b/blade-ops/blade-seata-storage/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml index 06e96c4..8bda08f 100644 --- a/blade-ops/blade-swagger/pom.xml +++ b/blade-ops/blade-swagger/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index cf0b03b..84a1d63 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 3.4.0 + 3.4.1 4.0.0 blade-ops ${project.artifactId} - 3.4.0 + 3.4.1 pom blade-admin diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index 61934df..b96bec0 100644 --- a/blade-service-api/blade-demo-api/pom.xml +++ b/blade-service-api/blade-demo-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 87167a1..960a53c 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index b866fc8..ebe8293 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-service-api/blade-scope-api/pom.xml b/blade-service-api/blade-scope-api/pom.xml index ea41bdc..689d1e2 100644 --- a/blade-service-api/blade-scope-api/pom.xml +++ b/blade-service-api/blade-scope-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git 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 index 365d5e7..e38ec61 100644 --- 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 { diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index d8b48f1..5c66732 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 2149326..322fa35 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 1bc68b5..585503a 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 3.4.0 + 3.4.1 4.0.0 blade-service-api ${project.artifactId} - 3.4.0 + 3.4.1 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index 424af90..772be98 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git 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 index 1629515..88c9927 100644 --- 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) diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index a6dc240..701cacd 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index cadb222..252497d 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 95c0327..3855938 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 6535415..0d62425 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.4.0 + 3.4.1 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index a383d02..e473646 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade SpringBlade - 3.4.0 + 3.4.1 blade-service ${project.artifactId} - 3.4.0 + 3.4.1 pom SpringBlade 微服务集合 diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 2de72c4..3e8493e 100644 --- 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 diff --git a/pom.xml b/pom.xml index d19e254..cd30ea2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade SpringBlade - 3.4.0 + 3.4.1 pom - 3.4.0 - 3.4.0 + 3.4.1 + 3.4.1 1.8 3.8.1 diff --git a/script/docker/.env b/script/docker/.env index 8a84b9b..0bafe71 100644 --- 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 diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh old mode 100644 new mode 100755 diff --git a/script/fatjar/service.sh b/script/fatjar/service.sh old mode 100644 new mode 100755 diff --git a/script/kuboard/kuboard_spring-blade.yaml b/script/kuboard/kuboard_spring-blade.yaml index c1cc4df..622ac2d 100644 --- 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