From 23c4967b4cb8dbce8277f830f7152d315c5a4a57 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 25 十二月 2023 09:25:17 +0800
Subject: [PATCH] 12.25

---
 guns-management/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java b/guns-management/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java
index 2ff381d..35b2d1e 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java
@@ -16,6 +16,7 @@
 import com.stylefeng.guns.modular.system.model.User;
 import com.stylefeng.guns.modular.system.service.IMenuService;
 import com.stylefeng.guns.modular.system.service.IUserService;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -83,14 +84,18 @@
     /**
      * 跳转到登录页面
      */
+//    @RequestMapping(value = "/login", method = RequestMethod.GET)
+//    public String login(Model model) {
+//        model.addAttribute("updatePaw", false);
+//        if (ShiroKit.isAuthenticated() || ShiroKit.getUser() != null) {
+//            return REDIRECT + "/";
+//        } else {
+//            return "/login.html";
+//        }
+//    }
     @RequestMapping(value = "/login", method = RequestMethod.GET)
-    public String login(Model model) {
-        model.addAttribute("updatePaw", false);
-        if (ShiroKit.isAuthenticated() || ShiroKit.getUser() != null) {
-            return REDIRECT + "/";
-        } else {
-            return "/login.html";
-        }
+    public ResultUtil login(Model model) {
+        return ResultUtil.error("请登录");
     }
 
     /**

--
Gitblit v1.7.1