public/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-05-04 02:51:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 三方登录不同域名获取不到租户id问题

Browse Source
This commit is contained in:
疯狂的狮子Li
2024-06-18 19:14:22 +08:00
parent 0b8fd7da3b
commit d28cdcd0e1
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java
View File

@@ -91,9 +91,12 @@ public class TokenController {
return R.fail(MessageUtils.message("auth.grant.type.blocked"));
}
// 校验租户
sysLoginService.checkTenant(loginBody.getTenantId());
RemoteTenantVo tenant = sysLoginService.checkTenant(loginBody.getTenantId());
// 登录
LoginVo loginVo = IAuthStrategy.login(body, clientVo, grantType);
if (StringUtils.isNotBlank(tenant.getTenantId())) {
loginVo.setDomain(tenant.getDomain());
}
Long userId = LoginHelper.getUserId();
scheduledExecutorService.schedule(() -> {
@@ -126,7 +129,7 @@ public class TokenController {
* @return 结果
*/
@PostMapping("/social/callback")
public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) {
public R<LoginVo> socialCallback(@RequestBody SocialLoginBody loginBody) {
// 获取第三方登录信息
AuthResponse<AuthUser> response = SocialUtils.loginAuth(
loginBody.getSource(), loginBody.getSocialCode(),
@@ -137,7 +140,13 @@ public class TokenController {
return R.fail(response.getMsg());
}
sysLoginService.socialRegister(authUserData);
return R.ok();
LoginVo loginVo = new LoginVo();
RemoteTenantVo tenant = sysLoginService.checkTenant(LoginHelper.getTenantId());
if (StringUtils.isNotBlank(tenant.getTenantId())) {
loginVo.setDomain(tenant.getDomain());
}
return R.ok(loginVo);
}