wenminjie
2026-07-10 c14fd6f05f96c36693db8b3058be2ceb8e7c87d1
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -9,9 +9,7 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TAppUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -34,9 +32,6 @@
    @Autowired
    private ISysUserService userService;
    @Autowired
    private TAppUserService appUserService;
    @Autowired
    private SysPasswordService passwordService;
    @Autowired
@@ -47,8 +42,7 @@
    {
        String[] split = username.split("_");
        username = split[0];
        String type = split[1];
        if("1".equals(type)){
            SysUser user = userService.selectUserByUserName(username);
            if (StringUtils.isNull(user))
            {
@@ -69,30 +63,6 @@
            passwordService.validate(user);
            return createLoginUser(user);
        }else {
            TAppUser user = appUserService.getOne(Wrappers.<TAppUser>lambdaQuery().eq(TAppUser::getAccount,username));
            if (StringUtils.isNull(user))
            {
                log.info("登录用户:{} 不存在.", username);
                throw new ServiceException(MessageUtils.message("user.not.exists"));
            }
            else if (user.getDisabled())
            {
                log.info("登录用户:{} 已被删除.", username);
                throw new ServiceException(MessageUtils.message("user.password.delete"));
            }
            else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
            {
                log.info("登录用户:{} 已被停用.", username);
                throw new ServiceException(MessageUtils.message("user.blocked"));
            }
            passwordService.validateApp(user);
            TAppUserResp appUserResp = new TAppUserResp();
            BeanUtils.copyProperties(user,appUserResp);
            return createLoginUserApp(appUserResp);
        }
    }
    public UserDetails createLoginUser(SysUser user)