From ef5b0176138e4a3f9c55ebae0736cb9b111cf621 Mon Sep 17 00:00:00 2001 From: fxb <190169707@qq.com> Date: Fri, 29 Jan 2021 16:53:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9docker-maven-plugin?= =?UTF-8?q?=E4=B8=BAdockerfile-maven-plugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-auth/pom.xml | 33 +++++++++-------- blade-common/pom.xml | 8 ----- blade-gateway/pom.xml | 36 ++++++++++--------- blade-ops/blade-admin/pom.xml | 33 +++++++++-------- blade-ops/blade-develop/pom.xml | 8 ----- blade-ops/blade-report/pom.xml | 33 +++++++++-------- blade-ops/blade-resource/pom.xml | 33 +++++++++-------- blade-ops/blade-swagger/pom.xml | 33 +++++++++-------- .../src/main/resources/application.yml | 6 ++-- blade-service-api/pom.xml | 8 ----- blade-service/blade-desk/pom.xml | 7 ++++ blade-service/blade-log/pom.xml | 7 ++++ blade-service/blade-system/pom.xml | 9 ++++- blade-service/blade-user/pom.xml | 10 +++++- blade-service/pom.xml | 25 ------------- doc/nacos/blade-test.yaml | 6 ++-- pom.xml | 32 +++++++++++++++-- 17 files changed, 176 insertions(+), 151 deletions(-) diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index d1383194..3c863e99 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -71,22 +71,25 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 90eb813d..60be4ad7 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -38,14 +38,6 @@ ${project.name} - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 2e254eac..2869a6a2 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -98,22 +98,26 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + + false @@ -130,7 +134,7 @@ + file="${project.build.directory}/${artifactId}.jar"/> diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 0ef263de..528958a2 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -54,22 +54,25 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index e0003b09..2696ebbe 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -59,14 +59,6 @@ - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - org.apache.maven.plugins maven-antrun-plugin diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml index 2d9c1b59..d06cba98 100644 --- a/blade-ops/blade-report/pom.xml +++ b/blade-ops/blade-report/pom.xml @@ -38,22 +38,25 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 13c0530d..7f08aac9 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -47,22 +47,25 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml index c20f23cf..50ea10e2 100644 --- a/blade-ops/blade-swagger/pom.xml +++ b/blade-ops/blade-swagger/pom.xml @@ -31,22 +31,25 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin + 1.4.13 + + + default + + build + push + + + - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + false + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + true + ${project.version} + + ${project.build.finalName}.jar + diff --git a/blade-ops/blade-swagger/src/main/resources/application.yml b/blade-ops/blade-swagger/src/main/resources/application.yml index 78296a63..4bf24843 100644 --- a/blade-ops/blade-swagger/src/main/resources/application.yml +++ b/blade-ops/blade-swagger/src/main/resources/application.yml @@ -6,11 +6,11 @@ knife4j: enable: true routes: - name: 授权模块 - uri: 127.0.0.1 + uri: 192.168.1.21:88 location: /blade-auth/v2/api-docs - name: 工作台模块 - uri: 127.0.0.1 + uri: 192.168.1.21:88 location: /blade-desk/v2/api-docs - name: 系统模块 - uri: 127.0.0.1 + uri: 192.168.1.21:88 location: /blade-system/v2/api-docs diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 9fa544d6..3bd343e1 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -67,14 +67,6 @@ ${project.name} - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index af56f941..b79784c0 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -47,6 +47,13 @@ + + com.spotify + dockerfile-maven-plugin + + false + + org.apache.maven.plugins maven-antrun-plugin diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index 13ca12ea..b5862b37 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -25,6 +25,13 @@ + + com.spotify + dockerfile-maven-plugin + + false + + org.apache.maven.plugins maven-antrun-plugin diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index c3d7ac49..b479ee82 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -44,6 +44,13 @@ + + com.spotify + dockerfile-maven-plugin + + false + + org.apache.maven.plugins maven-antrun-plugin @@ -58,7 +65,7 @@ + file="${project.build.directory}/${artifactId}.jar"/> diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 961c31c6..e0e4746b 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -50,6 +50,14 @@ + + com.spotify + dockerfile-maven-plugin + + false + + + org.apache.maven.plugins maven-antrun-plugin @@ -64,7 +72,7 @@ + file="${project.build.directory}/${artifactId}.jar"/> diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 9ffe13fa..c879445b 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -32,29 +32,4 @@ - - - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true - - - - - diff --git a/doc/nacos/blade-test.yaml b/doc/nacos/blade-test.yaml index c428cf64..c163c4b0 100644 --- a/doc/nacos/blade-test.yaml +++ b/doc/nacos/blade-test.yaml @@ -2,7 +2,7 @@ spring: redis: ##redis 单机环境配置 - host: 10.211.55.5 + host: 192.168.1.21 port: 3379 password: database: 0 @@ -17,6 +17,6 @@ blade: #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: test: - url: jdbc:mysql://10.211.55.5:3306/blade?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.240:3306/blade?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8 username: root - password: root + password: 123456 diff --git a/pom.xml b/pom.xml index 926b115d..566ddc0a 100644 --- a/pom.xml +++ b/pom.xml @@ -31,9 +31,11 @@ Cairo-SR8 - 10.211.55.5 - http://${docker.registry.url}:2375 - 1.2.0 + harbor.fxb.com:5000 + blade + 1.4.13 + true + ${project.version} @@ -119,6 +121,30 @@ + + com.spotify + dockerfile-maven-plugin + ${docker.plugin.version} + + + default + + build + push + + + + + + ${docker.repository.url}/${docker.repository.name}/${project.artifactId} + + true + ${project.version} + + ${project.build.finalName}.jar + + + -- Gitee From ae29c7ac5fcd68887ca960a0241d9adc420ddeec Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 31 Jan 2021 23:03:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?:tada:=203.0.1.RELEASE=20=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=80=82=E9=85=8D=20SpringCloud=202020.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- blade-auth/pom.xml | 2 +- blade-common/pom.xml | 2 +- blade-gateway/pom.xml | 2 +- .../org/springblade/gateway/filter/AuthFilter.java | 6 +++--- blade-ops/blade-admin/pom.xml | 2 +- blade-ops/blade-develop/pom.xml | 2 +- blade-ops/blade-report/pom.xml | 2 +- blade-ops/blade-resource/pom.xml | 2 +- blade-ops/blade-seata-order/pom.xml | 2 +- blade-ops/blade-seata-storage/pom.xml | 2 +- blade-ops/blade-swagger/pom.xml | 2 +- blade-ops/pom.xml | 2 +- blade-service-api/blade-demo-api/pom.xml | 2 +- blade-service-api/blade-desk-api/pom.xml | 2 +- blade-service-api/blade-dict-api/pom.xml | 2 +- blade-service-api/blade-system-api/pom.xml | 2 +- blade-service-api/blade-user-api/pom.xml | 2 +- blade-service-api/pom.xml | 4 ++-- blade-service/blade-demo/pom.xml | 2 +- blade-service/blade-desk/pom.xml | 2 +- blade-service/blade-log/pom.xml | 2 +- blade-service/blade-system/pom.xml | 2 +- blade-service/blade-user/pom.xml | 2 +- blade-service/pom.xml | 4 ++-- doc/nacos/blade.yaml | 12 +++++++----- pom.xml | 13 ++++++------- script/docker/.env | 2 +- 28 files changed, 44 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 0b1102b5..ff88481e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@

- Downloads + Downloads Build Status Build Status Coverage Status - Downloads + Downloads Downloads diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 3c863e99..b83eaab2 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 3.0.0 + 3.0.1 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 60be4ad7..9478b624 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 2869a6a2..3bc2ab53 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java b/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java index 47adfaea..4de53bfe 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java @@ -15,12 +15,12 @@ */ package org.springblade.gateway.filter; +import com.alibaba.nacos.common.utils.StringUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.jsonwebtoken.Claims; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springblade.gateway.props.AuthProperties; import org.springblade.gateway.provider.AuthProvider; import org.springblade.gateway.provider.ResponseProvider; @@ -47,8 +47,8 @@ import java.nio.charset.StandardCharsets; @Component @AllArgsConstructor public class AuthFilter implements GlobalFilter, Ordered { - private AuthProperties authProperties; - private ObjectMapper objectMapper; + private final AuthProperties authProperties; + private final ObjectMapper objectMapper; @Override public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 528958a2..ef459671 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 2696ebbe..55789367 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml index d06cba98..7f0f1cc6 100644 --- a/blade-ops/blade-report/pom.xml +++ b/blade-ops/blade-report/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-ops - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 7f08aac9..a07badfc 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml index 70bf7819..21a20c8b 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.0.0 + 3.0.1 4.0.0 diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml index 9475038b..b2f6696e 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.0.0 + 3.0.1 4.0.0 diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml index 50ea10e2..f52689b0 100644 --- a/blade-ops/blade-swagger/pom.xml +++ b/blade-ops/blade-swagger/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 20c9cafe..25c21b39 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index d4d3d249..1492d692 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.0.0 + 3.0.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 fdb3f7a1..80e7d33b 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.0.0 + 3.0.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 aadb4e9b..a32f3731 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.0.0 + 3.0.1 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index b5ad699c..fa14a6fd 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.0.0 + 3.0.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 623018cf..e9bd58ac 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.0.0 + 3.0.1 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 3bd343e1..b39b53f4 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 3.0.0 + 3.0.1 4.0.0 blade-service-api ${project.artifactId} - 3.0.0 + 3.0.1 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index c398d314..f82ae396 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index b79784c0..6c3cf8f8 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index b5862b37..b1857443 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index b479ee82..39b49bc1 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index e0e4746b..cec213d6 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.0.0 + 3.0.1 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index c879445b..d879af86 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade SpringBlade - 3.0.0 + 3.0.1 blade-service ${project.artifactId} - 3.0.0 + 3.0.1 pom SpringBlade 微服务集合 diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 65ac0bb1..2ad85be0 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -1,14 +1,16 @@ #服务器配置 server: undertow: - # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 - io-threads: 4 - # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载 - worker-threads: 20 # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理 buffer-size: 1024 # 是否分配的直接内存 direct-buffers: true + # 线程配置 + threads: + # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 + io: 16 + # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载 + worker: 400 #spring配置 spring: @@ -67,7 +69,7 @@ knife4j: swagger: title: SpringBlade 接口文档系统 description: SpringBlade 接口文档系统 - version: 3.0.0 + version: 3.0.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 566ddc0a..bdbf68c5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,29 +5,28 @@ org.springblade SpringBlade - 3.0.0 + 3.0.1 pom - 3.0.0 - 3.0.0 + 3.0.1 + 3.0.1 1.8 3.8.1 2.10.5 1.6.2 - 2.2.0.RELEASE 2.0.8 1.6.0 1.6.2 2.2.6 1.2.5 - 2.2.3.RELEASE + 2.2.5.RC2 2.3.1 2.0.0.RELEASE - 2.4.1 - 2020.0.0 + 2.4.2 + 2020.0.1 Cairo-SR8 diff --git a/script/docker/.env b/script/docker/.env index fbe046ce..380d2649 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=3.0.0 +TAG=3.0.1 -- Gitee From b8d37dc25a5f4b38343c60dd24d64a6a4629cf28 Mon Sep 17 00:00:00 2001 From: smallchill Date: Mon, 1 Feb 2021 12:37:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?:tada:=203.0.1.RELEASE=20=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=80=82=E9=85=8D=20SpringCloud=202020.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/gateway/GateWayApplication.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java b/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java index 74587082..9d2f66a3 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java @@ -15,9 +15,10 @@ */ package org.springblade.gateway; -import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.launch.BladeApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.scheduling.annotation.EnableScheduling; /** @@ -26,7 +27,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @author Chill */ @EnableScheduling -@SpringCloudApplication +@EnableDiscoveryClient +@SpringBootApplication public class GateWayApplication { public static void main(String[] args) { -- Gitee From 65c281c710b26764f2a6c49057c24d6c7a28ee84 Mon Sep 17 00:00:00 2001 From: smallchill Date: Mon, 22 Feb 2021 22:58:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=94=BE=E8=A1=8C=E6=94=AF=E6=8C=81=E9=80=9A=E9=85=8D?= =?UTF-8?q?=E7=AC=A6=E5=8C=B9=E9=85=8D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gateway/filter/AuthFilter.java | 6 ++- .../gateway/filter/RequestFilter.java | 45 +++++++++++++++++++ .../gateway/provider/AuthProvider.java | 36 +++++++-------- 3 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 blade-gateway/src/main/java/org/springblade/gateway/filter/RequestFilter.java diff --git a/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java b/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java index 4de53bfe..1e29459e 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java @@ -32,6 +32,7 @@ import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.stereotype.Component; +import org.springframework.util.AntPathMatcher; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -49,6 +50,7 @@ import java.nio.charset.StandardCharsets; public class AuthFilter implements GlobalFilter, Ordered { private final AuthProperties authProperties; private final ObjectMapper objectMapper; + private final AntPathMatcher antPathMatcher = new AntPathMatcher(); @Override public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { @@ -72,8 +74,8 @@ public class AuthFilter implements GlobalFilter, Ordered { } private boolean isSkip(String path) { - return AuthProvider.getDefaultSkipUrl().stream().map(url -> url.replace(AuthProvider.TARGET, AuthProvider.REPLACEMENT)).anyMatch(path::contains) - || authProperties.getSkipUrl().stream().map(url -> url.replace(AuthProvider.TARGET, AuthProvider.REPLACEMENT)).anyMatch(path::contains); + return AuthProvider.getDefaultSkipUrl().stream().anyMatch(pattern -> antPathMatcher.match(pattern, path)) + || authProperties.getSkipUrl().stream().anyMatch(pattern -> antPathMatcher.match(pattern, path)); } private Mono unAuth(ServerHttpResponse resp, String msg) { diff --git a/blade-gateway/src/main/java/org/springblade/gateway/filter/RequestFilter.java b/blade-gateway/src/main/java/org/springblade/gateway/filter/RequestFilter.java new file mode 100644 index 00000000..bb66e9df --- /dev/null +++ b/blade-gateway/src/main/java/org/springblade/gateway/filter/RequestFilter.java @@ -0,0 +1,45 @@ +package org.springblade.gateway.filter; + +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.core.Ordered; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +import java.util.Arrays; +import java.util.stream.Collectors; + +import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR; +import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.addOriginalRequestUrl; + +/** + * request过滤器 + * + * @author lengleng + */ +@Component +public class RequestFilter implements GlobalFilter, Ordered { + + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { + ServerHttpRequest request = exchange.getRequest(); + addOriginalRequestUrl(exchange, request.getURI()); + String rawPath = request.getURI().getRawPath(); + String newPath = "/" + Arrays.stream(StringUtils.tokenizeToStringArray(rawPath, "/")) + .skip(1L).collect(Collectors.joining("/")); + ServerHttpRequest newRequest = request.mutate() + .path(newPath) + .build(); + exchange.getAttributes().put(GATEWAY_REQUEST_URL_ATTR, newRequest.getURI()); + return chain.filter(exchange.mutate().request(newRequest.mutate().build()).build()); + } + + @Override + public int getOrder() { + return -1000; + } + +} diff --git a/blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java b/blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java index a107e797..1dc12208 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java @@ -27,34 +27,32 @@ import java.util.List; */ public class AuthProvider { - public static String TARGET = "/**"; - public static String REPLACEMENT = ""; public static String AUTH_KEY = TokenConstant.HEADER; - private static final List defaultSkipUrl = new ArrayList<>(); + private static final List DEFAULT_SKIP_URL = new ArrayList<>(); static { - defaultSkipUrl.add("/example"); - defaultSkipUrl.add("/token/**"); - defaultSkipUrl.add("/captcha/**"); - defaultSkipUrl.add("/actuator/health/**"); - defaultSkipUrl.add("/v2/api-docs/**"); - defaultSkipUrl.add("/auth/**"); - defaultSkipUrl.add("/oauth/**"); - defaultSkipUrl.add("/log/**"); - defaultSkipUrl.add("/menu/routes"); - defaultSkipUrl.add("/menu/auth-routes"); - defaultSkipUrl.add("/tenant/info"); - defaultSkipUrl.add("/order/create/**"); - defaultSkipUrl.add("/storage/deduct/**"); - defaultSkipUrl.add("/error/**"); - defaultSkipUrl.add("/assets/**"); + DEFAULT_SKIP_URL.add("/example"); + DEFAULT_SKIP_URL.add("/token/**"); + DEFAULT_SKIP_URL.add("/captcha/**"); + DEFAULT_SKIP_URL.add("/actuator/health/**"); + DEFAULT_SKIP_URL.add("/v2/api-docs/**"); + DEFAULT_SKIP_URL.add("/auth/**"); + DEFAULT_SKIP_URL.add("/oauth/**"); + DEFAULT_SKIP_URL.add("/log/**"); + DEFAULT_SKIP_URL.add("/menu/routes"); + DEFAULT_SKIP_URL.add("/menu/auth-routes"); + DEFAULT_SKIP_URL.add("/tenant/info"); + DEFAULT_SKIP_URL.add("/order/create/**"); + DEFAULT_SKIP_URL.add("/storage/deduct/**"); + DEFAULT_SKIP_URL.add("/error/**"); + DEFAULT_SKIP_URL.add("/assets/**"); } /** * 默认无需鉴权的API */ public static List getDefaultSkipUrl() { - return defaultSkipUrl; + return DEFAULT_SKIP_URL; } } -- Gitee From b4b2a61707428a916dc60cc5f9dee587d93e8422 Mon Sep 17 00:00:00 2001 From: smallchill Date: Tue, 23 Feb 2021 21:39:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?:tada:=20=E6=96=B0=E5=A2=9E=20https://www.w?= =?UTF-8?q?hnb.wang=20=E6=8F=90=E4=BE=9B=E7=9A=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ff88481e..e1d42c71 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,9 @@ ## 架构图 +## 趋势图 +Stargazers over time + ## 工程结构 ``` SpringBlade -- Gitee