linfutong лет назад: 2
Родитель
Сommit
dbe2463504

+ 2 - 2
zd-common/common-core/src/main/java/com/zd/common/core/aspect/InnerAuthAspect.java

@@ -24,14 +24,14 @@ public class InnerAuthAspect implements Ordered {
         String source = ServletUtils.getRequest().getHeader(SecurityConstants.FROM_SOURCE);
         // 内部请求验证
         if (!StringUtils.equals(SecurityConstants.INNER, source)) {
-            throw new InnerAuthException("没有内部访问权限,不允许访问");
+            throw new InnerAuthException("无权限访问");
         }
 
         String userid = ServletUtils.getRequest().getHeader(SecurityConstants.DETAILS_USER_ID);
         String username = ServletUtils.getRequest().getHeader(SecurityConstants.DETAILS_USERNAME);
         // 用户信息验证
         if (innerAuth.isUser() && (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username))) {
-            throw new InnerAuthException("没有设置用户信息,不允许访问 ");
+            throw new InnerAuthException("未知用户,不允许访问");
         }
         return point.proceed();
     }

+ 2 - 4
zd-common/common-core/src/main/java/com/zd/common/core/aspect/ResponseAdvice.java

@@ -42,10 +42,8 @@ public class ResponseAdvice implements ResponseBodyAdvice<Object> {
                                   Class<? extends HttpMessageConverter<?>> aClass,
                                   ServerHttpRequest serverHttpRequest,
                                   ServerHttpResponse serverHttpResponse) {
-
-
-        if(o instanceof TableDataInfo || o instanceof AjaxResult || o instanceof ResultData
-                || o instanceof R || o instanceof String || o instanceof Map || o instanceof WVPResult){
+        if (o instanceof TableDataInfo || o instanceof AjaxResult || o instanceof ResultData
+                || o instanceof R || o instanceof String || o instanceof Map || o instanceof WVPResult) {
             return o;
         }
 

+ 2 - 5
zd-gateway/src/main/java/com/zd/gateway/filter/AuthFilter.java

@@ -58,17 +58,14 @@ public class AuthFilter implements GlobalFilter, Ordered {
         }
         String userStr = sops.get(getTokenKey(token));
         if (StringUtils.isEmpty(userStr)) {
-            return unauthorizedResponse(exchange, "登录状态已过期");
+            return unauthorizedResponse(exchange, "登录已过期");
         }
         JSONObject cacheObj = JSONObject.parseObject(userStr);
         String userid = cacheObj.getString("userid");
         String username = cacheObj.getString("username");
         if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) {
-            return unauthorizedResponse(exchange, "令牌验证失败");
+            return unauthorizedResponse(exchange, "账号认证失败");
         }
-
-        // 设置过期时间
-        //redisService.expire(getTokenKey(token), EXPIRE_TIME);
         // 设置用户信息到请求
         addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid);
         addHeader(mutate, SecurityConstants.DETAILS_USERNAME, username);

+ 0 - 2
zd-gateway/src/main/java/com/zd/gateway/filter/ValidateCodeFilter.java

@@ -44,12 +44,10 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object> {
     public GatewayFilter apply(Object config) {
         return (exchange, chain) -> {
             ServerHttpRequest request = exchange.getRequest();
-
             // 非登录/注册请求或验证码关闭,不处理
             if (!containsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL) || Boolean.TRUE.equals(!captchaProperties.getEnabled())) {
                 return chain.filter(exchange);
             }
-
             try {
                 String rspStr = resolveBodyFromRequest(request);
                 JSONObject obj = JSON.parseObject(rspStr);

+ 1 - 1
zd-gateway/src/main/java/com/zd/gateway/handler/GatewayExceptionHandler.java

@@ -35,7 +35,7 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler {
             ResponseStatusException responseStatusException = (ResponseStatusException) ex;
             msg = responseStatusException.getMessage();
         } else {
-            msg = "内部服务器错误";
+            msg = "服务异常,请稍后重试";
         }
         log.error("[网关异常处理]请求路径:{},异常信息:{}", exchange.getRequest().getPath(), ex.getMessage());
         return ServletUtils.webFluxResponseWriter(response, msg);

+ 1 - 1
zd-gateway/src/main/java/com/zd/gateway/handler/SentinelFallbackHandler.java

@@ -15,7 +15,7 @@ import reactor.core.publisher.Mono;
  */
 public class SentinelFallbackHandler implements WebExceptionHandler {
     private Mono<Void> writeResponse(ServerResponse response, ServerWebExchange exchange) {
-        return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "请求超过最大数,请稍后再试");
+        return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "当前请求量过大,请稍后再试");
     }
 
     @Override