Merge branch 'pre-production'

blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java

@@ -82,10 +82,12 @@ public class BladeJwtTokenEnhancer implements TokenEnhancer {
 
 			if (jwtProperties.getSingle()) {
 				OAuth2RefreshToken oAuth2RefreshToken = oAuth2AccessToken.getRefreshToken();
+				if(oAuth2RefreshToken!=null){
 					String refreshTokenValue = oAuth2RefreshToken.getValue();
 					JwtUtil.addRefreshToken(tenantId, clientId, userId, refreshTokenValue, accessToken.getExpiresIn() * 168);
 				}
 			}
+		}
 
 		return accessToken;
 	}

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

@@ -1,5 +1,5 @@
 server:
-  port: 9999
+  port: 8888
 
 spring:
   cloud: