diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 3a76fcff..ce682574 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -81,30 +81,6 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - - - io.springfox - springfox-swagger2 - - - io.swagger - swagger-models - - - - - io.swagger - swagger-models - - - com.github.xiaoymin - knife4j-spring-ui - - 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 385458c6..1e4e2656 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 @@ -18,24 +18,16 @@ package org.springblade.gateway.config; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.gateway.handler.SwaggerResourceHandler; -import org.springblade.gateway.handler.SwaggerSecurityHandler; -import org.springblade.gateway.handler.SwaggerUiHandler; import org.springblade.gateway.props.AuthProperties; -import org.springblade.gateway.props.RouteProperties; 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.MediaType; 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.reactive.function.server.RequestPredicates; -import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.RouterFunctions; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; @@ -49,13 +41,9 @@ import reactor.core.publisher.Mono; @Slf4j @Configuration @AllArgsConstructor -@EnableConfigurationProperties({RouteProperties.class, AuthProperties.class}) +@EnableConfigurationProperties({AuthProperties.class}) public class RouterFunctionConfiguration { - private final SwaggerResourceHandler swaggerResourceHandler; - private final SwaggerSecurityHandler swaggerSecurityHandler; - private final SwaggerUiHandler swaggerUiHandler; - /** * 这里为支持的请求头，如果有自定义的header字段请自己添加 */ @@ -90,14 +78,4 @@ public class RouterFunctionConfiguration { }; } - @Bean - public RouterFunction routerFunction() { - return RouterFunctions.route(RequestPredicates.GET("/swagger-resources") - .and(RequestPredicates.accept(MediaType.ALL)), swaggerResourceHandler) - .andRoute(RequestPredicates.GET("/swagger-resources/configuration/ui") - .and(RequestPredicates.accept(MediaType.ALL)), swaggerUiHandler) - .andRoute(RequestPredicates.GET("/swagger-resources/configuration/security") - .and(RequestPredicates.accept(MediaType.ALL)), swaggerSecurityHandler); - } - } 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 023d21c3..5e5c6df7 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 @@ -84,6 +84,10 @@ public class ErrorExceptionHandler extends DefaultErrorWebExceptionHandler { * @return */ private String buildMessage(ServerRequest request, Throwable ex) { + String uri = request.uri().toString(); + if (uri.endsWith("doc.html")) { + return "[Swagger聚合网关] 已迁移至 [blade-swagger] 服务，请开启 [blade-swagger] 服务并访问 [http://127.0.0.1:18000/doc.html]"; + } StringBuilder message = new StringBuilder("Failed to handle request ["); message.append(request.methodName()); message.append(" "); diff --git a/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerResourceHandler.java b/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerResourceHandler.java deleted file mode 100644 index 5b77f750..00000000 --- a/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerResourceHandler.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ - -package org.springblade.gateway.handler; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.reactive.function.server.HandlerFunction; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; -import springfox.documentation.swagger.web.SwaggerResourcesProvider; - -/** - * SwaggerResourceHandler - * - * @author lengleng - */ -@Slf4j -@Component -@AllArgsConstructor -public class SwaggerResourceHandler implements HandlerFunction { - private final SwaggerResourcesProvider swaggerResources; - - /** - * Handle the given request. - * - * @param request the request to handler - * @return the response - */ - @Override - public Mono handle(ServerRequest request) { - return ServerResponse.status(HttpStatus.OK) - .contentType(MediaType.APPLICATION_JSON) - .body(BodyInserters.fromValue(swaggerResources.get())); - } -} diff --git a/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java b/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java deleted file mode 100644 index e47610c7..00000000 --- a/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ - -package org.springblade.gateway.handler; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.reactive.function.server.HandlerFunction; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; -import springfox.documentation.swagger.web.SecurityConfigurationBuilder; - -/** - * SwaggerSecurityHandler - * - * @author lengleng - */ -@Slf4j -@Component -public class SwaggerSecurityHandler implements HandlerFunction { - - /** - * Handle the given request. - * - * @param request the request to handler - * @return the response - */ - @Override - public Mono handle(ServerRequest request) { - return ServerResponse.status(HttpStatus.OK) - .contentType(MediaType.APPLICATION_JSON) - .body(BodyInserters.fromValue(SecurityConfigurationBuilder.builder().build())); - } -} diff --git a/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java b/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java deleted file mode 100644 index 0683cf1e..00000000 --- a/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ - -package org.springblade.gateway.handler; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.reactive.function.server.HandlerFunction; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; -import springfox.documentation.swagger.web.UiConfigurationBuilder; - -/** - * SwaggerUiHandler - * - * @author lengleng - */ -@Slf4j -@Component -public class SwaggerUiHandler implements HandlerFunction { - - /** - * Handle the given request. - * - * @param request the request to handler - * @return the response - */ - @Override - public Mono handle(ServerRequest request) { - return ServerResponse.status(HttpStatus.OK) - .contentType(MediaType.APPLICATION_JSON) - .body(BodyInserters.fromValue(UiConfigurationBuilder.builder().build())); - } -} diff --git a/blade-gateway/src/main/java/org/springblade/gateway/props/RouteProperties.java b/blade-gateway/src/main/java/org/springblade/gateway/props/RouteProperties.java deleted file mode 100644 index fd039e5c..00000000 --- a/blade-gateway/src/main/java/org/springblade/gateway/props/RouteProperties.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package org.springblade.gateway.props; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.context.config.annotation.RefreshScope; - -import java.util.ArrayList; -import java.util.List; - -/** - * 路由配置类 - * - * @author Chill - */ -@Data -@RefreshScope -@ConfigurationProperties("blade.document") -public class RouteProperties { - - private final List resources = new ArrayList<>(); - -} diff --git a/blade-gateway/src/main/java/org/springblade/gateway/provider/SwaggerProvider.java b/blade-gateway/src/main/java/org/springblade/gateway/provider/SwaggerProvider.java deleted file mode 100644 index c139b450..00000000 --- a/blade-gateway/src/main/java/org/springblade/gateway/provider/SwaggerProvider.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package org.springblade.gateway.provider; - -import lombok.AllArgsConstructor; -import org.springblade.gateway.props.RouteProperties; -import org.springblade.gateway.props.RouteResource; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; -import springfox.documentation.swagger.web.SwaggerResource; -import springfox.documentation.swagger.web.SwaggerResourcesProvider; - -import java.util.ArrayList; -import java.util.List; - -/** - * 聚合接口文档注册 - * - * @author Chill - */ -@Primary -@Component -@AllArgsConstructor -public class SwaggerProvider implements SwaggerResourcesProvider { - private static final String API_URI = "/v2/api-docs"; - - private final RouteProperties routeProperties; - - @Override - public List get() { - List resources = new ArrayList<>(); - List routeResources = routeProperties.getResources(); - routeResources.forEach(routeResource -> resources.add(swaggerResource(routeResource))); - return resources; - } - - private SwaggerResource swaggerResource(RouteResource routeResource) { - SwaggerResource swaggerResource = new SwaggerResource(); - swaggerResource.setName(routeResource.getName()); - swaggerResource.setLocation(routeResource.getLocation().concat(API_URI)); - swaggerResource.setSwaggerVersion(routeResource.getVersion()); - return swaggerResource; - } - -} diff --git a/blade-ops/blade-swagger/Dockerfile b/blade-ops/blade-swagger/Dockerfile new file mode 100644 index 00000000..60566681 --- /dev/null +++ b/blade-ops/blade-swagger/Dockerfile @@ -0,0 +1,15 @@ +FROM adoptopenjdk/openjdk8-openj9:alpine-slim + +MAINTAINER smallchill@163.com + +RUN mkdir -p /blade/swagger + +WORKDIR /blade/swagger + +EXPOSE 18000 + +ADD ./target/blade-swagger.jar ./app.jar + +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] + +CMD ["--spring.profiles.active=test"] diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml new file mode 100644 index 00000000..459842e7 --- /dev/null +++ b/blade-ops/blade-swagger/pom.xml @@ -0,0 +1,56 @@ + + + + blade-ops + org.springblade + 2.7.1.RELEASE + + 4.0.0 + + blade-swagger + ${project.artifactId} + ${bladex.project.version} + jar + + + + org.springblade + blade-common + + + org.springblade + blade-core-cloud + + + com.github.xiaoymin + knife4j-aggregation-spring-boot-starter + + + + + + + com.spotify + dockerfile-maven-plugin + + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + + diff --git a/blade-gateway/src/main/java/org/springblade/gateway/props/RouteResource.java b/blade-ops/blade-swagger/src/main/java/org/springblade/swagger/SwaggerApplication.java similarity index 71% rename from blade-gateway/src/main/java/org/springblade/gateway/props/RouteResource.java rename to blade-ops/blade-swagger/src/main/java/org/springblade/swagger/SwaggerApplication.java index 5f27507a..dcdc6f06 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/props/RouteResource.java +++ b/blade-ops/blade-swagger/src/main/java/org/springblade/swagger/SwaggerApplication.java @@ -14,32 +14,23 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.gateway.props; +package org.springblade.swagger; -import lombok.Data; + +import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.client.SpringCloudApplication; /** - * Swagger聚合文档属性 + * swagger聚合启动器 * * @author Chill */ -@Data -public class RouteResource { - - /** - * 文档名 - */ - private String name; - - /** - * 文档所在服务地址 - */ - private String location; +@SpringCloudApplication +public class SwaggerApplication { - /** - * 文档版本 - */ - private String version = AppConstant.APPLICATION_VERSION; + public static void main(String[] args) { + BladeApplication.run(AppConstant.APPLICATION_SWAGGER_NAME, SwaggerApplication.class, args); + } } diff --git a/blade-ops/blade-swagger/src/main/resources/application-dev.yml b/blade-ops/blade-swagger/src/main/resources/application-dev.yml new file mode 100644 index 00000000..bbb51975 --- /dev/null +++ b/blade-ops/blade-swagger/src/main/resources/application-dev.yml @@ -0,0 +1,12 @@ +knife4j: + cloud: + routes: + - name: 授权模块 + uri: 127.0.0.1 + location: /blade-auth/v2/api-docs + - name: 工作台模块 + uri: 127.0.0.1 + location: /blade-desk/v2/api-docs + - name: 系统模块 + uri: 127.0.0.1 + location: /blade-system/v2/api-docs diff --git a/blade-ops/blade-swagger/src/main/resources/application-prod.yml b/blade-ops/blade-swagger/src/main/resources/application-prod.yml new file mode 100644 index 00000000..e36c05fe --- /dev/null +++ b/blade-ops/blade-swagger/src/main/resources/application-prod.yml @@ -0,0 +1,12 @@ +knife4j: + cloud: + routes: + - name: 授权模块 + uri: 192.168.0.157 + location: /blade-auth/v2/api-docs + - name: 工作台模块 + uri: 192.168.0.157 + location: /blade-desk/v2/api-docs + - name: 系统模块 + uri: 192.168.0.157 + location: /blade-system/v2/api-docs diff --git a/blade-ops/blade-swagger/src/main/resources/application-test.yml b/blade-ops/blade-swagger/src/main/resources/application-test.yml new file mode 100644 index 00000000..e36c05fe --- /dev/null +++ b/blade-ops/blade-swagger/src/main/resources/application-test.yml @@ -0,0 +1,12 @@ +knife4j: + cloud: + routes: + - name: 授权模块 + uri: 192.168.0.157 + location: /blade-auth/v2/api-docs + - name: 工作台模块 + uri: 192.168.0.157 + location: /blade-desk/v2/api-docs + - name: 系统模块 + uri: 192.168.0.157 + location: /blade-system/v2/api-docs diff --git a/blade-ops/blade-swagger/src/main/resources/application.yml b/blade-ops/blade-swagger/src/main/resources/application.yml new file mode 100644 index 00000000..79ad80d2 --- /dev/null +++ b/blade-ops/blade-swagger/src/main/resources/application.yml @@ -0,0 +1,6 @@ +server: + port: 18000 +knife4j: + enableAggregation: true + cloud: + enable: true diff --git a/blade-ops/blade-swagger/src/main/resources/banner.txt b/blade-ops/blade-swagger/src/main/resources/banner.txt new file mode 100644 index 00000000..c0f1066c --- /dev/null +++ b/blade-ops/blade-swagger/src/main/resources/banner.txt @@ -0,0 +1,8 @@ +${AnsiColor.BLUE} ______ _ _ ___ ___ +${AnsiColor.BLUE} | ___ \| | | | \ \ / / +${AnsiColor.BLUE} | |_/ /| | __ _ __| | ___ \ V / +${AnsiColor.BLUE} | ___ \| | / _` | / _` | / _ \ > < +${AnsiColor.BLUE} | |_/ /| || (_| || (_| || __/ / . \ +${AnsiColor.BLUE} \____/ |_| \__,_| \__,_| \___|/__/ \__\ + +${AnsiColor.BLUE}:: BladeX ${blade.service.version} :: ${spring.application.name}:${AnsiColor.RED}${blade.env}${AnsiColor.BLUE} :: Running SpringBoot ${spring-boot.version} :: ${AnsiColor.BRIGHT_BLACK} diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 82457717..c5d51803 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -22,6 +22,7 @@ blade-log blade-report blade-resource + blade-swagger blade-turbine blade-xxljob blade-xxljob-admin diff --git a/doc/nacos/blade-dev.yaml b/doc/nacos/blade-dev.yaml index 331498e3..b629efa2 100644 --- a/doc/nacos/blade-dev.yaml +++ b/doc/nacos/blade-dev.yaml @@ -56,11 +56,3 @@ blade: #url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=bladex #username: bladex #password: bladex - document: - resources: - - name: 授权模块 - location: /blade-auth - - name: 工作台模块 - location: /blade-desk - - name: 系统模块 - location: /blade-system diff --git a/doc/nacos/blade-prod.yaml b/doc/nacos/blade-prod.yaml index 14c9816f..07e52fba 100644 --- a/doc/nacos/blade-prod.yaml +++ b/doc/nacos/blade-prod.yaml @@ -39,11 +39,3 @@ blade: url: jdbc:mysql://192.168.0.157:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: root password: root - document: - resources: - - name: 授权模块 - location: /blade-auth - - name: 工作台模块 - location: /blade-desk - - name: 系统模块 - location: /blade-system diff --git a/doc/nacos/blade-test.yaml b/doc/nacos/blade-test.yaml index 4cb3f0fa..269d7c67 100644 --- a/doc/nacos/blade-test.yaml +++ b/doc/nacos/blade-test.yaml @@ -37,11 +37,3 @@ blade: url: jdbc:mysql://192.168.0.157:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: root password: root - document: - resources: - - name: 授权模块 - location: /blade-auth - - name: 工作台模块 - location: /blade-desk - - name: 系统模块 - location: /blade-system diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 383d39c2..d3291b61 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -88,7 +88,7 @@ knife4j: language: zh-CN enableFooter: false enableFooterCustom: true - footerCustomContent: Copyright © 2020 BladeX All Rights Reserved + footerCustomContent: Copyright © 2021 BladeX All Rights Reserved #swagger公共信息 swagger: diff --git a/script/docker/app/deploy.sh b/script/docker/app/deploy.sh index bada55e4..7c220271 100644 --- a/script/docker/app/deploy.sh +++ b/script/docker/app/deploy.sh @@ -17,6 +17,7 @@ port(){ firewall-cmd --add-port=7003/tcp --permanent firewall-cmd --add-port=9411/tcp --permanent firewall-cmd --add-port=9999/tcp --permanent + firewall-cmd --add-port=18000/tcp --permanent service firewalld restart } @@ -49,7 +50,7 @@ monitor(){ #启动程序模块 modules(){ - docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-report blade-user blade-desk blade-system blade-log blade-flow blade-flow-design blade-resource + docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-swagger blade-report blade-user blade-desk blade-system blade-log blade-flow blade-flow-design blade-resource } #关闭所有模块 diff --git a/script/docker/app/docker-compose.yml b/script/docker/app/docker-compose.yml index 74832a80..2d5c7be8 100644 --- a/script/docker/app/docker-compose.yml +++ b/script/docker/app/docker-compose.yml @@ -95,6 +95,17 @@ services: networks: - blade_net + blade-swagger: + image: "${REGISTER}/blade/blade-swagger:${TAG}" + environment: + - TZ=Asia/Shanghai + ports: + - 18000:18000 + privileged: true + restart: always + networks: + - blade_net + blade-turbine: image: "${REGISTER}/blade/blade-turbine:${TAG}" environment: