wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理等

Browse Source
This commit is contained in:
wangys
2025-10-09 16:35:49 +08:00
parent 047bf39842
commit 39d7d0cf93
44 changed files with 3373 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/UserDetailsServiceImpl.java
View File

@@ -43,7 +43,11 @@ public class UserDetailsServiceImpl implements UserDetailsService {
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
TbSysUser filter = new TbSysUser();
filter.setUsername(username);
TbSysUser user = userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
throw new UsernameNotFoundException("用户不存在: " + username);
}
TbSysUser user = users.get(0);
if (user == null) {
throw new UsernameNotFoundException("用户不存在: " + username);
@@ -62,7 +66,11 @@ public class UserDetailsServiceImpl implements UserDetailsService {
public UserDetails loadUserByUserId(String userId) {
TbSysUser filter = new TbSysUser();
filter.setID(userId);
TbSysUser user = userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
throw new UsernameNotFoundException("用户不存在: " + userId);
}
TbSysUser user = users.get(0);
if (user == null) {
throw new UsernameNotFoundException("用户不存在: " + userId);

9
schoolNewsServ/auth/src/main/java/org/xyzh/auth/strategy/impl/EmailLoginStrategy.java
View File

@@ -2,6 +2,9 @@ package org.xyzh.auth.strategy.impl;
import org.springframework.stereotype.Component;
import org.springframework.security.crypto.password.PasswordEncoder;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.xyzh.auth.strategy.LoginStrategy;
import org.xyzh.common.core.domain.LoginParam;
@@ -39,7 +42,11 @@ public class EmailLoginStrategy implements LoginStrategy {
public TbSysUser findUser(LoginParam loginParam) {
TbSysUser filter = new TbSysUser();
filter.setEmail(loginParam.getEmail());
return userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
return null;
}
return users.get(0);
}
@Override

9
schoolNewsServ/auth/src/main/java/org/xyzh/auth/strategy/impl/PasswordLoginStrategy.java
View File

@@ -8,6 +8,9 @@ import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.common.utils.NonUtils;
import org.xyzh.api.system.user.UserService;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,7 +62,11 @@ public class PasswordLoginStrategy implements LoginStrategy {
if (NonUtils.isNotEmpty(loginParam.getPhone())) {
filter.setPhone(loginParam.getPhone());
}
return userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
return null;
}
return users.get(0);
}
@Override

8
schoolNewsServ/auth/src/main/java/org/xyzh/auth/strategy/impl/PhoneLoginStrategy.java
View File

@@ -8,6 +8,8 @@ import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.api.system.user.UserService;
import java.util.List;
/**
* @description PhoneLoginStrategy.java文件描述 手机号登录策略
* @filename PhoneLoginStrategy.java
@@ -39,7 +41,11 @@ public class PhoneLoginStrategy implements LoginStrategy {
public TbSysUser findUser(LoginParam loginParam) {
TbSysUser filter = new TbSysUser();
filter.setPhone(loginParam.getPhone());
return userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
return null;
}
return users.get(0);
}
@Override

8
schoolNewsServ/auth/src/main/java/org/xyzh/auth/strategy/impl/UsernameLoginStrategy.java
View File

@@ -8,6 +8,8 @@ import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.api.system.user.UserService;
import java.util.List;
/**
* @description UsernameLoginStrategy.java文件描述 用户名登录策略
* @filename UsernameLoginStrategy.java
@@ -39,7 +41,11 @@ public class UsernameLoginStrategy implements LoginStrategy {
public TbSysUser findUser(LoginParam loginParam) {
TbSysUser filter = new TbSysUser();
filter.setUsername(loginParam.getUsername());
return userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
return null;
}
return users.get(0);
}
@Override

8
schoolNewsServ/auth/src/main/java/org/xyzh/auth/strategy/impl/WechatLoginStrategy.java
View File

@@ -7,6 +7,8 @@ import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.api.system.user.UserService;
import java.util.List;
/**
* @description WechatLoginStrategy.java文件描述 微信登录策略
* @filename WechatLoginStrategy.java
@@ -35,7 +37,11 @@ public class WechatLoginStrategy implements LoginStrategy {
public TbSysUser findUser(LoginParam loginParam) {
TbSysUser filter = new TbSysUser();
filter.setWechatID(loginParam.getWechatID());
return userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
return null;
}
return users.get(0);
}
@Override