From efb3840f9d28534757ea5621df6c260181513e62 Mon Sep 17 00:00:00 2001
From: cys841515238 <8768706+cys841515238@user.noreply.gitee.com>
Date: Thu, 2 Mar 2023 17:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peanut/modules/book/controller/MyUserController.java    | 4 ++--
 .../peanut/modules/sys/controller/SysLoginController.java   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/MyUserController.java b/src/main/java/com/peanut/modules/book/controller/MyUserController.java
index b1baef62..7a2b8c71 100644
--- a/src/main/java/com/peanut/modules/book/controller/MyUserController.java
+++ b/src/main/java/com/peanut/modules/book/controller/MyUserController.java
@@ -214,8 +214,8 @@ public class MyUserController {
         if (user.getPassword() == null) {
             return R.error(500,"当前未设置密码，请使用验证码登录！");
         }
-//        if (MD5Utils.getSaltverifyMD5(password,user.getPassword())){
-        if(true){
+        if (MD5Utils.getSaltverifyMD5(password,user.getPassword())){
+//        if(true){
             R r = sysUserTokenService.createToken(user.getId());
             return R.ok("登陆成功！").put("userInfo",user).put("token",r);
         }else {
diff --git a/src/main/java/com/peanut/modules/sys/controller/SysLoginController.java b/src/main/java/com/peanut/modules/sys/controller/SysLoginController.java
index d2d61a19..7de907d9 100644
--- a/src/main/java/com/peanut/modules/sys/controller/SysLoginController.java
+++ b/src/main/java/com/peanut/modules/sys/controller/SysLoginController.java
@@ -73,9 +73,9 @@ public class SysLoginController extends AbstractController {
 		SysUserEntity user = sysUserService.queryByUserName(form.getUsername());
 
 		//账号不存在、密码错误
-//		if(user == null || !user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
-//			return R.error("账号或密码不正确");
-//		}
+		if(user == null || !user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
+			return R.error("账号或密码不正确");
+		}
 
 		//账号锁定
 		if(user.getStatus() == 0){