Ver código fonte

修复deprecated,调整nacos日志打印级别

mrbird 6 anos atrás
pai
commit
14ee6be368

+ 1 - 1
febs-auth/src/main/java/cc/mrbird/febs/auth/filter/ValidateCodeFilter.java

@@ -53,7 +53,7 @@ public class ValidateCodeFilter extends OncePerRequestFilter {
                 filterChain.doFilter(httpServletRequest, httpServletResponse);
             } catch (ValidateCodeException e) {
                 FebsResponse febsResponse = new FebsResponse();
-                FebsUtil.makeResponse(httpServletResponse, MediaType.APPLICATION_JSON_UTF8_VALUE,
+                FebsUtil.makeResponse(httpServletResponse, MediaType.APPLICATION_JSON_VALUE,
                         HttpServletResponse.SC_INTERNAL_SERVER_ERROR, febsResponse.message(e.getMessage()));
                 log.error(e.getMessage(), e);
             }

+ 10 - 1
febs-auth/src/main/resources/bootstrap.yml

@@ -11,4 +11,13 @@ spring:
         prefix: febs-auth
         file-extension: yaml
       discovery:
-        server-addr: ${nacos.url}:8001
+        server-addr: ${nacos.url}:8001
+
+logging:
+  level:
+    com:
+      alibaba:
+        cloud:
+          nacos:
+            client:
+              NacosPropertySourceBuilder: error

+ 1 - 1
febs-common/src/main/java/cc/mrbird/febs/common/configure/FebsLettuceRedisConfigure.java

@@ -29,7 +29,7 @@ public class FebsLettuceRedisConfigure {
         Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
         ObjectMapper mapper = new ObjectMapper();
         mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        mapper.activateDefaultTyping(mapper.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL);
         jackson2JsonRedisSerializer.setObjectMapper(mapper);
 
         StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();

+ 1 - 1
febs-common/src/main/java/cc/mrbird/febs/common/handler/FebsAccessDeniedHandler.java

@@ -19,7 +19,7 @@ public class FebsAccessDeniedHandler implements AccessDeniedHandler {
     public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException {
         FebsResponse febsResponse = new FebsResponse();
         FebsUtil.makeResponse(
-                response, MediaType.APPLICATION_JSON_UTF8_VALUE,
+                response, MediaType.APPLICATION_JSON_VALUE,
                 HttpServletResponse.SC_FORBIDDEN, febsResponse.message("没有权限访问该资源"));
     }
 }

+ 1 - 1
febs-common/src/main/java/cc/mrbird/febs/common/handler/FebsAuthExceptionEntryPoint.java

@@ -20,7 +20,7 @@ public class FebsAuthExceptionEntryPoint implements AuthenticationEntryPoint {
                          AuthenticationException authException) throws IOException {
         FebsResponse febsResponse = new FebsResponse();
         FebsUtil.makeResponse(
-                response, MediaType.APPLICATION_JSON_UTF8_VALUE,
+                response, MediaType.APPLICATION_JSON_VALUE,
                 HttpServletResponse.SC_UNAUTHORIZED, febsResponse.message("token无效")
         );
     }

+ 1 - 1
febs-common/src/main/java/cc/mrbird/febs/common/interceptor/FebsServerProtectInterceptor.java

@@ -27,7 +27,7 @@ public class FebsServerProtectInterceptor implements HandlerInterceptor {
             return true;
         } else {
             FebsResponse febsResponse = new FebsResponse();
-            FebsUtil.makeResponse(response,MediaType.APPLICATION_JSON_UTF8_VALUE,
+            FebsUtil.makeResponse(response,MediaType.APPLICATION_JSON_VALUE,
                     HttpServletResponse.SC_FORBIDDEN, febsResponse.message("请通过网关获取资源"));
             return false;
         }

+ 1 - 1
febs-gateway/src/main/java/cc/mrbird/febs/gateway/filter/FebsGatewayRequestFilter.java

@@ -98,7 +98,7 @@ public class FebsGatewayRequestFilter implements GlobalFilter {
 
     private Mono<Void> makeResponse(ServerHttpResponse response, FebsResponse febsResponse) {
         response.setStatusCode(HttpStatus.FORBIDDEN);
-        response.getHeaders().add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE);
+        response.getHeaders().add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
         DataBuffer dataBuffer = response.bufferFactory().wrap(JSONObject.toJSONString(febsResponse).getBytes());
         return response.writeWith(Mono.just(dataBuffer));
     }

+ 2 - 2
febs-gateway/src/main/java/cc/mrbird/febs/gateway/handler/FebsGatewayExceptionHandler.java

@@ -67,7 +67,7 @@ public class FebsGatewayExceptionHandler extends DefaultErrorWebExceptionHandler
     }
 
     @Override
-    protected HttpStatus getHttpStatus(Map<String, Object> errorAttributes) {
-        return HttpStatus.INTERNAL_SERVER_ERROR;
+    protected int getHttpStatus(Map<String, Object> errorAttributes) {
+        return HttpStatus.INTERNAL_SERVER_ERROR.value();
     }
 }

+ 10 - 1
febs-gateway/src/main/resources/bootstrap.yml

@@ -9,4 +9,13 @@ spring:
         prefix: febs-gateway
         file-extension: yaml
       discovery:
-        server-addr: ${nacos.url}:8001
+        server-addr: ${nacos.url}:8001
+
+logging:
+  level:
+    com:
+      alibaba:
+        cloud:
+          nacos:
+            client:
+              NacosPropertySourceBuilder: error

+ 10 - 1
febs-monitor/febs-monitor-admin/src/main/resources/bootstrap.yml

@@ -7,4 +7,13 @@ spring:
         server-addr: ${nacos.url}:8001
         group: DEFAULT_GROUP
         prefix: febs-monitor-admin
-        file-extension: yaml
+        file-extension: yaml
+
+logging:
+  level:
+    com:
+      alibaba:
+        cloud:
+          nacos:
+            client:
+              NacosPropertySourceBuilder: error