Merge branch 'new-socket' of https://172.16.32.165/lighter/web-server into new-socket

src/main/java/thyyxxk/webserver/http/websocket/SocketV2.java

@@ -1,7 +1,6 @@
 package thyyxxk.webserver.http.websocket;
 
 
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.Header;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONObject;
@@ -15,10 +14,6 @@ import thyyxxk.webserver.http.websocket.dto.*;
 import thyyxxk.webserver.utils.SocketMsg;
 import thyyxxk.webserver.utils.ValidatorUtils;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import java.util.Set;
 
 
 @Slf4j
@@ -26,7 +21,6 @@ import java.util.Set;
 @RequiredArgsConstructor
 public class SocketV2 {
     private final Other other;
-    private final ValidatorUtils validatorUtils;
 
     public HttpRequest getPostApi(String business) {
         return HttpRequest.post(other.getSocketV2Url() + "/send" + business)
@@ -62,7 +56,7 @@ public class SocketV2 {
     }
 
     public void sendTask(SocketTask task) {
-        validatorUtils.validate(task);
+        ValidatorUtils.validate(task);
 
         JSONObject js = new JSONObject();
         js.set("mode", "SINGLE");

src/main/java/thyyxxk/webserver/utils/ValidatorUtils.java

@@ -1,27 +1,29 @@
 package thyyxxk.webserver.utils;
 
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
+
+import thyyxxk.webserver.config.exception.BizException;
+import thyyxxk.webserver.config.exception.ExceptionEnum;
 
 import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import javax.validation.Validation;
+import javax.validation.ValidatorFactory;
 import java.util.Set;
 
-@Component
-@RequiredArgsConstructor
 public class ValidatorUtils {
+    private static final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory();
 
-    private final Validator validator;
+    public static void validate(Object object) {
+        Set<ConstraintViolation<Object>> violations = validatorFactory.getValidator().validate(object);
 
-    public void validate(Object object) {
-        Set<ConstraintViolation<Object>> violations = validator.validate(object);
+        int index = 1;
 
         if (!violations.isEmpty()) {
-            StringBuilder errorMsg = new StringBuilder("Validation failed:");
+            StringBuilder errorMsg = new StringBuilder();
             for (ConstraintViolation<Object> violation : violations) {
-                errorMsg.append("\n").append(violation.getMessage());
+                errorMsg.append("\n").append(index).append("、").append(violation.getMessage());
+                index++;
             }
-            throw new IllegalArgumentException(errorMsg.toString());
+            throw new BizException(ExceptionEnum.LOGICAL_ERROR, errorMsg.toString());
         }
     }
 }