init

liujie

2025-11-05 fd7dc732ba009ec8aa8308f3270e5ffdf084f2a7

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

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

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.TAppUserResp;
import com.ruoyi.common.core.domain.model.LoginUser;
@@ -9,12 +8,9 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
@@ -33,8 +29,6 @@

    @Autowired
    private ISysUserService userService;
    @Autowired
    private TAppUserService appUserService;

    @Autowired
    private SysPasswordService passwordService;
@@ -70,26 +64,26 @@

            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);

//            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);
//            BeanUtils.copyProperties(user,appUserResp);

            return createLoginUserApp(appUserResp);
        }