From 18dc42cb6b4b4dbfa66a8b893aba097743fd8c26 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 14:14:49 +0800
Subject: [PATCH] 所有代码包含数据库

---
 guns-management/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 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..0cbcdac 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
@@ -1,9 +1,7 @@
 package com.stylefeng.guns.modular.system.controller;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.google.code.kaptcha.Constants;
 import com.stylefeng.guns.core.base.controller.BaseController;
-import com.stylefeng.guns.core.common.exception.InvalidKaptchaException;
 import com.stylefeng.guns.core.log.LogManager;
 import com.stylefeng.guns.core.log.factory.LogTaskFactory;
 import com.stylefeng.guns.core.mutidatasource.annotion.DataSource;
@@ -11,16 +9,17 @@
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.shiro.ShiroUser;
 import com.stylefeng.guns.core.util.ApiMenuFilter;
-import com.stylefeng.guns.core.util.KaptchaUtil;
 import com.stylefeng.guns.core.util.ToolUtil;
 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;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -83,14 +82,19 @@
     /**
      * 跳转到登录页面
      */
+//    @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