From 6c41a1f9c2e12888c4c19da4c654452a8ddcfe3b Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 19 一月 2021 12:43:15 +0800
Subject: [PATCH] 社区后台人脸采集

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 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 cc173a4..3bcf585 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
@@ -240,15 +240,15 @@
     public R changePassword(ChangePasswordVO changePasswordVO) {
         Long userId = changePasswordVO.getUserId();
         SysUserDO sysUserDO1 = userDao.selectById(userId);
-        String oldPassoword = sysUserDO1.getPassword();
+        String dataPassowrd = sysUserDO1.getPassword();
+        String oldPassword = changePasswordVO.getOldPassword();
         String newPassword = changePasswordVO.getNewPassword();
-        if (oldPassoword.equals(newPassword)) {
-            return R.fail("新老密码不能相同");
+        if (oldPassword.equals(newPassword)) {
+            return R.fail("新密码与原密码不能相同");
         }
-         oldPassoword = new BCryptPasswordEncoder().encode(oldPassoword);
         BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
-        if( !encoder.matches(oldPassoword,newPassword)){
-            return R.fail("老密码错误");
+        if( !encoder.matches(oldPassword,dataPassowrd)){
+            return R.fail("原密码错误");
 
         }
         SysUserDO sysUserDO=new SysUserDO();
@@ -329,7 +329,7 @@
                 sysUserDO.setFaceState(1);
                 break;
             case 2:
-                sysUserDO.setFaceState(3);
+                sysUserDO.setFaceState(2);
                 break;
             case 3:
                 break;
@@ -1274,8 +1274,16 @@
         return R.fail();
     }
 
+
+
     public static void main(String[] args) {
         String encode = new BCryptPasswordEncoder().encode("admin123456");
         System.out.println(encode);
+
+
+
+        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+        boolean matches = encoder.matches("admin1234567", encode);
+        System.out.println(matches);
     }
 }

--
Gitblit v1.7.1