From 045e09f029a9d12685d57f4df97df8e1b9bdb1f0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 19 六月 2024 10:12:08 +0800
Subject: [PATCH] reset 回滚三方授权修改
---
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, 8 insertions(+), 24 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 8b83e29..43e689b 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"));
}
// 鏍￠獙绉熸埛
- SysTenantVo tenant = loginService.checkTenant(loginBody.getTenantId());
+ loginService.checkTenant(loginBody.getTenantId());
// 鐧诲綍
LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
@@ -102,10 +102,6 @@
dto.setSessionKeys(List.of(userId));
WebSocketUtils.publishMessage(dto);
}, 3, TimeUnit.SECONDS);
-
- if (StringUtils.isNotBlank(tenant.getTenantId())) {
- loginVo.setDomain(tenant.getDomain());
- }
return R.ok(loginVo);
}
@@ -133,7 +129,7 @@
* @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(),
@@ -144,13 +140,7 @@
return R.fail(response.getMsg());
}
loginService.socialRegister(authUserData);
-
- LoginVo loginVo = new LoginVo();
- SysTenantVo tenant = tenantService.queryByTenantId(LoginHelper.getTenantId());
- if (StringUtils.isNotBlank(tenant.getTenantId())) {
- loginVo.setDomain(tenant.getDomain());
- }
- return R.ok(loginVo);
+ return R.ok();
}
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 149bee4..834afe5 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,9 +51,4 @@
*/
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 d340229..af6e7f5 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 SysTenantVo checkTenant(String tenantId) {
+ public void checkTenant(String tenantId) {
if (!TenantHelper.isEnable()) {
- return null;
+ return;
+ }
+ if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
+ return;
}
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,7 +243,6 @@
log.info("鐧诲綍绉熸埛锛歿} 宸茶秴杩囨湁鏁堟湡.", tenantId);
throw new TenantException("tenant.expired");
}
- return tenant;
}
}
--
Gitblit v1.9.3