From bdd70fe8882a3f0fe7aaeb73fb39b4ec9bb1c3e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 2 Sep 2021 01:00:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/controller/UserController.java  | 8 +++-----
 .../main/java/com/jsh/erp/service/user/UserService.java   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
index 72fa5edf..17abb1aa 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
@@ -87,7 +87,7 @@ public class UserController {
             int userStatus = -1;
             try {
                 redisService.deleteObjectBySession(request,"userId");
-                userStatus = userService.validateUser(loginName, Tools.md5Encryp(password));
+                userStatus = userService.validateUser(loginName, password);
             } catch (Exception e) {
                 e.printStackTrace();
                 logger.error(">>>>>>>>>>>>>用户  " + loginName + " 登录 login 方法 访问服务层异常====", e);
@@ -223,14 +223,12 @@ public class UserController {
             String oldpwd = jsonObject.getString("oldpassword");
             String password = jsonObject.getString("password");
             User user = userService.getUser(userId);
-            String oldPassword = Tools.md5Encryp(oldpwd);
-            String md5Pwd = Tools.md5Encryp(password);
             //必须和原始密码一致才可以更新密码
             if(demonstrateOpen && user.getLoginName().equals(TEST_USER)){
                 flag = 3; //jsh用户不能修改密码
                 info = "jsh用户不能修改密码";
-            } else if (oldPassword.equalsIgnoreCase(user.getPassword())) {
-                user.setPassword(md5Pwd);
+            } else if (oldpwd.equalsIgnoreCase(user.getPassword())) {
+                user.setPassword(password);
                 flag = userService.updateUserByObj(user); //1-成功
                 info = "修改成功";
             } else {
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
index 1ad8ad3d..ba5689d7 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -496,7 +496,7 @@ public class UserService {
             throw new BusinessRunTimeException(ExceptionConstants.USER_NAME_LIMIT_USE_CODE,
                     ExceptionConstants.USER_NAME_LIMIT_USE_MSG);
         } else {
-            ue.setPassword(Tools.md5Encryp(ue.getPassword()));
+            ue.setPassword(ue.getPassword());
             ue.setIsystem(BusinessConstants.USER_NOT_SYSTEM);
             if (ue.getIsmanager() == null) {
                 ue.setIsmanager(BusinessConstants.USER_NOT_MANAGER);