From 9a9fa2ce00378f11a174cadc7e20edac0d867e6e Mon Sep 17 00:00:00 2001
From: Romesum <zhiyuewu@foxmail.com>
Date: Wed, 6 May 2020 17:33:14 +0800
Subject: [PATCH] =?UTF-8?q?[fix][M]:=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserController.java              | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 668d24e..d973a8c 100644
--- a/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java
+++ b/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java
@@ -4,6 +4,7 @@ import com.hzu.bookingsystem.VO.ResultVO;
 import com.hzu.bookingsystem.bean.UserBean;
 import com.hzu.bookingsystem.service.UserService;
 import com.hzu.bookingsystem.utils.CookieUtil;
+import com.hzu.bookingsystem.utils.MD5Util;
 import com.hzu.bookingsystem.utils.ResultVOUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -31,6 +32,9 @@ public class UserController {
     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());
         System.out.println(user1);
@@ -64,10 +68,21 @@ public class UserController {
     }
 
 
+    // 查看个人信息
+    @GetMapping(value = "/getUserInfo")
+    public ResultVO getUserInfo(HttpServletRequest request){
+        Integer uId = getUIdByCookie(request);
+        UserBean user = userService.findById(uId);
+        user.setPassword(null);
+        return ResultVOUtil.success(user);
+    }
 
     //创建用户
     @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();
     }
@@ -92,7 +107,9 @@ public class UserController {
         if (uId == null){
             return ResultVOUtil.error(-1,"未找到该用户ID");
         }
+        UserBean old = userService.findById(uId);
         user.setUId(uId);
+        user.setPassword(old.getPassword());
         userService.update(user);
         return ResultVOUtil.success();
     }