From 917ca30b43a2edfb27546cd550899591caed6185 Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 24 Mar 2021 18:54:45 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=203.0.2.RELEASE=20=E6=94=AF=E6=8C=81=20N?= =?UTF-8?q?acos2.0=20=E9=95=BF=E9=93=BE=E6=8E=A5=E7=89=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++- blade-auth/pom.xml | 2 +- blade-common/pom.xml | 2 +- blade-gateway/pom.xml | 19 +++++++- .../config/RouterFunctionConfiguration.java | 45 +++++++++++++++++++ .../gateway/filter/AuthFilter.java | 6 ++- .../gateway/filter/RequestFilter.java | 45 +++++++++++++++++++ .../gateway/provider/AuthProvider.java | 36 +++++++-------- 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 | 4 +- 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/docker/README.md | 2 +- doc/nacos/blade.yaml | 2 +- pom.xml | 13 +++--- script/docker/.env | 2 +- script/docker/deploy.sh | 2 + script/docker/docker-compose.yml | 30 +++++++------ 34 files changed, 188 insertions(+), 71 deletions(-) create mode 100644 blade-gateway/src/main/java/org/springblade/gateway/filter/RequestFilter.java diff --git a/README.md b/README.md index ff88481..7f4e9cd 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@

- Downloads + Downloads Build Status Build Status Coverage Status - Downloads + Downloads Downloads @@ -28,6 +28,9 @@ ## 架构图 +## 趋势图 +Stargazers over time + ## 工程结构 ``` SpringBlade diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 1f6d59f..d6fd574 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 3.0.1 + 3.0.2 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 79dda3c..0288d29 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 3.0.1 + 3.0.2 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 3b481f1..f72aaa7 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 3.0.1 + 3.0.2 4.0.0 @@ -74,13 +74,30 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.nacos + nacos-client + + ${alibaba.cloud.version} com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + + com.alibaba.nacos + nacos-client + + ${alibaba.cloud.version} + + com.alibaba.nacos + nacos-client + ${alibaba.nacos.version} + io.jsonwebtoken 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 53a2b39..116115e 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 @@ -20,7 +20,18 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.gateway.props.AuthProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.web.cors.reactive.CorsUtils; +import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebFilter; +import org.springframework.web.server.WebFilterChain; +import reactor.core.publisher.Mono; /** * 路由配置信息 @@ -33,4 +44,38 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties({AuthProperties.class}) public class RouterFunctionConfiguration { + /** + * 这里为支持的请求头，如果有自定义的header字段请自己添加 + */ + private static final String ALLOWED_HEADERS = "X-Requested-With, Tenant-Id, Blade-Auth, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, username, client, knfie4j-gateway-request, request-origion"; + private static final String ALLOWED_METHODS = "GET,POST,PUT,DELETE,OPTIONS,HEAD"; + private static final String ALLOWED_ORIGIN = "*"; + private static final String ALLOWED_EXPOSE = "*"; + private static final String MAX_AGE = "18000L"; + + /** + * 跨域配置 + */ + @Bean + public WebFilter corsFilter() { + return (ServerWebExchange ctx, WebFilterChain chain) -> { + ServerHttpRequest request = ctx.getRequest(); + if (CorsUtils.isCorsRequest(request)) { + ServerHttpResponse response = ctx.getResponse(); + HttpHeaders headers = response.getHeaders(); + headers.add("Access-Control-Allow-Headers", ALLOWED_HEADERS); + headers.add("Access-Control-Allow-Methods", ALLOWED_METHODS); + headers.add("Access-Control-Allow-Origin", ALLOWED_ORIGIN); + headers.add("Access-Control-Expose-Headers", ALLOWED_EXPOSE); + headers.add("Access-Control-Max-Age", MAX_AGE); + headers.add("Access-Control-Allow-Credentials", "true"); + if (request.getMethod() == HttpMethod.OPTIONS) { + response.setStatusCode(HttpStatus.OK); + return Mono.empty(); + } + } + return chain.filter(ctx); + }; + } + } 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 4de53bf..1e29459 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 0000000..bb66e9d --- /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 a107e79..1dc1220 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; } } diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 03113ae..0893814 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.1 + 3.0.2 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index b9a752a..ccc7aec 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.1 + 3.0.2 4.0.0 diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml index 018a22f..f6d3881 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.1 + 3.0.2 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index db4d541..326fa29 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.1 + 3.0.2 4.0.0 diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml index 21a20c8..a857619 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.1 + 3.0.2 4.0.0 diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml index b2f6696..ddf1756 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.1 + 3.0.2 4.0.0 diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml index 71dcad3..31c69a2 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.1 + 3.0.2 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 25c21b3..a5d0e9c 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,11 +5,13 @@ SpringBlade org.springblade - 3.0.1 + 3.0.2 4.0.0 blade-ops + ${project.artifactId} + 3.0.2 pom blade-admin diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index 1492d69..088847f 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.1 + 3.0.2 4.0.0 diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 80e7d33..bef3490 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.1 + 3.0.2 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index a32f373..65801d6 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.1 + 3.0.2 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index fa14a6f..9b6db53 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.1 + 3.0.2 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index e9bd58a..ae7e271 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.1 + 3.0.2 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index d910c51..9d41f03 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 3.0.1 + 3.0.2 4.0.0 blade-service-api ${project.artifactId} - 3.0.1 + 3.0.2 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index f82ae39..fbb74ca 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.1 + 3.0.2 4.0.0 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 50f5bde..b28aed1 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.1 + 3.0.2 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index cb03b4a..47fe834 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.1 + 3.0.2 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 35f0799..d5f5f74 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.1 + 3.0.2 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 9f4c17c..ac807e7 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.1 + 3.0.2 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 37f1008..f73efaa 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade SpringBlade - 3.0.1 + 3.0.2 blade-service ${project.artifactId} - 3.0.1 + 3.0.2 pom SpringBlade 微服务集合 diff --git a/doc/docker/README.md b/doc/docker/README.md index 6a058fd..c37106f 100644 --- a/doc/docker/README.md +++ b/doc/docker/README.md @@ -86,7 +86,7 @@ CMD java -Djava.security.egd=file:/dev/./urandom -jar app.jar --spring.profiles. ###5. 在工程根目录的docker-compose.yml下加入配置，内容可参考如下 ``` blade-gateway: - image: "${REGISTER}/blade/blade-gateway:${TAG}" + image: "${REGISTER}/blade-gateway:${TAG}" ports: - 80:80 networks: diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 2ad85be..49a519f 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -69,7 +69,7 @@ knife4j: swagger: title: SpringBlade 接口文档系统 description: SpringBlade 接口文档系统 - version: 3.0.1 + version: 3.0.2 license: Powered By SpringBlade licenseUrl: https://bladex.vip terms-of-service-url: https://bladex.vip diff --git a/pom.xml b/pom.xml index 11bd881..1c7bd1b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade SpringBlade - 3.0.1 + 3.0.2 pom - 3.0.1 - 3.0.1 + 3.0.2 + 3.0.2 1.8 3.8.1 @@ -21,12 +21,13 @@ 1.6.2 2.2.6 1.2.5 - 2.2.5.RC2 + 2.2.5.RELEASE + 2.0.0 2.3.1 2.0.0.RELEASE - 2.4.2 - 2020.0.1 + 2.4.4 + 2020.0.2 Cairo-SR8 diff --git a/script/docker/.env b/script/docker/.env index 380d264..134ce76 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=3.0.1 +TAG=3.0.2 diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh index a322250..9d28e2f 100644 --- a/script/docker/deploy.sh +++ b/script/docker/deploy.sh @@ -10,6 +10,8 @@ port(){ firewall-cmd --add-port=88/tcp --permanent firewall-cmd --add-port=8000/tcp --permanent firewall-cmd --add-port=8848/tcp --permanent + firewall-cmd --add-port=9848/tcp --permanent + firewall-cmd --add-port=9849/tcp --permanent firewall-cmd --add-port=8858/tcp --permanent firewall-cmd --add-port=3306/tcp --permanent firewall-cmd --add-port=3379/tcp --permanent diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 31d7856..f039053 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: nacos: - image: nacos/nacos-server:1.3.2 + image: nacos/nacos-server:2.0.0 hostname: "nacos-standalone" environment: - MODE=standalone @@ -10,12 +10,14 @@ services: - /docker/nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties ports: - 8848:8848 + - 9848:9848 + - 9849:9849 networks: blade_net: ipv4_address: 172.30.0.48 sentinel: - image: bladex/sentinel-dashboard:1.7.2 + image: bladex/sentinel-dashboard:1.8.0 hostname: "sentinel" ports: - 8858:8858 @@ -63,7 +65,7 @@ services: - blade_net blade-admin: - image: "${REGISTER}/blade/blade-admin:${TAG}" + image: "${REGISTER}/blade-admin:${TAG}" ports: - 7002:7002 privileged: true @@ -72,7 +74,7 @@ services: - blade_net blade-swagger: - image: "${REGISTER}/blade/blade-swagger:${TAG}" + image: "${REGISTER}/blade-swagger:${TAG}" ports: - 18000:18000 privileged: true @@ -81,7 +83,7 @@ services: - blade_net blade-gateway1: - image: "${REGISTER}/blade/blade-gateway:${TAG}" + image: "${REGISTER}/blade-gateway:${TAG}" privileged: true restart: always networks: @@ -89,7 +91,7 @@ services: ipv4_address: 172.30.0.81 blade-gateway2: - image: "${REGISTER}/blade/blade-gateway:${TAG}" + image: "${REGISTER}/blade-gateway:${TAG}" privileged: true restart: always networks: @@ -97,7 +99,7 @@ services: ipv4_address: 172.30.0.82 blade-auth1: - image: "${REGISTER}/blade/blade-auth:${TAG}" + image: "${REGISTER}/blade-auth:${TAG}" privileged: true restart: always networks: @@ -105,7 +107,7 @@ services: ipv4_address: 172.30.0.91 blade-auth2: - image: "${REGISTER}/blade/blade-auth:${TAG}" + image: "${REGISTER}/blade-auth:${TAG}" privileged: true restart: always networks: @@ -113,7 +115,7 @@ services: ipv4_address: 172.30.0.92 blade-report: - image: "${REGISTER}/blade/blade-report:${TAG}" + image: "${REGISTER}/blade-report:${TAG}" privileged: true restart: always networks: @@ -121,35 +123,35 @@ services: ipv4_address: 172.30.0.98 blade-log: - image: "${REGISTER}/blade/blade-log:${TAG}" + image: "${REGISTER}/blade-log:${TAG}" privileged: true restart: always networks: - blade_net blade-desk: - image: "${REGISTER}/blade/blade-desk:${TAG}" + image: "${REGISTER}/blade-desk:${TAG}" privileged: true restart: always networks: - blade_net blade-user: - image: "${REGISTER}/blade/blade-user:${TAG}" + image: "${REGISTER}/blade-user:${TAG}" privileged: true restart: always networks: - blade_net blade-system: - image: "${REGISTER}/blade/blade-system:${TAG}" + image: "${REGISTER}/blade-system:${TAG}" privileged: true restart: always networks: - blade_net blade-resource: - image: "${REGISTER}/blade/blade-resource:${TAG}" + image: "${REGISTER}/blade-resource:${TAG}" privileged: true restart: always networks: