bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

usercode bug

This commit is contained in:
sxu 2025-07-17 14:45:42 +08:00
parent b2c23a3ed6
commit 3b7e529f42
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java
View File

@ -97,7 +97,8 @@ public class TokenController {
if (!config.isAdmin()) { if (!config.isAdmin()) {
return R.ok(false); return R.ok(false);
} }
passwordValidatorService.validateLoginParameters(form.getUsername(), form.getPassword()); String password = Sm4Utils.decrypt(form.getPassword());
passwordValidatorService.validateLoginParameters(form.getUsername(), password);
//通过用户名获取人员信息 //通过用户名获取人员信息
R<LoginUser> userResult = remoteUserService.getUserInfo(form.getUsername(), SecurityConstants.INNER); R<LoginUser> userResult = remoteUserService.getUserInfo(form.getUsername(), SecurityConstants.INNER);
// 验证用户查询结果 // 验证用户查询结果
@ -108,7 +109,7 @@ public class TokenController {
// 验证用户状态 // 验证用户状态
passwordValidatorService.validateUserStatus(form.getUsername(), user); passwordValidatorService.validateUserStatus(form.getUsername(), user);
// 验证密码 // 验证密码
passwordService.validate(user, form.getPassword(), System.currentTimeMillis()); passwordService.validate(user, password, System.currentTimeMillis());
// 处理IP校验 // 处理IP校验
passwordValidatorService.handleIpValidation(form.getUsername(), user); passwordValidatorService.handleIpValidation(form.getUsername(), user);
if (userResult.getData() == null || R.FAIL == userResult.getCode()) { if (userResult.getData() == null || R.FAIL == userResult.getCode()) {

2
bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -354,7 +354,7 @@
<update id="updateUser" parameterType="SysUser"> <update id="updateUser" parameterType="SysUser">
update sys_user update sys_user
<set> <set>
<if test="userCode != null and userCode != 0">user_code = #{userCode},</if> <if test="userCode != null">user_code = #{userCode},</if>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if> <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
<if test="userType != null and userType != ''">user_type = #{userType},</if> <if test="userType != null and userType != ''">user_type = #{userType},</if>
<if test="userName != null and userName != ''">user_name = #{userName},</if> <if test="userName != null and userName != ''">user_name = #{userName},</if>