From 0856f6b514da35bb4af75c5b60a9f362ac129b0f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 16:37:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 563ab20..c35ae63 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
@@ -1,5 +1,6 @@
package com.ruoyi.framework.web.service;
+import com.ruoyi.common.core.domain.model.LoginUserApplet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +38,13 @@
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
{
- SysUser user = userService.selectUserByUserName(username);
+ String name;
+ if(username.contains("applet")){
+ name = username.split("_")[0];
+ }else {
+ name = username;
+ }
+ SysUser user = userService.selectUserByUserName(name);
if (StringUtils.isNull(user))
{
log.info("登录用户：{} 不存在.", username);
@@ -55,12 +62,19 @@
}
passwordService.validate(user);
-
+ if(username.contains("applet")){
+ return createLoginAppletUser(user);
+ }
return createLoginUser(user);
}
public UserDetails createLoginUser(SysUser user)
{
- return new LoginUser(user.getUserId(), Long.valueOf(user.getDeptId()), user, permissionService.getMenuPermission(user));
+ return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
+ }
+
+ public UserDetails createLoginAppletUser(SysUser user)
+ {
+ return new LoginUserApplet(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
}
}
--
Gitblit v1.7.1