From 11d649e0de6490c53efe6df0ee10212ee6088d14 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 11:59:30 +0800
Subject: [PATCH] 集成中台及正联功能

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

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
index 0847fd7..262d93d 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -89,7 +89,7 @@
     /**
      * 跳转到主页
      */
-    @RequestMapping(value = "/", method = RequestMethod.GET)
+    @RequestMapping(value = "/login", method = RequestMethod.GET)
     public String index(Model model, HttpServletRequest request) throws UnsupportedEncodingException {
         //session中解析用户数据
         HttpSession session = request.getSession();
@@ -130,22 +130,22 @@
                 null == user.getPassWordUpdate()
                         || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis()
                         ? "您的密码已经90天未更换了,请及时更换密码!!!" : "");
-        redisUtil.setStrValue(loginUser.getOnconUUID(), JSON.toJSONString(shiroUser), 600);
+        redisUtil.setStrValue(loginUser.getOnconUUID(), JSON.toJSONString(shiroUser), 36000);
         return "/index.html";
     }
 
-    /**
-     * 跳转到登录页面
-     */
-    @RequestMapping(value = "/login", method = RequestMethod.GET)
-    public String login(Model model) {
-        model.addAttribute("number",0);
-        if (ShiroKit.isAuthenticated() || shiroExtUtil.getUser() != null) {
-            return REDIRECT + "/";
-        } else {
-            return "/login.html";
-        }
-    }
+//    /**
+//     * 跳转到登录页面
+//     */
+//    @RequestMapping(value = "/login", method = RequestMethod.GET)
+//    public String login(Model model) {
+//        model.addAttribute("number",0);
+//        if (shiroExtUtil.authenticated() || shiroExtUtil.getUser() != null) {
+//            return REDIRECT + "/";
+//        } else {
+//            return "/login.html";
+//        }
+//    }
 
     /**
      * 点击登录执行的动作

--
Gitblit v1.7.1