From 1088a5eb3dc0eab348728b822bc2a6474240a163 Mon Sep 17 00:00:00 2001
From: xiaoyu <17601026937@163.com>
Date: Thu, 17 Jun 2021 09:04:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E8=AE=BE=E7=BD=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0Base64=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java | 7 ++++---
 .../com/jeequan/jeepay/mch/ctrl/CurrentUserController.java | 7 ++++---
 .../jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java
index 251b4b2..0430a3f 100644
--- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java
+++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java
@@ -15,6 +15,7 @@
  */
 package com.jeequan.jeepay.mgr.ctrl;
 
+import cn.hutool.core.codec.Base64;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jeequan.jeepay.core.aop.MethodLog;
@@ -118,14 +119,14 @@ public class CurrentUserController extends CommonCtrl{
 	@MethodLog(remark = "修改密码")
 	public ApiRes modifyPwd() throws BizException{
 
-		//更改密码， 验证当前用户信息
-		String currentUserPwd = getValStringRequired("originalPwd"); //当前用户登录密码
+		//更改密码，验证当前用户信息
+		String currentUserPwd = Base64.decodeStr(getValStringRequired("originalPwd")); //当前用户登录密码
 		//验证当前密码是否正确
 		if(!sysUserAuthService.validateCurrentUserPwd(currentUserPwd)){
 			throw new BizException("原密码验证失败！");
 		}
 
-		String opUserPwd = getValStringRequired("confirmPwd");
+		String opUserPwd = Base64.decodeStr(getValStringRequired("confirmPwd"));
 
 		// 验证原密码与新密码是否相同
 		if (opUserPwd.equals(currentUserPwd)) {
diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java
index 51989df..ae4f19c 100644
--- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java
+++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java
@@ -15,6 +15,7 @@
  */
 package com.jeequan.jeepay.mch.ctrl;
 
+import cn.hutool.core.codec.Base64;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jeequan.jeepay.core.aop.MethodLog;
@@ -124,14 +125,14 @@ public class CurrentUserController extends CommonCtrl{
 
 		Long opSysUserId = getValLongRequired("recordId");   //操作员ID
 
-		//更改密码， 验证当前用户信息
-		String currentUserPwd = getValStringRequired("originalPwd"); //当前用户登录密码
+		//更改密码，验证当前用户信息
+		String currentUserPwd = Base64.decodeStr(getValStringRequired("originalPwd")); //当前用户登录密码
 		//验证当前密码是否正确
 		if(!sysUserAuthService.validateCurrentUserPwd(currentUserPwd)){
 			throw new BizException("原密码验证失败！");
 		}
 
-		String opUserPwd = getValStringRequired("confirmPwd");
+		String opUserPwd = Base64.decodeStr(getValStringRequired("confirmPwd"));
 
 		// 验证原密码与新密码是否相同
 		if (opUserPwd.equals(currentUserPwd)) {
diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
index dbf2d87..1df5a2e 100644
--- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
+++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
@@ -153,7 +153,7 @@ public class SysUserController extends CommonCtrl {
 		Boolean resetPass = getReqParamJSON().getBoolean("resetPass");
 		if (resetPass != null && resetPass) {
 			//判断是否重置密码
-			String updatePwd = getReqParamJSON().getBoolean("defaultPass") == false? Base64.decodeStr(getValStringRequired("confirmPwd")):CS.DEFAULT_PWD;
+			String updatePwd = getReqParamJSON().getBoolean("defaultPass") == false ? Base64.decodeStr(getValStringRequired("confirmPwd")) : CS.DEFAULT_PWD;
 			sysUserAuthService.resetAuthInfo(sysUser.getSysUserId(), null, null, updatePwd, CS.SYS_TYPE.MCH);
 			// 删除用户redis缓存信息
 			authService.delAuthentication(Arrays.asList(recordId));
-- 
GitLab