This commit is contained in:
zt
2025-04-02 11:09:53 +08:00
parent ed14f2399d
commit 223cae5edc
83 changed files with 2994 additions and 419 deletions

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) ||var.contains(Constants.FBS)){
if(var.contains(Constants.BGT)||var.contains(Constants.WGZ) ||var.contains(Constants.FBS) || var.contains(Constants.ZBF)){
return appUserDetailsService.loadUserByUsername(var);
} else {
return userDetailsService.loadUserByUsername(var);

View File

@ -6,12 +6,14 @@ 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.entity.ZbfUser;
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 com.ruoyi.zbf.service.IZbfUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -41,6 +43,9 @@ public class AppUserDetailsServiceImpl implements UserDetailsService
@Autowired
private IFbsUserService fbsUserService;
@Autowired
private IZbfUserService zbfUserService;
@Autowired
private SysPermissionService permissionService;
@ -60,6 +65,10 @@ public class AppUserDetailsServiceImpl implements UserDetailsService
FbsUser fbsUser = fbsUserService.selectUserByPhone(phone.replace(Constants.FBS, ""));
check(fbsUser,phone);
userDetailsl = createLoginUser(fbsUser,Constants.FBS);
}else if (phone.contains(Constants.ZBF)) {
ZbfUser zbfUser = zbfUserService.selectUserByPhone(phone.replace(Constants.ZBF, ""));
check(zbfUser,phone);
userDetailsl = createLoginUser(zbfUser,Constants.ZBF);
}
return userDetailsl;
}