From c4032aae88a079d8bb1198723d88c6e72935516b Mon Sep 17 00:00:00 2001
From: bleachtred <bleachtred@163.com>
Date: 星期二, 04 七月 2023 17:59:28 +0800
Subject: [PATCH] fix 修复相同字段mapstruct会自动赋值问题

---
 ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java |   80 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
index 73f678c..cdff773 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
@@ -1,7 +1,9 @@
 package org.dromara.common.core.domain.model;
 
+import jakarta.validation.constraints.Email;
 import org.dromara.common.core.constant.UserConstants;
 import lombok.Data;
+import org.dromara.common.core.validate.auth.*;
 import org.hibernate.validator.constraints.Length;
 
 import jakarta.validation.constraints.NotBlank;
@@ -16,6 +18,28 @@
 public class LoginBody {
 
     /**
+     * 瀹㈡埛绔痠d
+     */
+    @NotBlank(message = "{auth.clientid.not.blank}")
+    private String clientId;
+
+    /**
+     * 瀹㈡埛绔痥ey
+     */
+    private String clientKey;
+
+    /**
+     * 瀹㈡埛绔閽�
+     */
+    private String clientSecret;
+
+    /**
+     * 鎺堟潈绫诲瀷
+     */
+    @NotBlank(message = "{auth.grant.type.not.blank}")
+    private String grantType;
+
+    /**
      * 绉熸埛ID
      */
     @NotBlank(message = "{tenant.number.not.blank}")
@@ -24,15 +48,15 @@
     /**
      * 鐢ㄦ埛鍚�
      */
-    @NotBlank(message = "{user.username.not.blank}")
-    @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
+    @NotBlank(message = "{user.username.not.blank}", groups = {PasswordGroup.class})
+    @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}", groups = {PasswordGroup.class})
     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}")
+    @NotBlank(message = "{user.password.not.blank}", groups = {PasswordGroup.class})
+    @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}", groups = {PasswordGroup.class})
     private String password;
 
     /**
@@ -45,4 +69,52 @@
      */
     private String uuid;
 
+    /**
+     * 鎵嬫満鍙�
+     */
+    @NotBlank(message = "{user.phonenumber.not.blank}", groups = {SmsGroup.class})
+    private String phonenumber;
+
+    /**
+     * 鐭俊code
+     */
+    @NotBlank(message = "{sms.code.not.blank}", groups = {SmsGroup.class})
+    private String smsCode;
+
+    /**
+     * 閭
+     */
+    @NotBlank(message = "{user.email.not.blank}", groups = {EmailGroup.class})
+    @Email(message = "{user.email.not.valid}")
+    private String email;
+
+    /**
+     * 閭code
+     */
+    @NotBlank(message = "{email.code.not.blank}", groups = {EmailGroup.class})
+    private String emailCode;
+
+    /**
+     * 灏忕▼搴廲ode
+     */
+    @NotBlank(message = "{xcx.code.not.blank}", groups = {WechatGroup.class})
+    private String xcxCode;
+
+    /**
+     * 绗笁鏂圭櫥褰曞钩鍙�
+     */
+    @NotBlank(message = "{social.source.not.blank}" , groups = {SocialGroup.class})
+    private String source;
+
+    /**
+     * 绗笁鏂圭櫥褰昪ode
+     */
+    @NotBlank(message = "{social.code.not.blank}" , groups = {SocialGroup.class})
+    private String socialCode;
+
+    /**
+     * 绗笁鏂圭櫥褰晄ocialState
+     */
+    @NotBlank(message = "{social.state.not.blank}" , groups = {SocialGroup.class})
+    private String socialState;
 }

--
Gitblit v1.9.3