Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -1,5 +1,6 @@
package com.ruoyi.auth.service;

import com.ruoyi.system.api.RemoteUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.CacheConstants;
@@ -14,10 +15,10 @@
import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

/**
@@ -27,16 +28,16 @@
 */
@Component
public class SysLoginService {
   @Autowired
   @Resource
   private RemoteUserService remoteUserService;
   
   @Autowired
   @Resource
   private SysPasswordService passwordService;
   
   @Autowired
   @Resource
   private SysRecordLogService recordLogService;
   
   @Autowired
   @Resource
   private RedisService redisService;
   
   /**