From c14fd6f05f96c36693db8b3058be2ceb8e7c87d1 Mon Sep 17 00:00:00 2001
From: wenminjie <1036699586@qq.com>
Date: 星期五, 10 七月 2026 09:34:02 +0800
Subject: [PATCH] 访客机侧代码
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java | 68 +++++++++------------------------
1 files changed, 19 insertions(+), 49 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
index 60ed72e..a2a906f 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+++ b/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,52 +42,27 @@
{
String[] split = username.split("_");
username = split[0];
- String type = split[1];
- if("1".equals(type)){
- SysUser user = userService.selectUserByUserName(username);
- if (StringUtils.isNull(user))
- {
- log.info("登录用户：{} 不存在.", username);
- throw new ServiceException(MessageUtils.message("user.not.exists"));
- }
- else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
- {
- 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.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);
+ SysUser user = userService.selectUserByUserName(username);
+ if (StringUtils.isNull(user))
+ {
+ log.info("登录用户：{} 不存在.", username);
+ throw new ServiceException(MessageUtils.message("user.not.exists"));
}
+ else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
+ {
+ 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.validate(user);
+
+ return createLoginUser(user);
}
public UserDetails createLoginUser(SysUser user)
--
Gitblit v1.7.1