From db3376279794f2216be07cc2bb298c9a2faf33e6 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 31 五月 2021 18:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index ed7c464..4a86927 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1825,4 +1825,34 @@
userDao.updateUserArchives(userArchivesVO);
return R.ok();
}
+
+ /**
+ * 修改app用户密码
+ * @param userInfoAppDTO 请求参数
+ * @return 修改结果
+ */
+ @Override
+ public R updateUserPassByApp(EditUserInfoPassAppDTO userInfoAppDTO){
+ if(userInfoAppDTO.getOldPassword().equals(userInfoAppDTO.getNewPassword())){
+ return R.fail("新密码不可与原密码相同");
+ }
+ //查询用户信息
+ SysUserDO userDO = userDao.selectById(userInfoAppDTO.getUserId());
+ if (userDO == null) {
+ return R.fail("未查询到用户信息");
+ }
+ BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+ if (!passwordEncoder.matches(userInfoAppDTO.getOldPassword(),userDO.getPassword())) {
+ return R.fail("原密码错误");
+ }
+ if(!userInfoAppDTO.getNewPassword().equals(userInfoAppDTO.getConfirmPassword())){
+ return R.fail("两次输入的新密码不一致");
+ }
+ userDO.setPassword(passwordEncoder.encode(userInfoAppDTO.getNewPassword()));
+ if (userDao.updateById(userDO) > 0) {
+ return R.ok();
+ } else {
+ return R.fail();
+ }
+ }
}
--
Gitblit v1.7.1