Bläddra i källkod

更新消息国际化逻辑

woody 1 år sedan
förälder
incheckning
e4862f5c0f

+ 2 - 2
framework-base/src/main/java/com/chelvc/framework/base/context/SessionContextHolder.java

@@ -491,11 +491,11 @@ public class SessionContextHolder implements ServletRequestListener {
      */
      */
     public static <T> Result<T> result(@NonNull HttpStatus status) {
     public static <T> Result<T> result(@NonNull HttpStatus status) {
         if (status.is5xxServerError()) {
         if (status.is5xxServerError()) {
-            return Result.failure();
+            return Result.failure(ApplicationContextHolder.getMessage("Failure"));
         } else if (status.isError()) {
         } else if (status.isError()) {
             return Result.of(status.name(), null, status.getReasonPhrase());
             return Result.of(status.name(), null, status.getReasonPhrase());
         }
         }
-        return Result.success();
+        return Result.success(null, ApplicationContextHolder.getMessage("Success"));
     }
     }
 
 
     /**
     /**

+ 5 - 1
framework-base/src/main/java/com/chelvc/framework/base/interceptor/DefaultResponseWrapper.java

@@ -1,5 +1,6 @@
 package com.chelvc.framework.base.interceptor;
 package com.chelvc.framework.base.interceptor;
 
 
+import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.common.model.Result;
 import com.chelvc.framework.common.model.Result;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.NativeWebRequest;
@@ -13,6 +14,9 @@ import org.springframework.web.context.request.NativeWebRequest;
 public class DefaultResponseWrapper implements ResponseWrapper {
 public class DefaultResponseWrapper implements ResponseWrapper {
     @Override
     @Override
     public Result<?> wrap(NativeWebRequest request, MethodParameter method, Object value) {
     public Result<?> wrap(NativeWebRequest request, MethodParameter method, Object value) {
-        return value instanceof Result ? (Result<?>) value : Result.success(value);
+        if (value instanceof Result) {
+            return (Result<?>) value;
+        }
+        return Result.success(value, ApplicationContextHolder.getMessage("Success"));
     }
     }
 }
 }

+ 6 - 2
framework-base/src/main/java/com/chelvc/framework/base/interceptor/GlobalExceptionInterceptor.java

@@ -12,6 +12,7 @@ import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.ConstraintViolationException;
 import javax.validation.ValidationException;
 import javax.validation.ValidationException;
 
 
+import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.base.context.LoggingContextHolder;
 import com.chelvc.framework.base.context.LoggingContextHolder;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.exception.FrameworkException;
 import com.chelvc.framework.common.exception.FrameworkException;
@@ -190,7 +191,10 @@ public class GlobalExceptionInterceptor extends AbstractErrorController {
             code = ((FrameworkException) e).getCode();
             code = ((FrameworkException) e).getCode();
             data = ((FrameworkException) e).getData();
             data = ((FrameworkException) e).getData();
         }
         }
-        return Objects.equals(code, Result.ERROR) ? Result.failure() : Result.of(code, data, e.getMessage());
+        if (Objects.equals(code, Result.ERROR)) {
+            return Result.failure(ApplicationContextHolder.getMessage("Failure"));
+        }
+        return Result.of(code, data, e.getMessage());
     }
     }
 
 
     /**
     /**
@@ -208,7 +212,7 @@ public class GlobalExceptionInterceptor extends AbstractErrorController {
         String method = request.getMethod();
         String method = request.getMethod();
         String message = (String) attributes.get("message");
         String message = (String) attributes.get("message");
         log.warn(LoggingContextHolder.message(uri, method, message));
         log.warn(LoggingContextHolder.message(uri, method, message));
-        Result<?> result = status.is5xxServerError() ? Result.failure() :
+        Result<?> result = status.is5xxServerError() ? Result.failure(ApplicationContextHolder.getMessage("Failure")) :
                 Result.of(status.name(), null, status.getReasonPhrase());
                 Result.of(status.name(), null, status.getReasonPhrase());
         response.setStatus(SessionContextHolder.result2status(result).value());
         response.setStatus(SessionContextHolder.result2status(result).value());
         return result;
         return result;

+ 2 - 1
framework-database/src/main/java/com/chelvc/framework/database/interceptor/DatabaseExceptionInterceptor.java

@@ -2,6 +2,7 @@ package com.chelvc.framework.database.interceptor;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 
+import com.chelvc.framework.base.context.ApplicationContextHolder;
 import com.chelvc.framework.base.context.LoggingContextHolder;
 import com.chelvc.framework.base.context.LoggingContextHolder;
 import com.chelvc.framework.common.exception.ParameterInvalidException;
 import com.chelvc.framework.common.exception.ParameterInvalidException;
 import com.chelvc.framework.common.model.Result;
 import com.chelvc.framework.common.model.Result;
@@ -41,6 +42,6 @@ public class DatabaseExceptionInterceptor {
             return parameterInvalidException.result();
             return parameterInvalidException.result();
         }
         }
         LoggingContextHolder.error(log, request, e);
         LoggingContextHolder.error(log, request, e);
-        return Result.failure();
+        return Result.failure(ApplicationContextHolder.getMessage("Failure"));
     }
     }
 }
 }

+ 1 - 1
framework-security/src/main/java/com/chelvc/framework/security/interceptor/SecurityValidateInterceptor.java

@@ -69,7 +69,7 @@ public class SecurityValidateInterceptor implements HandlerInterceptor, WebMvcCo
             if (session.getPlatform() == null || session.getTerminal() == null
             if (session.getPlatform() == null || session.getTerminal() == null
                     || StringUtils.isEmpty(session.getVersion()) || session.getTimestamp() == null) {
                     || StringUtils.isEmpty(session.getVersion()) || session.getTimestamp() == null) {
                 throw new FrameworkException(
                 throw new FrameworkException(
-                        HttpStatus.BAD_REQUEST.name(), null, ApplicationContextHolder.getMessage("Header.Invalid")
+                        HttpStatus.BAD_REQUEST.name(), null, ApplicationContextHolder.getMessage("Header.Missing")
                 );
                 );
             }
             }