From 50fbfe2cb4271e46f28eb53ea44e93671c7aef49 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 20 六月 2023 12:11:12 +0800
Subject: [PATCH] !370 扩展第三方登录授权功能 * add 查看授权列表 * 优化第三方授权登录 * 第三方授权登录,加上配置 * 优化，第三方授权登录 * 新增加第三方登录授权功能
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
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 479c390..e4aec24 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
@@ -34,11 +34,9 @@
import org.dromara.common.web.config.properties.CaptchaProperties;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.bo.SocialUserBo;
-import org.dromara.system.domain.bo.SysUserBo;
import org.dromara.system.domain.vo.SocialUserVo;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.domain.vo.SysUserVo;
-import org.dromara.system.mapper.SocialUserMapper;
import org.dromara.system.mapper.SysUserMapper;
import org.dromara.system.service.ISocialUserService;
import org.dromara.system.service.ISysPermissionService;
@@ -66,7 +64,6 @@
private final SysUserMapper userMapper;
private final ISocialUserService socialUserService;
- private final ISysUserService userService;
private final CaptchaProperties captchaProperties;
private final ISysPermissionService permissionService;
private final ISysTenantService tenantService;
@@ -176,22 +173,20 @@
* @param request Http璇锋眰瀵硅薄
* @return 缁熶竴鍝嶅簲瀹炰綋
*/
- public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser, HttpServletRequest request) throws IOException {
+ public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser, HttpServletRequest request) {
// 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
if (!authUser.ok()) {
return R.fail("瀵逛笉璧凤紝鎺堟潈淇℃伅楠岃瘉涓嶉�氳繃锛岃閫�鍑洪噸璇曪紒");
}
AuthUser authUserData = authUser.getData();
- String authId = source + authUserData.getUuid();
-
- SocialUserVo user = socialUserService.selectSocialUserByAuthId(authId);
+ SocialUserVo user = socialUserService.selectSocialUserByAuthId(authUserData.getSource() + authUserData.getUuid());
if (ObjectUtil.isNotNull(user)) {
//鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
return loginAndRecord(user.getTenantId(), user.getUserName(), authUserData);
} else {
// 鍒ゆ柇鏄惁宸茬櫥褰�
if (LoginHelper.getUserId() == null) {
- return R.fail("鎺堟潈澶辫触锛岃鍏堢櫥褰曞啀缁戝畾");
+ return R.fail("鎺堟潈澶辫触锛岃鍏堢櫥褰曟墠鑳界粦瀹�");
}
SocialUserBo socialUserBo = new SocialUserBo();
socialUserBo.setUserId(LoginHelper.getUserId());
@@ -201,7 +196,6 @@
socialUserBo.setNickName(authUserData.getNickname());
socialUserBo.setAvatar(authUserData.getAvatar());
socialUserBo.setOpenId(authUserData.getUuid());
- BeanUtils.copyProperties(authUserData, socialUserBo);
BeanUtils.copyProperties(authUserData.getToken(), socialUserBo);
socialUserService.insertByBo(socialUserBo);
--
Gitblit v1.9.3