Quellcode durchsuchen

fix 修复 微软三方对接参数缺失

疯狂的狮子Li vor 7 Monaten
Ursprung
Commit
1d8d93eaa3

+ 7 - 2
ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java

@@ -28,9 +28,14 @@ public class SocialLoginConfigProperties {
     private String redirectUri;
     private String redirectUri;
 
 
     /**
     /**
-     * 是否获取unionId
+     * 是否需要申请unionid,目前只针对qq登录
      */
      */
-    private boolean unionId;
+    private Boolean unionId;
+
+    /**
+     * Microsoft Entra ID(原微软 AAD)中的租户 ID
+     */
+    private String tenantId;
 
 
     /**
     /**
      * Coding 企业名称
      * Coding 企业名称

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

@@ -57,7 +57,7 @@ public class SocialUtils  {
             case "taobao" -> new AuthTaobaoRequest(builder.build(), STATE_CACHE);
             case "taobao" -> new AuthTaobaoRequest(builder.build(), STATE_CACHE);
             case "douyin" -> new AuthDouyinRequest(builder.build(), STATE_CACHE);
             case "douyin" -> new AuthDouyinRequest(builder.build(), STATE_CACHE);
             case "linkedin" -> new AuthLinkedinRequest(builder.build(), STATE_CACHE);
             case "linkedin" -> new AuthLinkedinRequest(builder.build(), STATE_CACHE);
-            case "microsoft" -> new AuthMicrosoftRequest(builder.build(), STATE_CACHE);
+            case "microsoft" -> new AuthMicrosoftRequest(builder.tenantId(obj.getTenantId()).build(), STATE_CACHE);
             case "renren" -> new AuthRenrenRequest(builder.build(), STATE_CACHE);
             case "renren" -> new AuthRenrenRequest(builder.build(), STATE_CACHE);
             case "stack_overflow" -> new AuthStackOverflowRequest(builder.stackOverflowKey(obj.getStackOverflowKey()).build(), STATE_CACHE);
             case "stack_overflow" -> new AuthStackOverflowRequest(builder.stackOverflowKey(obj.getStackOverflowKey()).build(), STATE_CACHE);
             case "huawei" -> new AuthHuaweiV3Request(builder.build(), STATE_CACHE);
             case "huawei" -> new AuthHuaweiV3Request(builder.build(), STATE_CACHE);