From cbd59f84fd7d688569cade242e4e9d6d0f381f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 18 Jun 2024 18:44:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E7=99=BB=E5=BD=95=E4=B8=8D=E5=90=8C=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E7=A7=9F=E6=88=B7id?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/web/controller/AuthController.java   | 16 +++++++++++++---
 .../java/org/dromara/web/domain/vo/LoginVo.java  |  5 +++++
 .../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 43e689be3..8b83e29b0 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 @@ public class AuthController {
             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 @@ public class AuthController {
             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 @@ public class AuthController {
      * @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 @@ public class AuthController {
             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 834afe5a1..149bee402 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 @@ public class LoginVo {
      */
     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 af6e7f557..d34022950 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 @@ public class SysLoginService {
      *
      * @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 @@ public class SysLoginService {
             log.info("登录租户：{} 已超过有效期.", tenantId);
             throw new TenantException("tenant.expired");
         }
+        return tenant;
     }
 
 }