From c92c99c8da92fd9d7dc4af9534419d0679fcc207 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 02 八月 2023 14:21:12 +0800
Subject: [PATCH] update 优化 SysLoginService#socialRegister 判断是否已经绑定用户 ; fix 修正 SysSocialServiceImpl#selectByAuthId 重复数据报错问题 ;

---
 ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java |   98 +++++++++++--------------------------------------
 1 files changed, 22 insertions(+), 76 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 88500b2..ba5840a 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
@@ -1,27 +1,24 @@
 package org.dromara.web.service;
 
 import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.enums.DeviceType;
 import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.core.enums.TenantStatus;
-import org.dromara.common.core.enums.UserStatus;
 import org.dromara.common.core.exception.user.UserException;
-import org.dromara.common.core.utils.*;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.log.event.LogininforEvent;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
@@ -36,7 +33,6 @@
 import org.dromara.system.service.ISysPermissionService;
 import org.dromara.system.service.ISysSocialService;
 import org.dromara.system.service.ISysTenantService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -66,66 +62,30 @@
     private final ISysSocialService sysSocialService;
     private final SysUserMapper userMapper;
 
+
     /**
-     * 绀句氦鐧诲綍
+     * 缁戝畾绗笁鏂圭敤鎴�
      *
-     * @param source   鐧诲綍鏉ユ簮
-     * @param authUser 鎺堟潈鍝嶅簲瀹炰綋
+     * @param authUserData 鎺堟潈鍝嶅簲瀹炰綋
      * @return 缁熶竴鍝嶅簲瀹炰綋
      */
-    public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser) {
-        // 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
-        if (!authUser.ok()) {
-            return R.fail("瀵逛笉璧凤紝鎺堟潈淇℃伅楠岃瘉涓嶉�氳繃锛岃閫�鍑洪噸璇曪紒");
-        }
-        AuthUser authUserData = authUser.getData();
-        SysSocialVo social = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid());
-        if (ObjectUtil.isNotNull(social)) {
-            SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getUserId, social.getUserId()));
-            // 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
-            return loginAndRecord(user.getTenantId(), user.getUserName(), authUserData);
-        } else {
-            // 鍒ゆ柇鏄惁宸茬櫥褰�
-            if (!StpUtil.isLogin()) {
-                return R.fail("鎺堟潈澶辫触锛岃鍏堢櫥褰曟墠鑳界粦瀹�");
-            }
-            SysSocialBo bo = new SysSocialBo();
+    public void socialRegister(AuthUser authUserData) {
+        String authId = authUserData.getSource() + authUserData.getUuid();
+        // 鏌ヨ鏄惁宸茬粡缁戝畾鐢ㄦ埛
+        SysSocialVo vo = sysSocialService.selectByAuthId(authId);
+        if (ObjectUtil.isEmpty(vo)) {
+            // 娌℃湁缁戝畾鐢ㄦ埛, 鏂板鐢ㄦ埛淇℃伅
+            SysSocialBo bo = BeanUtil.toBean(authUserData, SysSocialBo.class);
+            BeanUtil.copyProperties(authUserData.getToken(), bo);
             bo.setUserId(LoginHelper.getUserId());
-            bo.setAuthId(authUserData.getSource() + authUserData.getUuid());
-            bo.setSource(authUserData.getSource());
+            bo.setAuthId(authId);
+            bo.setOpenId(authUserData.getUuid());
             bo.setUserName(authUserData.getUsername());
             bo.setNickName(authUserData.getNickname());
-            bo.setAvatar(authUserData.getAvatar());
-            bo.setOpenId(authUserData.getUuid());
-            BeanUtils.copyProperties(authUserData.getToken(), bo);
-
             sysSocialService.insertByBo(bo);
-            SysUserVo sysUser = loadUserByUsername(LoginHelper.getTenantId(), LoginHelper.getUsername());
-            // 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
-            return loginAndRecord(sysUser.getTenantId(), sysUser.getUserName(), authUserData);
         }
     }
 
-    /**
-     * 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
-     *
-     * @param tenantId 绉熸埛ID
-     * @param userName 鐢ㄦ埛鍚�
-     * @param authUser 鎺堟潈鐢ㄦ埛淇℃伅
-     * @return 缁熶竴鍝嶅簲瀹炰綋
-     */
-    private R<String> loginAndRecord(String tenantId, String userName, AuthUser authUser) {
-        checkTenant(tenantId);
-        SysUserVo user = loadUserByUsername(tenantId, userName);
-        SaLoginModel model = new SaLoginModel();
-        model.setDevice(DeviceType.PC.getDevice());
-        // 鐢熸垚token
-        LoginHelper.login(buildLoginUser(user), model);
-        recordLogininfor(user.getTenantId(), userName, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
-        recordLoginInfo(user.getUserId());
-        return R.ok(StpUtil.getTokenValue());
-    }
 
     /**
      * 閫�鍑虹櫥褰�
@@ -137,9 +97,13 @@
                 // 瓒呯骇绠$悊鍛� 鐧诲嚭娓呴櫎鍔ㄦ�佺鎴�
                 TenantHelper.clearDynamic();
             }
-            StpUtil.logout();
             recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
         } catch (NotLoginException ignored) {
+        } finally {
+            try {
+                StpUtil.logout();
+            } catch (NotLoginException ignored) {
+            }
         }
     }
 
@@ -161,24 +125,6 @@
         SpringUtils.context().publishEvent(logininforEvent);
     }
 
-
-    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));
-        if (ObjectUtil.isNull(user)) {
-            log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", username);
-            throw new UserException("user.not.exists", username);
-        } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-            log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", username);
-            throw new UserException("user.blocked", username);
-        }
-        if (TenantHelper.isEnable()) {
-            return userMapper.selectTenantUserByUserName(username, tenantId);
-        }
-        return userMapper.selectUserByUserName(username);
-    }
 
     /**
      * 鏋勫缓鐧诲綍鐢ㄦ埛

--
Gitblit v1.9.3