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

用户修改

Browse Source
This commit is contained in:
wangys
2025-12-09 17:01:34 +08:00
parent 5d8d1dd320
commit e242ff172c
14 changed files with 67 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
urbanLifelineServ/auth/src/main/java/org/xyzh/auth/strategy/LoginStrategy.java
View File

@@ -1,5 +1,6 @@
package org.xyzh.auth.strategy;
import org.xyzh.api.system.vo.SysUserVO;
import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.sys.TbSysUserDTO;
@@ -36,7 +37,7 @@ public interface LoginStrategy {
* @author yslg
* @since 2025-12-05
*/
TbSysUserDTO findUser(LoginParam loginParam);
SysUserVO findUser(LoginParam loginParam);
/**
* @description 验证凭据（密码或验证码）

6
urbanLifelineServ/auth/src/main/java/org/xyzh/auth/strategy/impl/EmailLoginStrategy.java
View File

@@ -42,10 +42,10 @@ public class EmailLoginStrategy implements LoginStrategy {
}
@Override
public TbSysUserDTO findUser(LoginParam loginParam) {
TbSysUserDTO filter = new TbSysUserDTO();
public SysUserVO findUser(LoginParam loginParam) {
SysUserVO filter = new SysUserVO();
filter.setEmail(loginParam.getEmail());
TbSysUserDTO user = userService.getLoginUser(filter).getData();
SysUserVO user = userService.getLoginUser(filter).getData();
if(user == null) {
return null;
}

7
urbanLifelineServ/auth/src/main/java/org/xyzh/auth/strategy/impl/PasswordLoginStrategy.java
View File

@@ -10,6 +10,7 @@ import org.xyzh.common.utils.NonUtils;
import org.xyzh.common.utils.validation.method.EmailValidateMethod;
import org.xyzh.common.utils.validation.method.PhoneValidateMethod;
import org.xyzh.api.system.service.SysUserService;
import org.xyzh.api.system.vo.SysUserVO;
import java.util.List;
@@ -53,8 +54,8 @@ public class PasswordLoginStrategy implements LoginStrategy {
}
@Override
public TbSysUserDTO findUser(LoginParam loginParam) {
TbSysUserDTO filter = new TbSysUserDTO();
public SysUserVO findUser(LoginParam loginParam) {
SysUserVO filter = new SysUserVO();
EmailValidateMethod emailValidateMethod = new EmailValidateMethod();
PhoneValidateMethod phoneValidateMethod = new PhoneValidateMethod();
if(emailValidateMethod.validate(loginParam.getUsername())){
@@ -66,7 +67,7 @@ public class PasswordLoginStrategy implements LoginStrategy {
}
// 【优化】删除无用的密码编码，SQL查询不使用password字段
// 密码验证在 verifyCredential() 方法中进行
TbSysUserDTO user = userService.getLoginUser(filter).getData();
SysUserVO user = userService.getLoginUser(filter).getData();
if(user == null) {
return null;
}

7
urbanLifelineServ/auth/src/main/java/org/xyzh/auth/strategy/impl/PhoneLoginStrategy.java
View File

@@ -7,6 +7,7 @@ import org.xyzh.auth.strategy.LoginStrategy;
import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.sys.TbSysUserDTO;
import org.xyzh.api.system.service.SysUserService;
import org.xyzh.api.system.vo.SysUserVO;
import org.xyzh.common.redis.service.RedisService;
/**
@@ -41,10 +42,10 @@ public class PhoneLoginStrategy implements LoginStrategy {
}
@Override
public TbSysUserDTO findUser(LoginParam loginParam) {
TbSysUserDTO filter = new TbSysUserDTO();
public SysUserVO findUser(LoginParam loginParam) {
SysUserVO filter = new SysUserVO();
filter.setPhone(loginParam.getPhone());
TbSysUserDTO user = userService.getLoginUser(filter).getData();
SysUserVO user = userService.getLoginUser(filter).getData();
if(user == null) {
return null;
}

7
urbanLifelineServ/auth/src/main/java/org/xyzh/auth/strategy/impl/UsernameLoginStrategy.java
View File

@@ -7,6 +7,7 @@ import org.xyzh.auth.strategy.LoginStrategy;
import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.sys.TbSysUserDTO;
import org.xyzh.api.system.service.SysUserService;
import org.xyzh.api.system.vo.SysUserVO;
/**
* @description UsernameLoginStrategy.java文件描述 用户名登录策略
@@ -36,10 +37,10 @@ public class UsernameLoginStrategy implements LoginStrategy {
}
@Override
public TbSysUserDTO findUser(LoginParam loginParam) {
TbSysUserDTO filter = new TbSysUserDTO();
public SysUserVO findUser(LoginParam loginParam) {
SysUserVO filter = new SysUserVO();
filter.setUsername(loginParam.getUsername());
TbSysUserDTO user = userService.getLoginUser(filter).getData();
SysUserVO user = userService.getLoginUser(filter).getData();
if(user == null) {
return null;
}

7
urbanLifelineServ/auth/src/main/java/org/xyzh/auth/strategy/impl/WechatLoginStrategy.java
View File

@@ -6,6 +6,7 @@ import org.xyzh.auth.strategy.LoginStrategy;
import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.sys.TbSysUserDTO;
import org.xyzh.api.system.service.SysUserService;
import org.xyzh.api.system.vo.SysUserVO;
/**
* @description WechatLoginStrategy.java文件描述 微信登录策略
@@ -32,10 +33,10 @@ public class WechatLoginStrategy implements LoginStrategy {
}
@Override
public TbSysUserDTO findUser(LoginParam loginParam) {
TbSysUserDTO filter = new TbSysUserDTO();
public SysUserVO findUser(LoginParam loginParam) {
SysUserVO filter = new SysUserVO();
filter.setWechatId(loginParam.getWechatId());
TbSysUserDTO user = userService.getLoginUser(filter).getData();
SysUserVO user = userService.getLoginUser(filter).getData();
if(user == null) {
return null;
}