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() .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 loginAndRecord(String tenantId, String userName, AuthUser authUser) { + private R loginAndRecord(String tenantId, String userName) { checkTenant(tenantId); SysUserVo user = loadUserByUsername(tenantId, userName); SaLoginModel model = new SaLoginModel();