Browse Source

🎉 2.7.0.RELEASE 底层驱动全面升级

test
smallchill 4 years ago
parent
commit
b304bf3867
  1. 2
      blade-auth/pom.xml
  2. 3
      blade-auth/src/main/java/org/springblade/auth/config/BladeResourceServerConfiguration.java
  3. 2
      blade-common/pom.xml
  4. 6
      blade-gateway/pom.xml
  5. 6
      blade-gateway/src/main/java/org/springblade/gateway/handler/ErrorExceptionHandler.java
  6. 4
      blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerResourceHandler.java
  7. 4
      blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java
  8. 4
      blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java
  9. 1
      blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java
  10. 2
      blade-gateway/src/main/java/org/springblade/gateway/provider/SwaggerProvider.java
  11. 3
      blade-gateway/src/main/resources/bootstrap.yml
  12. 2
      blade-ops-api/blade-flow-api/pom.xml
  13. 2
      blade-ops-api/blade-resource-api/pom.xml
  14. 4
      blade-ops-api/pom.xml
  15. 10
      blade-ops/blade-admin/pom.xml
  16. 9
      blade-ops/blade-admin/src/main/java/org/springblade/admin/config/AdminConfiguration.java
  17. 2
      blade-ops/blade-develop/pom.xml
  18. 2
      blade-ops/blade-flow-design/pom.xml
  19. 2
      blade-ops/blade-flow/pom.xml
  20. 2
      blade-ops/blade-log/pom.xml
  21. 6
      blade-ops/blade-report/pom.xml
  22. 2
      blade-ops/blade-resource/pom.xml
  23. 2
      blade-ops/blade-turbine/pom.xml
  24. 2
      blade-ops/blade-xxljob-admin/pom.xml
  25. 2
      blade-ops/blade-xxljob/pom.xml
  26. 15
      blade-ops/blade-zipkin/Dockerfile
  27. 78
      blade-ops/blade-zipkin/pom.xml
  28. 37
      blade-ops/blade-zipkin/src/main/java/org/springblade/zipkin/ZipkinApplication.java
  29. 18
      blade-ops/blade-zipkin/src/main/resources/bootstrap.yml
  30. 5
      blade-ops/pom.xml
  31. 2
      blade-service-api/blade-desk-api/pom.xml
  32. 2
      blade-service-api/blade-dict-api/pom.xml
  33. 2
      blade-service-api/blade-scope-api/pom.xml
  34. 2
      blade-service-api/blade-system-api/pom.xml
  35. 2
      blade-service-api/blade-user-api/pom.xml
  36. 4
      blade-service-api/pom.xml
  37. 2
      blade-service/blade-desk/pom.xml
  38. 2
      blade-service/blade-system/pom.xml
  39. 2
      blade-service/blade-user/pom.xml
  40. 4
      blade-service/pom.xml
  41. 20
      doc/nacos/blade.yaml
  42. 8
      pom.xml
  43. 2
      script/docker/app/.env

2
blade-auth/pom.xml

@ -8,7 +8,7 @@
<parent>
<artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<artifactId>blade-auth</artifactId>

3
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();
}

2
blade-common/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
blade-gateway/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -48,6 +48,10 @@
<groupId>org.springblade</groupId>
<artifactId>blade-starter-jwt</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<!--Spring-->
<dependency>
<groupId>org.springframework.cloud</groupId>

6
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<String, Object> errorAttributes) {
int statusCode = (int) errorAttributes.get("code");
return HttpStatus.valueOf(statusCode);
protected int getHttpStatus(Map<String, Object> errorAttributes) {
return (int) errorAttributes.get("code");
}
/**

4
blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerResourceHandler.java

@ -49,7 +49,7 @@ public class SwaggerResourceHandler implements HandlerFunction<ServerResponse> {
@Override
public Mono<ServerResponse> 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()));
}
}

4
blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java

@ -46,7 +46,7 @@ public class SwaggerSecurityHandler implements HandlerFunction<ServerResponse> {
@Override
public Mono<ServerResponse> 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()));
}
}

4
blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java

@ -46,7 +46,7 @@ public class SwaggerUiHandler implements HandlerFunction<ServerResponse> {
@Override
public Mono<ServerResponse> 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()));
}
}

1
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");

2
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;

3
blade-gateway/src/main/resources/bootstrap.yml

@ -3,6 +3,9 @@ server:
spring:
cloud:
discovery:
reactive:
enabled: false
gateway:
discovery:
locator:

2
blade-ops-api/blade-flow-api/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops-api/blade-resource-api/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-ops-api/pom.xml

@ -5,13 +5,13 @@
<parent>
<artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-ops-api</artifactId>
<name>${project.artifactId}</name>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
<packaging>pom</packaging>
<description>BladeX 微服务API集合</description>

10
blade-ops/blade-admin/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -20,14 +20,6 @@
<groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-launch</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-tool</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-cloud</artifactId>

9
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")

2
blade-ops/blade-develop/pom.xml

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-flow-design/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-flow/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-log/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
blade-ops/blade-report/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -24,6 +24,10 @@
<groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-tenant</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-report</artifactId>

2
blade-ops/blade-resource/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-turbine/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-xxljob-admin/pom.xml

@ -3,7 +3,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-xxljob/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-xxljob</artifactId>

15
blade-ops/blade-zipkin/Dockerfile

@ -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"]

78
blade-ops/blade-zipkin/pom.xml

@ -1,78 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-zipkin</artifactId>
<name>${project.artifactId}</name>
<version>${bladex.project.version}</version>
<packaging>jar</packaging>
<dependencies>
<!--Blade-->
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-launch</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-tool</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-cloud</artifactId>
</dependency>
<!--Zipkin-->
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-server</artifactId>
<version>2.12.3</version>
<exclusions>
<exclusion>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-autoconfigure-ui</artifactId>
<version>2.12.3</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

37
blade-ops/blade-zipkin/src/main/java/org/springblade/zipkin/ZipkinApplication.java

@ -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);
}
}

18
blade-ops/blade-zipkin/src/main/resources/bootstrap.yml

@ -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

5
blade-ops/pom.xml

@ -5,13 +5,13 @@
<parent>
<artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-ops</artifactId>
<name>${project.artifactId}</name>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
<packaging>pom</packaging>
<modules>
@ -23,7 +23,6 @@
<module>blade-report</module>
<module>blade-resource</module>
<module>blade-turbine</module>
<module>blade-zipkin</module>
<module>blade-xxljob</module>
<module>blade-xxljob-admin</module>
</modules>

2
blade-service-api/blade-desk-api/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-dict-api/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-scope-api/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-system-api/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-user-api/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-service-api/pom.xml

@ -5,13 +5,13 @@
<parent>
<artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
<packaging>pom</packaging>
<description>BladeX 微服务API集合</description>

2
blade-service/blade-desk/pom.xml

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service/blade-system/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service/blade-user/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-service/pom.xml

@ -6,14 +6,14 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>BladeX</artifactId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-service</artifactId>
<name>${project.artifactId}</name>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
<packaging>pom</packaging>
<description>BladeX 微服务集合</description>

20
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配置

8
pom.xml

@ -5,11 +5,11 @@
<groupId>org.springblade</groupId>
<artifactId>BladeX</artifactId>
<version>2.6.1.RELEASE</version>
<version>2.7.0.RELEASE</version>
<packaging>pom</packaging>
<properties>
<bladex.project.version>2.6.1.RELEASE</bladex.project.version>
<bladex.project.version>2.7.0.RELEASE</bladex.project.version>
<java.version>1.8</java.version>
<maven.plugin.version>3.8.1</maven.plugin.version>
@ -18,8 +18,8 @@
<flowable.version>6.4.2</flowable.version>
<spring.boot.version>2.1.17.RELEASE</spring.boot.version>
<spring.cloud.version>Greenwich.SR6</spring.cloud.version>
<spring.boot.version>2.2.11.RELEASE</spring.boot.version>
<spring.cloud.version>Hoxton.SR8</spring.cloud.version>
<spring.platform.version>Cairo-SR8</spring.platform.version>
<!-- 推荐使用Harbor -->

2
script/docker/app/.env

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
TAG=2.6.1.RELEASE
TAG=2.7.0.RELEASE

Loading…
Cancel
Save