From 860838bf06129e530153fae7ae039796197b7778 Mon Sep 17 00:00:00 2001
From: Romesum <zhiyuewu@foxmail.com>
Date: Thu, 7 May 2020 14:21:05 +0800
Subject: [PATCH] =?UTF-8?q?[fix][M]:=E5=B0=86=E5=8A=A0=E5=AF=86=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E6=94=BE=E7=BD=AE=E5=88=B0=E6=9C=8D=E5=8A=A1=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hzu/bookingsystem/controller/UserController.java   | 6 ------
 .../hzu/bookingsystem/service/impl/UserServiceImpl.java    | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java b/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java
index 8c78f59..19380dc 100644
--- a/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java
+++ b/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java
@@ -33,9 +33,6 @@ public class UserController {
     @PostMapping("/login")
     public ResultVO login(@RequestBody UserBean user,
                               HttpServletResponse response) {
-        System.out.println(user);
-        //0.加密密码
-        user.setPassword(MD5Util.md5Encrypt32Upper(user.getPassword()));
 
         //1. openid去和数据库里的数据匹配
         UserBean user1 = userService.findByUnameAndPwd(user.getUsername(),user.getPassword());
@@ -90,9 +87,6 @@ public class UserController {
     //创建用户
     @PostMapping(value = "/addUser", consumes = "application/json")
     public ResultVO addUser(@RequestBody UserBean user) {
-        //0.加密密码
-        user.setPassword(MD5Util.md5Encrypt32Upper(user.getPassword()));
-
         userService.add(user);
         return ResultVOUtil.success();
     }
diff --git a/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java b/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java
index 687f561..05d3e9d 100644
--- a/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java
+++ b/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java
@@ -5,6 +5,7 @@ import com.hzu.bookingsystem.dto.UserDTO;
 import com.hzu.bookingsystem.bean.UserBean;
 import com.hzu.bookingsystem.repository.UserRepository;
 import com.hzu.bookingsystem.service.UserService;
+import com.hzu.bookingsystem.utils.MD5Util;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -20,7 +21,10 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public UserBean add(UserBean user) {
+        // 1.保证ID为空
         user.setUId(null);
+        // 2.加密密码
+        user.setPassword(MD5Util.md5Encrypt32Upper(user.getPassword()));
         return userRepository.save(user);
     }
 
@@ -47,6 +51,9 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public UserBean findByUnameAndPwd(String username, String password) {
+        // 加密密码
+        password = MD5Util.md5Encrypt32Upper(password);
+
         return userRepository.findByUsernameAndPassword(username,password);
     }