From 76dc2398757a4038f1930fb475a55983a9a8077a Mon Sep 17 00:00:00 2001
From: thiszhc <2029364173@qq.com>
Date: 星期四, 15 六月 2023 00:58:01 +0800
Subject: [PATCH] 优化，第三方授权登录
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 99 +++++++++++++++++++++++++++----------------------
1 files changed, 55 insertions(+), 44 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 b152710..3628b05 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
@@ -32,13 +32,18 @@
import org.dromara.common.tenant.exception.TenantException;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.web.config.properties.CaptchaProperties;
-import org.dromara.system.domain.SysAuthUser;
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;
import org.dromara.system.service.ISysTenantService;
+import org.dromara.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -59,6 +64,8 @@
public class SysLoginService {
private final SysUserMapper userMapper;
+ private final ISocialUserService socialUserService;
+ private final ISysUserService userService;
private final CaptchaProperties captchaProperties;
private final ISysPermissionService permissionService;
private final ISysTenantService tenantService;
@@ -160,64 +167,43 @@
return StpUtil.getTokenValue();
}
-
- /**
- * 璁よ瘉鎺堟潈鐧诲綍
- * @param source
- * @throws IOException
- */
/**
* 绀句氦鐧诲綍
+ *
* @param source 鐧诲綍鏉ユ簮
- * @param authUser 鎺堟潈鍝嶅簲瀹炰綋
- * @param request Http璇锋眰瀵硅薄
- * @return 缁熶竴鍝嶅簲瀹炰綋
- * @throws IOException
+ * @param authUser 鎺堟潈鍝嶅簲瀹炰綋
+ * @param request Http璇锋眰瀵硅薄
+ * @return 缁熶竴鍝嶅簲瀹炰綋
*/
public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser, HttpServletRequest request) throws IOException {
// 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
if (!authUser.ok()) {
- return R.fail("瀵逛笉璧凤紝鎺堟潈淇℃伅楠岃瘉涓嶉�氳繃锛岃鑱旂郴绠＄悊鍛�");
+ return R.fail("瀵逛笉璧凤紝鎺堟潈淇℃伅楠岃瘉涓嶉�氳繃锛岃閫�鍑洪噸璇曪紒");
}
AuthUser authUserData = authUser.getData();
- // 鍒ゆ柇鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄨ鐢ㄦ埛
- SysUserVo user = userMapper.selectAuthUserByUuid(source + authUserData.getUuid());
+ // 鏌ヨ绀句氦鐢ㄦ埛淇℃伅锛屽垽鏂槸鍚﹀凡缁忕粦瀹氾紝濡傛灉宸茬粡缁戝畾鍒欑洿鎺ョ櫥褰曪紝鍚﹀垯楠岃瘉鏄惁鐧诲綍锛屾湭鐧诲綍鍒欏厛鐧诲綍鍐嶇粦瀹�
+ SocialUserVo user = socialUserService.selectSocialUserByAuthId(source + authUserData.getUuid());
if (ObjectUtil.isNotNull(user)) {
checkTenant(user.getTenantId());
SysUserVo dbUser = loadUserByUsername(user.getTenantId(), user.getUserName());
- // 鐧诲綍
- LoginHelper.loginByDevice(buildLoginUser(dbUser), DeviceType.auth);
+ LoginHelper.loginByDevice(buildLoginUser(dbUser), DeviceType.SOCIAL);
recordLogininfor(dbUser.getTenantId(), user.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
recordLoginInfo(user.getUserId());
- return R.ok(StpUtil.getTokenValue());
} else {
+ // 鍒ゆ柇鏄惁宸茬櫥褰�
if (LoginHelper.getUserId() == null) {
return R.fail("鎺堟潈澶辫触锛岃鍏堢櫥褰曞啀缁戝畾");
}
- // 缁勮鎺堟潈鐢ㄦ埛淇℃伅
- SysAuthUser sysAuthUser = new SysAuthUser();
- sysAuthUser.setAvatar(authUserData.getAvatar());
- sysAuthUser.setUuid(source + authUserData.getUuid());
- sysAuthUser.setUserId(LoginHelper.getUserId());
- sysAuthUser.setUserName(authUserData.getUsername());
- sysAuthUser.setNickName(authUserData.getNickname());
- sysAuthUser.setEmail(authUserData.getEmail());
- sysAuthUser.setSource(source);
- sysAuthUser.setCreateTime(new Date().toString());
- // 鏂扮敤鎴凤紝缁戝畾绗笁鏂硅处鍙�
- userMapper.insertAuthUser(sysAuthUser);
+ SocialUserBo socialUserBo = new SocialUserBo();
+ socialUserService.insertByBo(setAuthUserData(authUserData, socialUserBo));
SysUserVo lodingData = loadUserByUsername(LoginHelper.getTenantId(), LoginHelper.getUsername());
checkTenant(lodingData.getTenantId());
- LoginHelper.loginByDevice(buildLoginUser(lodingData), DeviceType.auth);
- recordLogininfor(lodingData.getTenantId(), sysAuthUser.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
- recordLoginInfo(sysAuthUser.getUserId());
- return R.ok(StpUtil.getTokenValue());
+ LoginHelper.loginByDevice(buildLoginUser(lodingData), DeviceType.SOCIAL);
+ recordLogininfor(lodingData.getTenantId(), socialUserBo.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+ recordLoginInfo(socialUserBo.getUserId());
}
+ return R.ok(StpUtil.getTokenValue());
}
-
-
-
-
/**
* 閫�鍑虹櫥褰�
@@ -300,9 +286,9 @@
private SysUserVo loadUserByUsername(String tenantId, String username) {
SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
- .select(SysUser::getUserName, SysUser::getStatus)
- .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
- .eq(SysUser::getUserName, username));
+ .select(SysUser::getUserName, SysUser::getStatus)
+ .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
+ .eq(SysUser::getUserName, username));
if (ObjectUtil.isNull(user)) {
log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", username);
throw new UserException("user.not.exists", username);
@@ -318,9 +304,9 @@
private SysUserVo loadUserByPhonenumber(String tenantId, String phonenumber) {
SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
- .select(SysUser::getPhonenumber, SysUser::getStatus)
- .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
- .eq(SysUser::getPhonenumber, phonenumber));
+ .select(SysUser::getPhonenumber, SysUser::getStatus)
+ .eq(TenantHelper.isEnable(), SysUser::getTenantId, tenantId)
+ .eq(SysUser::getPhonenumber, phonenumber));
if (ObjectUtil.isNull(user)) {
log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", phonenumber);
throw new UserException("user.not.exists", phonenumber);
@@ -448,10 +434,35 @@
log.info("鐧诲綍绉熸埛锛歿} 宸茶鍋滅敤.", tenantId);
throw new TenantException("tenant.blocked");
} else if (ObjectUtil.isNotNull(tenant.getExpireTime())
- && new Date().after(tenant.getExpireTime())) {
+ && new Date().after(tenant.getExpireTime())) {
log.info("鐧诲綍绉熸埛锛歿} 宸茶秴杩囨湁鏁堟湡.", tenantId);
throw new TenantException("tenant.expired");
}
}
+
+ public SocialUserBo setAuthUserData(AuthUser authUserData, SocialUserBo socialUser) {
+ socialUser.setUserId(LoginHelper.getUserId());
+ socialUser.setAuthId(authUserData.getSource() + authUserData.getUuid());
+ socialUser.setSource(authUserData.getSource());
+ socialUser.setUserName(authUserData.getUsername());
+ socialUser.setNickName(authUserData.getNickname());
+ socialUser.setAvatar(authUserData.getAvatar());
+ socialUser.setEmail(authUserData.getEmail());
+ socialUser.setOpenId(authUserData.getUuid());
+ socialUser.setAccessToken(authUserData.getToken().getAccessToken());
+ socialUser.setExpireIn(authUserData.getToken().getExpireIn());
+ socialUser.setRefreshToken(authUserData.getToken().getRefreshToken());
+ socialUser.setAccessCode(authUserData.getToken().getAccessCode());
+ socialUser.setUnionId(authUserData.getToken().getUnionId());
+ socialUser.setScope(authUserData.getToken().getScope());
+ socialUser.setTokenType(authUserData.getToken().getTokenType());
+ socialUser.setIdToken(authUserData.getToken().getIdToken());
+ socialUser.setMacAlgorithm(authUserData.getToken().getMacAlgorithm());
+ socialUser.setMacKey(authUserData.getToken().getMacKey());
+ socialUser.setCode(authUserData.getToken().getCode());
+ socialUser.setOauthToken(authUserData.getToken().getOauthToken());
+ socialUser.setOauthTokenSecret(authUserData.getToken().getOauthTokenSecret());
+ return socialUser;
+ }
}
--
Gitblit v1.9.3