From a667c85344e8e9b13a1fa1443ec5b7a9f024137b Mon Sep 17 00:00:00 2001
From: thiszhc <2029364173@qq.com>
Date: Sat, 1 Jul 2023 02:31:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=90=8D=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=EF=BC=8C=E5=92=8C=E7=99=BB=E5=BD=95=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86,=E9=80=82=E9=85=8D=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=EF=BC=8C=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=88=87=E6=8D=A2=E6=8E=88=E6=9D=83=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/web/controller/AuthController.java | 1 -
 .../main/java/org/dromara/web/service/SysLoginService.java   | 5 ++---
 2 files changed, 2 insertions(+), 4 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 f5e24325a..c45473474 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
@@ -1,7 +1,6 @@
 package org.dromara.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
-import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
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 10e8e371b..e56c267e6 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
@@ -92,7 +92,7 @@ public class SysLoginService {
             SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getUserId, social.getUserId()));
             // 执行登录
-            return loginAndRecord(user.getTenantId(), user.getUserName(), authUserData);
+            return loginAndRecord(user.getTenantId(), user.getUserName());
         } else {
             return R.fail("你还没有绑定第三方账号，绑定后才可以登录！");
         }
@@ -131,10 +131,9 @@ public class SysLoginService {
      *
      * @param tenantId 租户ID
      * @param userName 用户名
-     * @param authUser 授权用户信息
      * @return 统一响应实体
      */
-    private R<String> loginAndRecord(String tenantId, String userName, AuthUser authUser) {
+    private R<String> loginAndRecord(String tenantId, String userName) {
         checkTenant(tenantId);
         SysUserVo user = loadUserByUsername(tenantId, userName);
         SaLoginModel model = new SaLoginModel();