diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index bf4f7654..37704b17 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ BladeX org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE blade-auth diff --git a/blade-auth/src/main/java/org/springblade/auth/config/BladeResourceServerConfiguration.java b/blade-auth/src/main/java/org/springblade/auth/config/BladeResourceServerConfiguration.java index 00218d13..859261d4 100644 --- a/blade-auth/src/main/java/org/springblade/auth/config/BladeResourceServerConfiguration.java +++ b/blade-auth/src/main/java/org/springblade/auth/config/BladeResourceServerConfiguration.java @@ -58,8 +58,7 @@ public class BladeResourceServerConfiguration extends ResourceServerConfigurerAd "/oauth/refresh/**", "/token/**", "/mobile/**", - "/v2/api-docs", - "/v2/api-docs-ext").permitAll() + "/v2/api-docs").permitAll() .anyRequest().authenticated().and() .csrf().disable(); } diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 83db2f5c..33c43c26 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index f77f2ccc..74f641cc 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 @@ -48,6 +48,10 @@ org.springblade blade-starter-jwt + + com.alibaba + fastjson + org.springframework.cloud 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 282ab0c7..023d21c3 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 @@ -23,7 +23,6 @@ import org.springframework.boot.autoconfigure.web.reactive.error.DefaultErrorWeb import org.springframework.boot.web.reactive.error.ErrorAttributes; import org.springframework.cloud.gateway.support.NotFoundException; import org.springframework.context.ApplicationContext; -import org.springframework.http.HttpStatus; import org.springframework.web.reactive.function.server.*; import org.springframework.web.server.ResponseStatusException; @@ -73,9 +72,8 @@ public class ErrorExceptionHandler extends DefaultErrorWebExceptionHandler { * @param errorAttributes */ @Override - protected HttpStatus getHttpStatus(Map errorAttributes) { - int statusCode = (int) errorAttributes.get("code"); - return HttpStatus.valueOf(statusCode); + protected int getHttpStatus(Map errorAttributes) { + return (int) errorAttributes.get("code"); } /** 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 index 21b95698..5b77f750 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerResourceHandler.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerResourceHandler.java @@ -49,7 +49,7 @@ public class SwaggerResourceHandler implements HandlerFunction { @Override public Mono handle(ServerRequest request) { return ServerResponse.status(HttpStatus.OK) - .contentType(MediaType.APPLICATION_JSON_UTF8) - .body(BodyInserters.fromObject(swaggerResources.get())); + .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 index 72c97093..e47610c7 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java @@ -46,7 +46,7 @@ public class SwaggerSecurityHandler implements HandlerFunction { @Override public Mono handle(ServerRequest request) { return ServerResponse.status(HttpStatus.OK) - .contentType(MediaType.APPLICATION_JSON_UTF8) - .body(BodyInserters.fromObject(SecurityConfigurationBuilder.builder().build())); + .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 index 5e928ca7..0683cf1e 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java @@ -46,7 +46,7 @@ public class SwaggerUiHandler implements HandlerFunction { @Override public Mono handle(ServerRequest request) { return ServerResponse.status(HttpStatus.OK) - .contentType(MediaType.APPLICATION_JSON_UTF8) - .body(BodyInserters.fromObject(UiConfigurationBuilder.builder().build())); + .contentType(MediaType.APPLICATION_JSON) + .body(BodyInserters.fromValue(UiConfigurationBuilder.builder().build())); } } 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 44c7f1c2..44485372 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 @@ -46,7 +46,6 @@ public class AuthProvider { DEFAULT_SKIP_URL.add("/token/**"); DEFAULT_SKIP_URL.add("/actuator/health/**"); DEFAULT_SKIP_URL.add("/v2/api-docs/**"); - DEFAULT_SKIP_URL.add("/v2/api-docs-ext/**"); DEFAULT_SKIP_URL.add("/auth/**"); DEFAULT_SKIP_URL.add("/log/**"); DEFAULT_SKIP_URL.add("/menu/routes"); 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 index 68100fd4..c139b450 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/provider/SwaggerProvider.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/provider/SwaggerProvider.java @@ -36,7 +36,7 @@ import java.util.List; @Component @AllArgsConstructor public class SwaggerProvider implements SwaggerResourcesProvider { - private static final String API_URI = "/v2/api-docs-ext"; + private static final String API_URI = "/v2/api-docs"; private final RouteProperties routeProperties; diff --git a/blade-gateway/src/main/resources/bootstrap.yml b/blade-gateway/src/main/resources/bootstrap.yml index 5c9f4fd5..4f77e443 100644 --- a/blade-gateway/src/main/resources/bootstrap.yml +++ b/blade-gateway/src/main/resources/bootstrap.yml @@ -3,6 +3,9 @@ server: spring: cloud: + discovery: + reactive: + enabled: false gateway: discovery: locator: diff --git a/blade-ops-api/blade-flow-api/pom.xml b/blade-ops-api/blade-flow-api/pom.xml index a3f4577a..40bb7f8e 100644 --- a/blade-ops-api/blade-flow-api/pom.xml +++ b/blade-ops-api/blade-flow-api/pom.xml @@ -5,7 +5,7 @@ blade-ops-api org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-ops-api/blade-resource-api/pom.xml b/blade-ops-api/blade-resource-api/pom.xml index c8b2d9f6..349cd925 100644 --- a/blade-ops-api/blade-resource-api/pom.xml +++ b/blade-ops-api/blade-resource-api/pom.xml @@ -5,7 +5,7 @@ blade-ops-api org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml index e13943b9..01ff2aed 100644 --- a/blade-ops-api/pom.xml +++ b/blade-ops-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 blade-ops-api ${project.artifactId} - 2.6.1.RELEASE + 2.7.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 7dec9518..d75ef77d 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 @@ -20,14 +20,6 @@ org.springblade blade-common - - org.springblade - blade-core-launch - - - org.springblade - blade-core-tool - org.springblade blade-core-cloud diff --git a/blade-ops/blade-admin/src/main/java/org/springblade/admin/config/AdminConfiguration.java b/blade-ops/blade-admin/src/main/java/org/springblade/admin/config/AdminConfiguration.java index 23c16910..d04c49ab 100644 --- a/blade-ops/blade-admin/src/main/java/org/springblade/admin/config/AdminConfiguration.java +++ b/blade-ops/blade-admin/src/main/java/org/springblade/admin/config/AdminConfiguration.java @@ -16,8 +16,6 @@ */ package org.springblade.admin.config; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.cloud.nacos.discovery.NacosWatch; import de.codecentric.boot.admin.server.domain.entities.InstanceRepository; import org.springblade.admin.notifier.CustomNotifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -33,13 +31,6 @@ import org.springframework.context.annotation.Configuration; @Configuration public class AdminConfiguration { - @Bean - @ConditionalOnMissingBean - @ConditionalOnProperty(value = "spring.cloud.nacos.discovery.watch.enabled", matchIfMissing = true) - public NacosWatch nacosWatch(NacosDiscoveryProperties nacosDiscoveryProperties) { - return new NacosWatch(nacosDiscoveryProperties); - } - @Bean @ConditionalOnMissingBean @ConditionalOnProperty(value = "spring.boot.admin.notify.dingtalk.enabled", havingValue = "true") diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index e7955034..578c19e5 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow-design/pom.xml b/blade-ops/blade-flow-design/pom.xml index 45776a37..241d6e37 100644 --- a/blade-ops/blade-flow-design/pom.xml +++ b/blade-ops/blade-flow-design/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index c9ccb517..243fb5ef 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml index ca2305e4..079d25fd 100644 --- a/blade-ops/blade-log/pom.xml +++ b/blade-ops/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml index d0224795..c160517b 100644 --- a/blade-ops/blade-report/pom.xml +++ b/blade-ops/blade-report/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 @@ -24,6 +24,10 @@ org.springblade blade-core-boot + + org.springblade + blade-starter-tenant + org.springblade blade-starter-report diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 70cbbeb2..0561c04a 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-turbine/pom.xml b/blade-ops/blade-turbine/pom.xml index 106ef87f..621e905a 100644 --- a/blade-ops/blade-turbine/pom.xml +++ b/blade-ops/blade-turbine/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob-admin/pom.xml b/blade-ops/blade-xxljob-admin/pom.xml index a7f82834..8c3a0f8b 100644 --- a/blade-ops/blade-xxljob-admin/pom.xml +++ b/blade-ops/blade-xxljob-admin/pom.xml @@ -3,7 +3,7 @@ blade-ops org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob/pom.xml b/blade-ops/blade-xxljob/pom.xml index d69da1d8..187d80cb 100644 --- a/blade-ops/blade-xxljob/pom.xml +++ b/blade-ops/blade-xxljob/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 blade-xxljob diff --git a/blade-ops/blade-zipkin/Dockerfile b/blade-ops/blade-zipkin/Dockerfile deleted file mode 100644 index ad42446b..00000000 --- a/blade-ops/blade-zipkin/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim - -MAINTAINER smallchill@163.com - -RUN mkdir -p /blade/zipkin - -WORKDIR /blade/zipkin - -EXPOSE 9411 - -ADD ./target/blade-zipkin.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-zipkin/pom.xml b/blade-ops/blade-zipkin/pom.xml deleted file mode 100644 index 022b708a..00000000 --- a/blade-ops/blade-zipkin/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - blade-ops - org.springblade - 2.6.1.RELEASE - - 4.0.0 - - blade-zipkin - ${project.artifactId} - ${bladex.project.version} - jar - - - - - org.springblade - blade-common - - - org.springblade - blade-core-launch - - - org.springblade - blade-core-tool - - - org.springblade - blade-core-cloud - - - - io.zipkin.java - zipkin-server - 2.12.3 - - - log4j-slf4j-impl - org.apache.logging.log4j - - - - - io.zipkin.java - zipkin-autoconfigure-ui - 2.12.3 - - - - - - - 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-ops/blade-zipkin/src/main/java/org/springblade/zipkin/ZipkinApplication.java b/blade-ops/blade-zipkin/src/main/java/org/springblade/zipkin/ZipkinApplication.java deleted file mode 100644 index 8c8e0ae6..00000000 --- a/blade-ops/blade-zipkin/src/main/java/org/springblade/zipkin/ZipkinApplication.java +++ /dev/null @@ -1,37 +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.zipkin; - -import org.springblade.core.launch.BladeApplication; -import org.springblade.core.launch.constant.AppConstant; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import zipkin2.server.internal.EnableZipkinServer; - -/** - * Zipkin启动器 - * - * @author Chill - */ -@EnableZipkinServer -@SpringBootApplication -public class ZipkinApplication { - - public static void main(String[] args) { - BladeApplication.run(AppConstant.APPLICATION_ZIPKIN_NAME, ZipkinApplication.class, args); - } - -} diff --git a/blade-ops/blade-zipkin/src/main/resources/bootstrap.yml b/blade-ops/blade-zipkin/src/main/resources/bootstrap.yml deleted file mode 100644 index b5fe10d1..00000000 --- a/blade-ops/blade-zipkin/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,18 +0,0 @@ -server: - port: 9411 - undertow: - # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 - io-threads: 4 - # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载 - worker-threads: 20 - # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理 - buffer-size: 1024 - # 是否分配的直接内存 - direct-buffers: true - -#zipkin启动报错无法访问的解决方法 -management: - metrics: - web: - server: - auto-time-requests: false diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 8e7ee8d3..56bfffb4 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 blade-ops ${project.artifactId} - 2.6.1.RELEASE + 2.7.0.RELEASE pom @@ -23,7 +23,6 @@ blade-report blade-resource blade-turbine - blade-zipkin blade-xxljob blade-xxljob-admin diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 1a1993d9..1182e3f4 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 - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index a269a8c3..4cacda36 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 - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-scope-api/pom.xml b/blade-service-api/blade-scope-api/pom.xml index 45005cfb..c28adccd 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 - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index 430bf49e..7694e843 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 - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 5b163ea9..26d62f44 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 - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index aa6c39ae..aa183e6d 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 2.6.1.RELEASE + 2.7.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index e23b6666..fb0eb2c2 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index cf78358f..542947c8 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 2f755b16..877594d3 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 39dd805e..cf935796 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -6,14 +6,14 @@ org.springblade BladeX - 2.6.1.RELEASE + 2.7.0.RELEASE 4.0.0 blade-service ${project.artifactId} - 2.6.1.RELEASE + 2.7.0.RELEASE pom BladeX 微服务集合 diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 5c9d646f..352ee5d3 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -67,6 +67,26 @@ management: health: show-details: always +#knife4j配置 +knife4j: + #启用 + enable: true + #基础认证 + basic: + enable: true + username: bladex + password: bladex + #增强配置 + setting: + enableSwaggerModels: true + enableDocumentManage: true + enableHost: false + enableHostText: http://localhost + enableRequestCache: true + enableFilterMultipartApis: false + enableFilterMultipartApiMethodType: POST + language: zh-CN + #blade配置 blade: #token配置 diff --git a/pom.xml b/pom.xml index 55596494..ce49a2aa 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springblade BladeX - 2.6.1.RELEASE + 2.7.0.RELEASE pom - 2.6.1.RELEASE + 2.7.0.RELEASE 1.8 3.8.1 @@ -18,8 +18,8 @@ 6.4.2 - 2.1.17.RELEASE - Greenwich.SR6 + 2.2.11.RELEASE + Hoxton.SR8 Cairo-SR8 diff --git a/script/docker/app/.env b/script/docker/app/.env index cfd1dfda..4e69c640 100644 --- a/script/docker/app/.env +++ b/script/docker/app/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.6.1.RELEASE +TAG=2.7.0.RELEASE