From cd510b43b1ef85202ddf9018271aaadf695f3c8d Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: 星期二, 25 一月 2022 17:17:06 +0800
Subject: [PATCH] fix 优化登录、注册校验方式，在接口通过@Validated进行数据基础校验，以及服务执行到异常后，抛出异常结束方法执行（减少if-else嵌套）。
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java | 95 ++++++++++++++++++++++++++---------------------
1 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
index d470536..94ebebd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@@ -1,43 +1,52 @@
-package com.ruoyi.common.core.domain.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 鐢ㄦ埛鐧诲綍瀵硅薄
- *
- * @author Lion Li
- */
-
-@Data
-@Accessors(chain = true)
-@ApiModel("鐢ㄦ埛鐧诲綍瀵硅薄")
-public class LoginBody {
-
- /**
- * 鐢ㄦ埛鍚�
- */
- @ApiModelProperty(value = "鐢ㄦ埛鍚�")
- private String username;
-
- /**
- * 鐢ㄦ埛瀵嗙爜
- */
- @ApiModelProperty(value = "鐢ㄦ埛瀵嗙爜")
- private String password;
-
- /**
- * 楠岃瘉鐮�
- */
- @ApiModelProperty(value = "楠岃瘉鐮�")
- private String code;
-
- /**
- * 鍞竴鏍囪瘑
- */
- @ApiModelProperty(value = "鍞竴鏍囪瘑")
- private String uuid = "";
-
-}
+package com.ruoyi.common.core.domain.model;
+
+import com.ruoyi.common.constant.UserConstants;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 鐢ㄦ埛鐧诲綍瀵硅薄
+ *
+ * @author Lion Li
+ */
+
+@Data
+@Accessors(chain = true)
+@ApiModel("鐢ㄦ埛鐧诲綍瀵硅薄")
+public class LoginBody {
+
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ @NotBlank(message = "{user.username.not.blank}")
+ @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
+ @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+ private String username;
+
+ /**
+ * 鐢ㄦ埛瀵嗙爜
+ */
+ @NotBlank(message = "{user.password.not.blank}")
+ @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
+ @ApiModelProperty(value = "鐢ㄦ埛瀵嗙爜")
+ private String password;
+
+ /**
+ * 楠岃瘉鐮�
+ */
+ @NotBlank(message = "{user.jcaptcha.blank}")
+ @ApiModelProperty(value = "楠岃瘉鐮�")
+ private String code;
+
+ /**
+ * 鍞竴鏍囪瘑
+ */
+ @ApiModelProperty(value = "鍞竴鏍囪瘑")
+ private String uuid = "";
+
+}
--
Gitblit v1.9.3