优化

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/exception/UnAuthorizedException.java

@@ -29,7 +29,7 @@ import org.hswebframework.web.authorization.token.TokenState;
 public class UnAuthorizedException extends RuntimeException {
     private static final long serialVersionUID = 2422918455013900645L;
 
-    private TokenState state;
+    private final TokenState state;
 
     public UnAuthorizedException() {
         this(TokenState.expired);

hsweb-core/src/main/java/org/hswebframework/web/validate/SimpleValidateResults.java

@@ -22,12 +22,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * TODO 完成注释
  *
  * @author zhouhao
  */
 public class SimpleValidateResults implements ValidateResults {
 
+    private static final long serialVersionUID = -3355828475840578917L;
     private List<ValidateResults.Result> results = new ArrayList<>();
 
     public SimpleValidateResults addResult(String field, String message) {
@@ -46,6 +46,7 @@ public class SimpleValidateResults implements ValidateResults {
     }
 
     class Result implements ValidateResults.Result {
+        private static final long serialVersionUID = -4717219071013488363L;
         private String field;
         private String message;
 

hsweb-core/src/main/java/org/hswebframework/web/validate/ValidationException.java

@@ -21,6 +21,7 @@ package org.hswebframework.web.validate;
 
 import org.hswebframework.web.BusinessException;
 
+import java.util.Collections;
 import java.util.List;
 
 public class ValidationException extends BusinessException {
@@ -37,13 +38,13 @@ public class ValidationException extends BusinessException {
     }
 
     public ValidationException(ValidateResults results) {
-        super(results.toString(), 400);
+        super(results.getResults().get(0).getMessage(), 400);
         this.results = results;
     }
 
     public List<ValidateResults.Result> getResults() {
         if (results == null) {
-            return null;
+            return Collections.emptyList();
         }
         return results.getResults();
     }

hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/RestControllerExceptionTranslator.java

@@ -57,7 +57,8 @@ public class RestControllerExceptionTranslator {
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ResponseBody
     ResponseMessage<Object> handleException(org.hswebframework.ezorm.rdb.exception.ValidationException exception) {
-        return ResponseMessage.error(400, exception.getMessage()).result(exception.getValidateResult());
+        return ResponseMessage.error(400, exception.getMessage())
+                .result(exception.getValidateResult());
     }
 
     @ExceptionHandler(ValidationException.class)
@@ -81,7 +82,7 @@ public class RestControllerExceptionTranslator {
     @ExceptionHandler(UnAuthorizedException.class)
     @ResponseStatus(HttpStatus.UNAUTHORIZED)
     @ResponseBody
-    ResponseMessage handleException(UnAuthorizedException exception, HttpServletResponse response) {
+    ResponseMessage handleException(UnAuthorizedException exception) {
         return ResponseMessage.error(401, exception.getMessage()).result(exception.getState());
     }
 
@@ -110,7 +111,7 @@ public class RestControllerExceptionTranslator {
                 .map(FieldError.class::cast)
                 .forEach(fieldError -> results.addResult(fieldError.getField(), fieldError.getDefaultMessage()));
 
-        return ResponseMessage.error(400, results.getResults().size() == 0 ? e.getMessage() : results.getResults().get(0).getMessage()).result(results.getResults());
+        return ResponseMessage.error(400, results.getResults().isEmpty() ? e.getMessage() : results.getResults().get(0).getMessage()).result(results.getResults());
     }
 
     @ExceptionHandler(RuntimeException.class)
@@ -129,7 +130,6 @@ public class RestControllerExceptionTranslator {
         return ResponseMessage.error(500, "服务器内部错误");
     }
 
-
     @ExceptionHandler(SQLException.class)
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     @ResponseBody
@@ -138,14 +138,11 @@ public class RestControllerExceptionTranslator {
         return ResponseMessage.error(500, "服务器内部错误");
     }
 
-
-//    @ExceptionHandler(Throwable.class)
-//    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
-//    @ResponseBody
-//    @Order()
-//    ResponseMessage handleException(Throwable exception) {
-//        logger.error(exception.getMessage(), exception);
-//        return ResponseMessage.error(exception.getMessage(), 500);
-//    }
-
+    @ExceptionHandler(IllegalArgumentException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    ResponseMessage handleException(IllegalArgumentException exception) {
+        logger.error(exception.getMessage(), exception);
+        return ResponseMessage.error(400, "参数错误:" + exception.getMessage());
+    }
 }

hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemVersion.java

@@ -20,6 +20,7 @@ package org.hswebframework.web.starter;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.utils.ListUtils;
 import org.hswebframework.utils.StringUtils;
 
@@ -180,7 +181,7 @@ public class SystemVersion extends Version {
     }
 }
 
-
+@Slf4j
 class Version implements Comparable<Version> {
     protected String name;
     protected String comment;
@@ -206,7 +207,8 @@ class Version implements Comparable<Version> {
         String[] ver = version.split("[.]");
         Integer[] numberVer = ListUtils.stringArr2intArr(ver);
         if (numberVer.length < 1 || Arrays.stream(numberVer).anyMatch(Objects::isNull)) {
-            throw new UnsupportedOperationException("format version " + version + " error  ");
+            numberVer = new Integer[]{1, 0, 0};
+            log.warn("解析版本号失败:{},将使用默认版本号:1.0.0,请检查hsweb-starter.js配置内容!", version);
         }
         setVersion(numberVer[0],
                 numberVer.length <= 1 ? 0 : numberVer[1],

hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/entity/EntityMappingCustomer.java

@@ -3,8 +3,6 @@ package org.hswebframework.web.starter.entity;
 import org.hswebframework.web.commons.entity.factory.MapperEntityFactory;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 public interface EntityMappingCustomer {