From 95f2290cca8dbe9604b79d99f75773a9d34e84d5 Mon Sep 17 00:00:00 2001
From: suvvm <915269675@qq.com>
Date: Tue, 3 Dec 2019 19:57:21 +0800
Subject: [PATCH] =?UTF-8?q?UserController=20=E5=AF=86=E7=A0=81=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BAmd5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserController.java            | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/OnlineSurveyBackEnd/src/main/java/qdu/suvvm/onlinesurvey/controller/UserController.java b/OnlineSurveyBackEnd/src/main/java/qdu/suvvm/onlinesurvey/controller/UserController.java
index b54e3e2..957563e 100644
--- a/OnlineSurveyBackEnd/src/main/java/qdu/suvvm/onlinesurvey/controller/UserController.java
+++ b/OnlineSurveyBackEnd/src/main/java/qdu/suvvm/onlinesurvey/controller/UserController.java
@@ -3,12 +3,14 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.codec.digest.Md5Crypt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import qdu.suvvm.onlinesurvey.mapper.UserMapper;
 import qdu.suvvm.onlinesurvey.pojo.User;
+import qdu.suvvm.onlinesurvey.utils.MD5;
 
 import javax.lang.model.element.NestingKind;
 import javax.servlet.http.HttpServletRequest;
@@ -37,7 +39,7 @@ public class UserController {
     public String insertUser(HttpServletRequest request) {
         User user = new User();
         user.setUsername(request.getParameter("username"));
-        user.setPassword(request.getParameter("password"));
+        user.setPassword(MD5.getMd5(request.getParameter("password")));
         user.setName(request.getParameter("name"));
         user.setPnum(request.getParameter("pnum"));
         user.setEmail(request.getParameter("email"));
@@ -65,7 +67,7 @@ public String insertUser(HttpServletRequest request) {
     public String login(@RequestParam("username") String username, @RequestParam("password") String password) {
         User user = new User();
         user.setUsername(username); // 以传入的信息作为用户名查询用户
-        user.setPassword(password);
+        user.setPassword(MD5.getMd5(password));
         List<User> users = userMapper.getUser(user);
         if (users.isEmpty()) {  // 以传入的信息作为电话查询用户
             user.setUsername(null);
@@ -135,7 +137,7 @@ public String updateUser(HttpServletRequest request) {
         String username = request.getParameter("username");
         String name = request.getParameter("name");
         String gender = request.getParameter("gender");
-        String password = request.getParameter("password");
+        String password = MD5.getMd5(request.getParameter("password"));
         String avatar = request.getParameter("avatar");
         String imgBase64 = request.getParameter("imgBase64");
         User user = new User();
@@ -163,4 +165,30 @@ public String updateUser(HttpServletRequest request) {
         }
         return "error";
     }
+
+    @PostMapping("/getUsers")
+    public String getUsers(@RequestParam(value = "id", required = false) String id, @RequestParam(value = "username", required = false) String username,
+                           @RequestParam(value = "name", required = false) String name, @RequestParam(value = "pnum", required = false) String pnum,
+                           @RequestParam(value = "email", required = false) String email, @RequestParam(value = "gender", required = false) String gender,
+                           @RequestParam(value = "power", required = false) String power) {
+        User user = new User();
+        if(id != null)
+            user.setId(Integer.parseInt(id));
+        if(username != null)
+            user.setUsername(username);
+        if(name != null)
+            user.setName(name);
+        if(pnum != null)
+            user.setPnum(pnum);
+        if(email != null)
+            user.setEmail(email);
+        if(gender != null)
+            user.setGender(gender);
+        if(power != null)
+            user.setPower(Integer.parseInt(power));
+        List<User> users = userMapper.getUser(user);
+        if(users.isEmpty())
+            return "null";
+        return JSONArray.toJSONString(users);
+    }
 }