From 5647fb9bdf49e9b56a3795dd6691f4d42445a902 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 12 Oct 2021 10:40:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=A2=9E=E5=8A=A0=E6=97=A7?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayContactsManagementServiceImpl.java     | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
index 97b97b19..c53ee09a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
@@ -120,15 +120,13 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
     @Override
     public void changePassword(CompanyLoginVO companyLoginVO) {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        updatePassword(companyLoginVO, loginUser);
-    }
-
-    private void updatePassword(CompanyLoginVO companyLoginVO, LoginUser loginUser) {
+        String oldPassword = companyLoginVO.getPassword();
         String newPassword = companyLoginVO.getNewPassword();
         String verifyPassword = companyLoginVO.getVerifyPassword();
         String RSAPublicKey = companyLoginVO.getRsaPublicKey();
         String RSAPrivateKey = String.valueOf(redisUtil.get(RSAPublicKey));
         try {
+            oldPassword = CommonUtils.decryptBtRsaPriKey(oldPassword, RSAPrivateKey);
             newPassword = CommonUtils.decryptBtRsaPriKey(newPassword, RSAPrivateKey);
             verifyPassword = CommonUtils.decryptBtRsaPriKey(verifyPassword, RSAPrivateKey);
         }catch (Exception e){
@@ -139,6 +137,15 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
         queryWrapper.eq(PayContactsManagement::getPhone, phone);
         PayContactsManagement contactsManagement = this.getOne(queryWrapper);
 
+        String passwordEncode = PasswordUtil.encrypt(PasswordUtil.decrypt(phone), oldPassword, contactsManagement.getSalt());
+        if (!contactsManagement.getPassword().equals(passwordEncode)) {
+            throw new JeroBootException("旧密码输入错误!");
+        }
+
+        updatePassword(newPassword,verifyPassword,phone);
+    }
+
+    private void updatePassword(String newPassword,String verifyPassword,String phone) {
         if (oConvertUtils.isEmpty(newPassword)) {
             throw new JeroBootException("新密码不允许为空!");
         }
@@ -155,6 +162,18 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
         String token = companyLoginVO.getPassword();
         String username = JwtUtil.getUsername(token);
         LoginUser loginUser = sysBaseAPI.getUserByName(username);
-        updatePassword(companyLoginVO, loginUser);
+        String newPassword = companyLoginVO.getNewPassword();
+        String verifyPassword = companyLoginVO.getVerifyPassword();
+        String RSAPublicKey = companyLoginVO.getRsaPublicKey();
+        String RSAPrivateKey = String.valueOf(redisUtil.get(RSAPublicKey));
+        try {
+            newPassword = CommonUtils.decryptBtRsaPriKey(newPassword, RSAPrivateKey);
+            verifyPassword = CommonUtils.decryptBtRsaPriKey(verifyPassword, RSAPrivateKey);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        String phone = loginUser.getPhone();
+
+        updatePassword(newPassword,verifyPassword,phone);
     }
 }