Commit 5dc671e9 LN

修改密码bug修改

1 个父辈 526bc5c3
...@@ -31,6 +31,7 @@ import com.neotel.smfcore.security.rest.bean.dto.UserDto; ...@@ -31,6 +31,7 @@ import com.neotel.smfcore.security.rest.bean.dto.UserDto;
import com.neotel.smfcore.security.rest.bean.mapstruct.UserMapper; import com.neotel.smfcore.security.rest.bean.mapstruct.UserMapper;
import com.neotel.smfcore.security.rest.bean.query.UserQueryCriteria; import com.neotel.smfcore.security.rest.bean.query.UserQueryCriteria;
import com.neotel.smfcore.security.rest.bean.vo.UserPassVo; import com.neotel.smfcore.security.rest.bean.vo.UserPassVo;
import com.neotel.smfcore.security.service.UserCacheClean;
import com.neotel.smfcore.security.service.manager.IGroupManager; import com.neotel.smfcore.security.service.manager.IGroupManager;
import com.neotel.smfcore.security.service.manager.IRoleManager; import com.neotel.smfcore.security.service.manager.IRoleManager;
import com.neotel.smfcore.security.service.manager.IUserManager; import com.neotel.smfcore.security.service.manager.IUserManager;
...@@ -82,7 +83,8 @@ public class UserController { ...@@ -82,7 +83,8 @@ public class UserController {
private final FileProperties properties; private final FileProperties properties;
@Autowired @Autowired
private final IGroupManager groupManager; private final IGroupManager groupManager;
@Autowired
private UserCacheClean userCacheClean;
@ApiOperation("导出用户数据") @ApiOperation("导出用户数据")
@GetMapping(value = "/download") @GetMapping(value = "/download")
@PreAuthorize("@el.check('user:list')") @PreAuthorize("@el.check('user:list')")
...@@ -131,7 +133,7 @@ public class UserController { ...@@ -131,7 +133,7 @@ public class UserController {
if(resources.getCheckCode()==null){ if(resources.getCheckCode()==null){
resources.setCheckCode(""); resources.setCheckCode("");
} }
resources.setPassword(passwordEncoder.encode("Constants.USER_DEFAULTP_PWD")); resources.setPassword(passwordEncoder.encode(Constants.USER_DEFAULTP_PWD));
resources.setUpdateDate(new Date()); resources.setUpdateDate(new Date());
resources.setPwdResetTime(new Date()); resources.setPwdResetTime(new Date());
userManager.save(resources); userManager.save(resources);
...@@ -169,6 +171,7 @@ public class UserController { ...@@ -169,6 +171,7 @@ public class UserController {
resources.setPassword(passwordEncoder.encode(Constants.USER_DEFAULTP_PWD)); resources.setPassword(passwordEncoder.encode(Constants.USER_DEFAULTP_PWD));
resources.setPwdResetTime(new Date()); resources.setPwdResetTime(new Date());
userManager.update(resources); userManager.update(resources);
userCacheClean.cleanUserCache(resources.getUsername());
return ResultBean.newOkResult(""); return ResultBean.newOkResult("");
} }
@ApiOperation("个人中心:获取个人资料") @ApiOperation("个人中心:获取个人资料")
...@@ -206,6 +209,7 @@ public class UserController { ...@@ -206,6 +209,7 @@ public class UserController {
throw new ValidateException("smfcore.newPwdError","新密码不能与旧密码相同"); throw new ValidateException("smfcore.newPwdError","新密码不能与旧密码相同");
} }
userManager.updatePass(user.getUsername(), passwordEncoder.encode(newPass)); userManager.updatePass(user.getUsername(), passwordEncoder.encode(newPass));
userCacheClean.cleanUserCache(user.getUsername());
return ResultBean.newOkResult(""); return ResultBean.newOkResult("");
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!