zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-03-27 10:44:14 +08:00
parent 1972e3e4f4
commit 4027127dfd
64 changed files with 3303 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AllUserDetailsServiceImpl.java
View File

@ -29,7 +29,7 @@ public class AllUserDetailsServiceImpl implements UserDetailsService
@Override
public UserDetails loadUserByUsername(String var) throws UsernameNotFoundException
{
if(var.contains(Constants.BGT)||var.contains(Constants.WGZ)){
if(var.contains(Constants.BGT)||var.contains(Constants.WGZ) ||var.contains(Constants.FBS)){
return appUserDetailsService.loadUserByUsername(var);
} else {
return userDetailsService.loadUserByUsername(var);

12
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AppUserDetailsServiceImpl.java
View File

@ -1,16 +1,15 @@
package com.ruoyi.framework.web.service;
import cn.hutool.core.lang.Validator;
import com.ruoyi.bgt.service.IBgtUserService;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.BgtUser;
import com.ruoyi.common.core.domain.entity.FbsUser;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.exception.BaseException;
import com.ruoyi.fbs.service.IFbsUserService;
import com.ruoyi.wgz.domain.WgzUser;
import com.ruoyi.wgz.service.IWgzUserService;
import org.slf4j.Logger;
@ -39,6 +38,9 @@ public class AppUserDetailsServiceImpl implements UserDetailsService
@Autowired
private IBgtUserService userService;
@Autowired
private IFbsUserService fbsUserService;
@Autowired
private SysPermissionService permissionService;
@ -54,6 +56,10 @@ public class AppUserDetailsServiceImpl implements UserDetailsService
WgzUser wgzUser = wgzUserService.userLongIn(phone.replace(Constants.WGZ, ""));
check(wgzUser,phone);
userDetailsl = createLoginUser(wgzUser,Constants.WGZ);
}else if (phone.contains(Constants.FBS)) {
FbsUser fbsUser = fbsUserService.selectUserByPhone(phone.replace(Constants.FBS, ""));
check(fbsUser,phone);
userDetailsl = createLoginUser(fbsUser,Constants.FBS);
}
return userDetailsl;
}