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

reset 回滚三方授权修改

Browse Source
This commit is contained in:
疯狂的狮子Li
2024-06-19 10:13:20 +08:00
parent 9a27f42867
commit 093f8ad4da
3 changed files with 8 additions and 23 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,12 +91,9 @@ public class TokenController {
return R.fail(MessageUtils.message("auth.grant.type.blocked"));
}
// 校验租户
RemoteTenantVo tenant = sysLoginService.checkTenant(loginBody.getTenantId());
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(() -> {
@@ -129,7 +126,7 @@ public class TokenController {
* @return 结果
*/
@PostMapping("/social/callback")
public R<LoginVo> socialCallback(@RequestBody SocialLoginBody loginBody) {
public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) {
// 获取第三方登录信息
AuthResponse<AuthUser> response = SocialUtils.loginAuth(
loginBody.getSource(), loginBody.getSocialCode(),
@@ -140,13 +137,7 @@ public class TokenController {
return R.fail(response.getMsg());
}
sysLoginService.socialRegister(authUserData);
LoginVo loginVo = new LoginVo();
RemoteTenantVo tenant = sysLoginService.checkTenant(LoginHelper.getTenantId());
if (StringUtils.isNotBlank(tenant.getTenantId())) {
loginVo.setDomain(tenant.getDomain());
}
return R.ok(loginVo);
return R.ok();
}