:tada: 2.7.0.RELEASE 底层驱动全面升级

blade-biz-common/pom.xml

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

blade-example-api/blade-dubbo-provider-api/pom.xml

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

blade-example-api/blade-stream-api/pom.xml

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

blade-example-api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</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-example-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>
 

blade-example/blade-dubbo-consumer/pom.xml

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

blade-example/blade-dubbo-consumer/src/main/java/org/springblade/example/consumer/controller/BlogController.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.example.consumer.controller;
 
-import org.apache.dubbo.config.annotation.Reference;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springblade.core.tool.api.R;
 import org.springblade.example.provider.entity.Blog;
 import org.springblade.example.provider.rpc.IBlogRpc;
@@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("blog")
 public class BlogController {
 
-	@Reference(
+	@DubboReference(
 		version = "${blade.service.version}",
 		mock = "org.springblade.example.provider.rpc.BlogMock",
 		//stub = "org.springblade.example.consumer.rpc.BlogStub",

blade-example/blade-dubbo-provider/pom.xml

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

blade-example/blade-dubbo-provider/src/main/java/org/springblade/example/provider/rpc/BlogRpc.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.example.provider.rpc;
 
-import org.apache.dubbo.config.annotation.Service;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.springblade.example.provider.entity.Blog;
 
 /**
@@ -24,7 +24,7 @@ import org.springblade.example.provider.entity.Blog;
  *
  * @author Chill
  */
-@Service(
+@DubboService(
 	version = "${blade.service.version}"
 )
 public class BlogRpc implements IBlogRpc {

blade-example/blade-easypoi/pom.xml

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

blade-example/blade-mq-kafka/pom.xml

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

blade-example/blade-mq-rabbit/pom.xml

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

blade-example/blade-seata-order/pom.xml

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

blade-example/blade-seata-storage/pom.xml

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

blade-example/blade-stream-consumer/pom.xml

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

blade-example/blade-stream-provider/pom.xml

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

blade-example/blade-websocket/pom.xml

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

blade-example/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</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-example</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.6.1.RELEASE</version>
+    <version>2.7.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务范例集合</description>
 

blade-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</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>

blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java

@@ -23,6 +23,8 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.jwt.JwtUtil;
+import org.springblade.core.jwt.props.JwtProperties;
+import org.springblade.core.launch.constant.TokenConstant;
 import org.springblade.gateway.props.AuthProperties;
 import org.springblade.gateway.provider.AuthProvider;
 import org.springblade.gateway.provider.RequestProvider;
@@ -51,14 +53,17 @@ import java.nio.charset.StandardCharsets;
 public class AuthFilter implements GlobalFilter, Ordered {
 	private final AuthProperties authProperties;
 	private final ObjectMapper objectMapper;
+	private final JwtProperties jwtProperties;
 
 	@Override
 	public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+		//校验 Token 放行
 		String originalRequestUrl = RequestProvider.getOriginalRequestUrl(exchange);
 		String path = exchange.getRequest().getURI().getPath();
 		if (isSkip(path) || isSkip(originalRequestUrl)) {
 			return chain.filter(exchange);
 		}
+		//校验 Token 合法性
 		ServerHttpResponse resp = exchange.getResponse();
 		String headerToken = exchange.getRequest().getHeaders().getFirst(AuthProvider.AUTH_KEY);
 		String paramToken = exchange.getRequest().getQueryParams().getFirst(AuthProvider.AUTH_KEY);
@@ -68,9 +73,18 @@ public class AuthFilter implements GlobalFilter, Ordered {
 		String auth = StringUtils.isBlank(headerToken) ? paramToken : headerToken;
 		String token = JwtUtil.getToken(auth);
 		Claims claims = JwtUtil.parseJWT(token);
-		if (claims == null) {
+		if (token == null || claims == null) {
 			return unAuth(resp, "请求未授权");
 		}
+		//判断 Token 状态
+		if (jwtProperties.getState()) {
+			String tenantId = String.valueOf(claims.get(TokenConstant.TENANT_ID));
+			String userId = String.valueOf(claims.get(TokenConstant.USER_ID));
+			String accessToken = JwtUtil.getAccessToken(tenantId, userId, token);
+			if (!token.equalsIgnoreCase(accessToken)) {
+				return unAuth(resp, "令牌已失效");
+			}
+		}
 		return chain.filter(exchange);
 	}
 

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");
 	}
 
 	/**

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

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

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

blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java

@@ -39,10 +39,13 @@ public class AuthProvider {
 		DEFAULT_SKIP_URL.add("/oauth/captcha/**");
 		DEFAULT_SKIP_URL.add("/oauth/clear-cache/**");
 		DEFAULT_SKIP_URL.add("/oauth/user-info");
+		DEFAULT_SKIP_URL.add("/oauth/render");
+		DEFAULT_SKIP_URL.add("/oauth/callback");
+		DEFAULT_SKIP_URL.add("/oauth/revoke");
+		DEFAULT_SKIP_URL.add("/oauth/refresh");
 		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");

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;
 

blade-service-api/blade-demo-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>
 

blade-service-api/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <artifactId>BladeX-Biz</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>
 

blade-service/blade-demo/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>

blade-service/pom.xml

@@ -7,12 +7,12 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>BladeX-Biz</artifactId>
-        <version>2.6.1.RELEASE</version>
+        <version>2.7.0.RELEASE</version>
     </parent>
 
     <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>
 

pom.xml

@@ -5,11 +5,11 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>BladeX-Biz</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>
@@ -17,10 +17,10 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <flowable.version>6.4.2</flowable.version>
-        <dubbo.version>2.7.5</dubbo.version>
+        <dubbo.version>2.7.8</dubbo.version>
 
-        <spring.boot.version>2.1.16.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 -->

script/docker/app/.env

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