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 | 82 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 75 insertions(+), 7 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 c035d12..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 @@ -6,11 +6,15 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthUser; import org.dromara.common.core.constant.Constants; import org.dromara.common.core.constant.GlobalConstants; import org.dromara.common.core.constant.TenantConstants; +import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.dto.RoleDTO; import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.XcxLoginUser; @@ -29,14 +33,20 @@ import org.dromara.common.tenant.helper.TenantHelper; 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.vo.SocialUserVo; import org.dromara.system.domain.vo.SysTenantVo; import org.dromara.system.domain.vo.SysUserVo; 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.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.IOException; import java.time.Duration; import java.util.Date; import java.util.List; @@ -53,6 +63,7 @@ public class SysLoginService { private final SysUserMapper userMapper; + private final ISocialUserService socialUserService; private final CaptchaProperties captchaProperties; private final ISysPermissionService permissionService; private final ISysTenantService tenantService; @@ -155,6 +166,63 @@ } /** + * 绀句氦鐧诲綍 + * + * @param source 鐧诲綍鏉ユ簮 + * @param authUser 鎺堟潈鍝嶅簲瀹炰綋 + * @param request Http璇锋眰瀵硅薄 + * @return 缁熶竴鍝嶅簲瀹炰綋 + */ + public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser, HttpServletRequest request) { + // 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛 + if (!authUser.ok()) { + return R.fail("瀵逛笉璧凤紝鎺堟潈淇℃伅楠岃瘉涓嶉�氳繃锛岃閫�鍑洪噸璇曪紒"); + } + AuthUser authUserData = authUser.getData(); + 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("鎺堟潈澶辫触锛岃鍏堢櫥褰曟墠鑳界粦瀹�"); + } + SocialUserBo socialUserBo = new SocialUserBo(); + socialUserBo.setUserId(LoginHelper.getUserId()); + socialUserBo.setAuthId(authUserData.getSource() + authUserData.getUuid()); + socialUserBo.setSource(authUserData.getSource()); + socialUserBo.setUserName(authUserData.getUsername()); + socialUserBo.setNickName(authUserData.getNickname()); + socialUserBo.setAvatar(authUserData.getAvatar()); + socialUserBo.setOpenId(authUserData.getUuid()); + BeanUtils.copyProperties(authUserData.getToken(), socialUserBo); + + socialUserService.insertByBo(socialUserBo); + SysUserVo lodingData = loadUserByUsername(LoginHelper.getTenantId(), LoginHelper.getUsername()); + //鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣� + return loginAndRecord(lodingData.getTenantId(), socialUserBo.getUserName(), authUserData); + } + } + + /** + * 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣� + * + * @param tenantId 绉熸埛ID + * @param userName 鐢ㄦ埛鍚� + * @param authUser 鎺堟潈鐢ㄦ埛淇℃伅 + * @return 缁熶竴鍝嶅簲瀹炰綋 + */ + private R<String> loginAndRecord(String tenantId, String userName, AuthUser authUser) { + checkTenant(tenantId); + SysUserVo dbUser = loadUserByUsername(tenantId, userName); + LoginHelper.loginByDevice(buildLoginUser(dbUser), DeviceType.SOCIAL); + recordLogininfor(dbUser.getTenantId(), userName, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); + recordLoginInfo(dbUser.getUserId()); + return R.ok(StpUtil.getTokenValue()); + } + + /** * 閫�鍑虹櫥褰� */ public void logout() { @@ -235,9 +303,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); @@ -253,9 +321,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); @@ -382,7 +450,7 @@ 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"); } -- Gitblit v1.9.3