!382 统一登录，授权

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

@@ -3,10 +3,7 @@ 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.EmailGroup;
-import org.dromara.common.core.validate.auth.PasswordGroup;
-import org.dromara.common.core.validate.auth.SmsGroup;
-import org.dromara.common.core.validate.auth.WechatGroup;
+import org.dromara.common.core.validate.auth.*;
 import org.hibernate.validator.constraints.Length;
 
 import jakarta.validation.constraints.NotBlank;
@@ -103,4 +100,21 @@ public class LoginBody {
     @NotBlank(message = "{xcx.code.not.blank}", groups = {WechatGroup.class})
     private String xcxCode;
 
+    /**
+     * 第三方登录平台
+     */
+    @NotBlank(message = "{social.source.not.blank}" , groups = {SocialGroup.class})
+    private String source;
+
+    /**
+     * 第三方登录code
+     */
+    @NotBlank(message = "{social.code.not.blank}" , groups = {SocialGroup.class})
+    private String socialCode;
+
+    /**
+     * 第三方登录socialState
+     */
+    @NotBlank(message = "{social.state.not.blank}" , groups = {SocialGroup.class})
+    private String socialState;
 }

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

@@ -0,0 +1,21 @@
+package org.dromara.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 第三方登录用户身份权限
+ *
+ * @author thiszhc is 三三
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class SocialLogin extends LoginUser{
+
+    /**
+     * openid
+     */
+    private String openid;
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/SocialGroup.java

@@ -0,0 +1,4 @@
+package org.dromara.common.core.validate.auth;
+
+public interface SocialGroup {
+}

ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java

@@ -1,18 +1,38 @@
 package org.dromara.common.social.utils;
 
+import cn.hutool.core.util.ObjectUtil;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.*;
+import org.dromara.common.core.domain.model.LoginBody;
+import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
+import org.dromara.common.social.config.properties.SocialProperties;
 
 /**
  * 认证授权工具类
  *
  * @author thiszhc
  */
-public class SocialUtils {
+public class SocialUtils  {
+    public static AuthResponse<AuthUser> loginAuth(LoginBody loginBody, SocialProperties socialProperties) throws AuthException {
+        AuthRequest authRequest = getAuthRequest(loginBody.getSource(), socialProperties);
+        AuthCallback callback = new AuthCallback();
+        callback.setCode(loginBody.getSocialCode());
+        callback.setState(loginBody.getSocialState());
+        return authRequest.login(callback);
+    }
 
-    public static AuthRequest getAuthRequest(String source, String clientId,
-                                             String clientSecret, String redirectUri) throws AuthException {
+    public static AuthRequest getAuthRequest(String source,SocialProperties socialProperties) throws AuthException {
+        SocialLoginConfigProperties obj = socialProperties.getType().get(source);
+         if (ObjectUtil.isNull(obj)) {
+            throw new AuthException("不支持的第三方登录类型");
+        }
+        String clientId = obj.getClientId();
+        String clientSecret = obj.getClientSecret();
+        String redirectUri = obj.getRedirectUri();
         AuthRequest authRequest = null;
         switch (source.toLowerCase()) {
             case "dingtalk" ->
@@ -45,13 +65,15 @@ public class SocialUtils {
             case "alipay" ->
                 // 支付宝在创建回调地址时，不允许使用localhost或者127.0.0.1，所以这儿的回调地址使用的局域网内的ip
                 authRequest = new AuthAlipayRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret)
-                    .alipayPublicKey("").redirectUri(redirectUri).build());
+                    .redirectUri(redirectUri).build());
             case "qq" ->
                 authRequest = new AuthQqRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret)
                     .redirectUri(redirectUri).build());
             case "wechat_open" -> authRequest = new AuthWeChatOpenRequest(AuthConfig.builder().clientId(clientId)
                 .clientSecret(clientSecret).redirectUri(redirectUri).build());
             case "csdn" ->
+                //注意,经咨询CSDN官方客服得知，CSDN的授权开放平台已经下线。如果以前申请过的应用，可以继续使用，但是不再支持申请新的应用。
+                // so, 本项目中的CSDN登录只能针对少部分用户使用了
                 authRequest = new AuthCsdnRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret)
                     .redirectUri(redirectUri).build());
             case "taobao" ->