Pre Merge pull request !844 from 孔皮皮/dev-login-body

ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -80,14 +80,12 @@ public class AuthController {
     /**
      * 登录方法
      *
-     * @param body 登录信息
+     * @param loginBody 登录信息
      * @return 结果
      */
     @ApiEncrypt
     @PostMapping("/login")
-    public R<LoginVo> login(@RequestBody String body) {
+    public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody) {
-        LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
-        ValidatorUtils.validate(loginBody);
         // 授权类型和客户端id
         String clientId = loginBody.getClientId();
         String grantType = loginBody.getGrantType();
@@ -102,7 +100,7 @@ public class AuthController {
         // 校验租户
         loginService.checkTenant(loginBody.getTenantId());
         // 登录
-        LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
+        LoginVo loginVo = IAuthStrategy.login(loginBody, client, grantType);
 
         Long userId = LoginHelper.getUserId();
         scheduledExecutorService.schedule(() -> {

ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java

@@ -1,9 +1,8 @@
 package org.dromara.web.service;
 
-
+import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.SpringUtils;
-import org.dromara.system.domain.SysClient;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.web.domain.vo.LoginVo;
 
@@ -12,7 +11,7 @@ import org.dromara.web.domain.vo.LoginVo;
  *
  * @author Michelle.Chung
  */
-public interface IAuthStrategy {
+public interface IAuthStrategy<T extends LoginBody> {
 
     String BASE_NAME = "AuthStrategy";
 
@@ -24,13 +23,13 @@ public interface IAuthStrategy {
      * @param grantType 授权类型
      * @return 登录验证信息
      */
-    static LoginVo login(String body, SysClientVo client, String grantType) {
+    static LoginVo login(LoginBody body, SysClientVo client, String grantType) {
         // 授权类型和客户端id
         String beanName = grantType + BASE_NAME;
         if (!SpringUtils.containsBean(beanName)) {
             throw new ServiceException("授权类型不正确!");
         }
-        IAuthStrategy instance = SpringUtils.getBean(beanName);
+        IAuthStrategy<LoginBody> instance = SpringUtils.getBean(beanName);
         return instance.login(body, client);
     }
 
@@ -41,6 +40,6 @@ public interface IAuthStrategy {
      * @param client 授权管理视图对象
      * @return 登录验证信息
      */
-    LoginVo login(String body, SysClientVo client);
+    LoginVo login(T body, SysClientVo client);
 
 }

ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java

@@ -17,7 +17,6 @@ import org.dromara.common.core.exception.user.UserException;
 import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.ValidatorUtils;
-import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
@@ -38,14 +37,13 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service("email" + IAuthStrategy.BASE_NAME)
 @RequiredArgsConstructor
-public class EmailAuthStrategy implements IAuthStrategy {
+public class EmailAuthStrategy implements IAuthStrategy<EmailLoginBody> {
 
     private final SysLoginService loginService;
     private final SysUserMapper userMapper;
 
     @Override
-    public LoginVo login(String body, SysClientVo client) {
+    public LoginVo login(EmailLoginBody loginBody, SysClientVo client) {
-        EmailLoginBody loginBody = JsonUtils.parseObject(body, EmailLoginBody.class);
         ValidatorUtils.validate(loginBody);
         String tenantId = loginBody.getTenantId();
         String email = loginBody.getEmail();

ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java

@@ -19,7 +19,6 @@ import org.dromara.common.core.exception.user.UserException;
 import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.ValidatorUtils;
-import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
@@ -41,15 +40,14 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service("password" + IAuthStrategy.BASE_NAME)
 @RequiredArgsConstructor
-public class PasswordAuthStrategy implements IAuthStrategy {
+public class PasswordAuthStrategy implements IAuthStrategy<PasswordLoginBody> {
 
     private final CaptchaProperties captchaProperties;
     private final SysLoginService loginService;
     private final SysUserMapper userMapper;
 
     @Override
-    public LoginVo login(String body, SysClientVo client) {
+    public LoginVo login(PasswordLoginBody loginBody, SysClientVo client) {
-        PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class);
         ValidatorUtils.validate(loginBody);
         String tenantId = loginBody.getTenantId();
         String username = loginBody.getUsername();

ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java

@@ -17,7 +17,6 @@ import org.dromara.common.core.exception.user.UserException;
 import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.ValidatorUtils;
-import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
@@ -38,14 +37,13 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service("sms" + IAuthStrategy.BASE_NAME)
 @RequiredArgsConstructor
-public class SmsAuthStrategy implements IAuthStrategy {
+public class SmsAuthStrategy implements IAuthStrategy<SmsLoginBody> {
 
     private final SysLoginService loginService;
     private final SysUserMapper userMapper;
 
     @Override
-    public LoginVo login(String body, SysClientVo client) {
+    public LoginVo login(SmsLoginBody loginBody, SysClientVo client) {
-        SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
         ValidatorUtils.validate(loginBody);
         String tenantId = loginBody.getTenantId();
         String phonenumber = loginBody.getPhonenumber();

ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java

@@ -15,7 +15,6 @@ import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.exception.user.UserException;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.ValidatorUtils;
-import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.social.config.properties.SocialProperties;
 import org.dromara.common.social.utils.SocialUtils;
@@ -41,7 +40,7 @@ import java.util.Optional;
 @Slf4j
 @Service("social" + IAuthStrategy.BASE_NAME)
 @RequiredArgsConstructor
-public class SocialAuthStrategy implements IAuthStrategy {
+public class SocialAuthStrategy implements IAuthStrategy<SocialLoginBody> {
 
     private final SocialProperties socialProperties;
     private final ISysSocialService sysSocialService;
@@ -51,12 +50,11 @@ public class SocialAuthStrategy implements IAuthStrategy {
     /**
      * 登录-第三方授权登录
      *
-     * @param body     登录信息
+     * @param loginBody     登录信息
      * @param client   客户端信息
      */
     @Override
-    public LoginVo login(String body, SysClientVo client) {
+    public LoginVo login(SocialLoginBody loginBody, SysClientVo client) {
-        SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
         ValidatorUtils.validate(loginBody);
         AuthResponse<AuthUser> response = SocialUtils.loginAuth(
                 loginBody.getSource(), loginBody.getSocialCode(),

ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java

@@ -17,7 +17,6 @@ import org.dromara.common.core.domain.model.XcxLoginBody;
 import org.dromara.common.core.domain.model.XcxLoginUser;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ValidatorUtils;
-import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.domain.vo.SysUserVo;
@@ -34,13 +33,12 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service("xcx" + IAuthStrategy.BASE_NAME)
 @RequiredArgsConstructor
-public class XcxAuthStrategy implements IAuthStrategy {
+public class XcxAuthStrategy implements IAuthStrategy<XcxLoginBody> {
 
     private final SysLoginService loginService;
 
     @Override
-    public LoginVo login(String body, SysClientVo client) {
+    public LoginVo login(XcxLoginBody loginBody, SysClientVo client) {
-        XcxLoginBody loginBody = JsonUtils.parseObject(body, XcxLoginBody.class);
         ValidatorUtils.validate(loginBody);
         // xcxCode 为 小程序调用 wx.login 授权后获取
         String xcxCode = loginBody.getXcxCode();

ruoyi-common/ruoyi-common-core/pom.xml

@@ -28,6 +28,11 @@
             <artifactId>spring-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+
         <!-- 自定义验证注解 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java

@@ -1,5 +1,7 @@
 package org.dromara.common.core.domain.model;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
@@ -13,6 +15,14 @@ import java.io.Serializable;
  */
 
 @Data
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "grantType", visible = true, defaultImpl = LoginBody.class)
+@JsonSubTypes({
+    @JsonSubTypes.Type(value = PasswordLoginBody.class, name = "password"),
+    @JsonSubTypes.Type(value = SmsLoginBody.class, name = "sms"),
+    @JsonSubTypes.Type(value = EmailLoginBody.class, name = "email"),
+    @JsonSubTypes.Type(value = SocialLoginBody.class, name = "social"),
+    @JsonSubTypes.Type(value = XcxLoginBody.class, name = "xcx")
+})
 public class LoginBody implements Serializable {
 
     @Serial