From ba7d5d8709ded879182a75734973848f4ff121c2 Mon Sep 17 00:00:00 2001
From: yjxx <1055683039@qq.com>
Date: Thu, 24 Oct 2024 17:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DTO/UserLoginByAccountDTO.java                |  7 ++++---
 .../expressdistributionsystem/entity/User.java    |  8 ++++----
 .../interceptors/GlobalExceptionHandler.java      | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java

diff --git a/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java b/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java
index 1a1a6b8..2965b55 100644
--- a/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java
+++ b/src/main/java/jty/expressdistributionsystem/DTO/UserLoginByAccountDTO.java
@@ -1,19 +1,20 @@
 package jty.expressdistributionsystem.DTO;
 
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import lombok.Data;
 
 @Data
 public class UserLoginByAccountDTO {
     @NotBlank(message = "账号不能为空")
-    @Pattern(regexp = "^(?!\\s)([A-Za-z0-9]{1,10})$")
+    @Pattern(regexp = "^(?!\\s)([A-Za-z0-9]{1,10})$", message = "账号长度在1-10位之间")
     private String account;
 
     @NotBlank(message = "密码不能为空")
-    @Pattern(regexp = "^.+$")
+    @Pattern(regexp = "^.+$", message = "密码不能为空")
     private String password;
 
-    @NotBlank(message = "请选择你的登录任务")
+    @NotNull
     private Integer mark;
 }
diff --git a/src/main/java/jty/expressdistributionsystem/entity/User.java b/src/main/java/jty/expressdistributionsystem/entity/User.java
index 1e21d62..f1acc06 100644
--- a/src/main/java/jty/expressdistributionsystem/entity/User.java
+++ b/src/main/java/jty/expressdistributionsystem/entity/User.java
@@ -30,22 +30,22 @@ public class User implements Serializable {
 
     @TableField("account")
     @NotBlank(message = "账号不能为空")
-    @Pattern(regexp = "^(?!\\s)([A-Za-z0-9]{1,10})$")
+    @Pattern(regexp = "^(?!\\s)([A-Za-z0-9]{1,10})$", message = "账号长度在1-10位之间")
     private String account;
 
     @TableField("phone")
     @NotBlank(message = "手机号不能为空")
-    @Pattern(regexp = "^1[3-9]\\d{9}$")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号有误")
     private String phone;
 
     @TableField("password")
     @NotBlank(message = "密码不能为空")
-    @Pattern(regexp = "^.+$")
+    @Pattern(regexp = "^.+$", message = "密码不能为空")
     private String password;
 
     @TableField("identity")
     @NotBlank(message = "身份证不能为空")
-    @Pattern(regexp = "^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\\d{3}(\\d|X|x)$")
+    @Pattern(regexp = "^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\\d{3}(\\d|X|x)$", message = "身份证有误")
     private String identity;
 
     @TableField("mark")
diff --git a/src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java b/src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java
new file mode 100644
index 0000000..6e55c87
--- /dev/null
+++ b/src/main/java/jty/expressdistributionsystem/interceptors/GlobalExceptionHandler.java
@@ -0,0 +1,15 @@
+package jty.expressdistributionsystem.interceptors;
+
+import jty.expressdistributionsystem.entity.Result;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+    @ExceptionHandler(Exception.class)
+    public Result handleException(Exception e){
+        e.printStackTrace();
+        return new Result(500, StringUtils.hasLength(e.getMessage()) ? e.getMessage() : "操作失败", "");
+    }
+}