From 0c5de007b7598de81f1959291f82a2ff1c590f03 Mon Sep 17 00:00:00 2001
From: "@t2652009480" <2652009480@qq.com>
Date: Fri, 18 Aug 2023 14:45:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=AE=E5=BD=95=E7=9A=84?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/controller/UserController.java       | 64 ++++---------------
 .../zhiyun03/utils/common/ResultCode.java     |  2 +-
 2 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java b/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java
index 9d29c8f..4ca7e31 100644
--- a/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java
+++ b/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java
@@ -4,6 +4,7 @@ import com.zhiyun.zhiyun03.user.entity.User;
 import com.zhiyun.zhiyun03.user.service.UserService;
 import com.zhiyun.zhiyun03.user.vo.UserVo;
 import com.zhiyun.zhiyun03.utils.common.JsonResult;
+import com.zhiyun.zhiyun03.utils.common.ResultCode;
 import com.zhiyun.zhiyun03.utils.exception.ServiceException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,61 +24,22 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
 
-@Controller
+@RestController
 @RequestMapping("/user")
 public class UserController {
-   @Autowired
-   UserService userService;
+    @Autowired
+    UserService userService;
 
     @RequestMapping(path = "/login")
-    public String login(HttpServletRequest request, HttpServletResponse response, @RequestParam(name = "username") String username, @RequestParam(name = "password") String password, Model model) {
-//        //1、讲页面提交的密码进行md5加密
-//        password = DigestUtils.md5DigestAsHex(password.getBytes());
-
-        //2、根据用户名查数据库
-        User login = userService.login(username,password);
-        String url="";
-        //3、判断是否查询到
-        if (login != null){
-            //(2)成功 1.把数据保存到session中  2.跳转页面到index.html
-            request.getSession().setAttribute("USER",login);
-            url="layui-v2.6.8/index";
-
-//            try {
-//                response.sendRedirect("/static/layui-v2.6.8/index.html");
-//            } catch (IOException e) {
-//                throw new RuntimeException(e);
-//            }
-
-        }else{
-            //(3)失败 1.把异常信息保存到model中  2.跳转到login.html
-            model.addAttribute("msg","登录名或者密码错误");
-            url = "layui-v2.6.8/login";
+    public JsonResult<User> login(HttpServletRequest request, @RequestParam(name = "userCode") String username, @RequestParam(name = "password") String password) {
+        if (username.isEmpty() || password.isEmpty()) {
+            return JsonResult.error(ResultCode.NO_NULL_ERROR, "账号或密码不能为空");
         }
-        //经过视图解析器，最终路径解析为 前缀(/templates/)+url+后缀(.html)
-        return url;
-
+        User login = userService.login(username, password);
+        if (login != null) {
+            request.getSession().setAttribute("USER", login);
+            return JsonResult.success(ResultCode.SUCCESS);
+        }
+        return JsonResult.error(ResultCode.USER_ACCOUNT_ERROR, "账号或密码错误");
     }
-
-
-//    @RequestMapping("/login1")
-//    public JsonResult login1(HttpRequest request,HttpServletResponse response, @RequestBody UserVo userVo){
-//        if (userVo.getUsername().isEmpty()&userVo.getPassword().isEmpty())
-//        {
-//            throw  new ServiceException("300","账号密码不为空");
-//        }
-//
-//       User user =userService.login(userVo.getUsername(), userVo.getPassword());
-//        if (user!=null)
-//        {
-//            try {
-//
-//
-//            } catch (IOException e) {
-//                throw new RuntimeException(e);
-//            }
-//        }
-//        return JsonResult.success();
-//    }
-
 }
diff --git a/src/main/java/com/zhiyun/zhiyun03/utils/common/ResultCode.java b/src/main/java/com/zhiyun/zhiyun03/utils/common/ResultCode.java
index 8c12acd..3253cea 100644
--- a/src/main/java/com/zhiyun/zhiyun03/utils/common/ResultCode.java
+++ b/src/main/java/com/zhiyun/zhiyun03/utils/common/ResultCode.java
@@ -9,7 +9,7 @@ public enum ResultCode {
     USER_EXIST_ERROR("2001", "用户已存在"),
     USER_ACCOUNT_ERROR("2002", "账号或密码错误"),
     USER_NOT_EXIST_ERROR("2003", "未找到用户"),
-    NO_NULL_ERROR("3001", "账号或密码错误"),
+    NO_NULL_ERROR("3001", "账号或密码不能为空"),
     PARAM_LOST_ERROR("2004", "参数缺失"),
     PARAM_PASSWORD_ERROR("2005", "原密码输入错误"),
     ;