From cbd59f84fd7d688569cade242e4e9d6d0f381f15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 18 六月 2024 18:44:04 +0800
Subject: [PATCH] update 优化 三方登录不同域名获取不到租户id问题
---
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 16 +++++++++++++---
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java | 5 +++++
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 11 ++++++-----
3 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
index 43e689b..8b83e29 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -91,7 +91,7 @@
return R.fail(MessageUtils.message("auth.grant.type.blocked"));
}
// 鏍￠獙绉熸埛
- loginService.checkTenant(loginBody.getTenantId());
+ SysTenantVo tenant = loginService.checkTenant(loginBody.getTenantId());
// 鐧诲綍
LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
@@ -102,6 +102,10 @@
dto.setSessionKeys(List.of(userId));
WebSocketUtils.publishMessage(dto);
}, 3, TimeUnit.SECONDS);
+
+ if (StringUtils.isNotBlank(tenant.getTenantId())) {
+ loginVo.setDomain(tenant.getDomain());
+ }
return R.ok(loginVo);
}
@@ -129,7 +133,7 @@
* @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(),
@@ -140,7 +144,13 @@
return R.fail(response.getMsg());
}
loginService.socialRegister(authUserData);
- return R.ok();
+
+ LoginVo loginVo = new LoginVo();
+ SysTenantVo tenant = tenantService.queryByTenantId(LoginHelper.getTenantId());
+ if (StringUtils.isNotBlank(tenant.getTenantId())) {
+ loginVo.setDomain(tenant.getDomain());
+ }
+ return R.ok(loginVo);
}
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java
index 834afe5..149bee4 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java
@@ -51,4 +51,9 @@
*/
private String openid;
+ /**
+ * 鍩熷悕
+ */
+ private String domain;
+
}
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
index af6e7f5..d340229 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -221,17 +221,17 @@
*
* @param tenantId 绉熸埛ID
*/
- public void checkTenant(String tenantId) {
+ public SysTenantVo checkTenant(String tenantId) {
if (!TenantHelper.isEnable()) {
- return;
- }
- if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
- return;
+ return null;
}
if (StringUtils.isBlank(tenantId)) {
throw new TenantException("tenant.number.not.blank");
}
SysTenantVo tenant = tenantService.queryByTenantId(tenantId);
+ if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
+ return tenant;
+ }
if (ObjectUtil.isNull(tenant)) {
log.info("鐧诲綍绉熸埛锛歿} 涓嶅瓨鍦�.", tenantId);
throw new TenantException("tenant.not.exists");
@@ -243,6 +243,7 @@
log.info("鐧诲綍绉熸埛锛歿} 宸茶秴杩囨湁鏁堟湡.", tenantId);
throw new TenantException("tenant.expired");
}
+ return tenant;
}
}
--
Gitblit v1.9.3