From 16b704d18a875d1fb63827aaa507790ba2bef5be Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 23 四月 2024 11:44:13 +0800
Subject: [PATCH] JK最终代码提交
---
guns-management/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java | 23 +++++++++++++----------
1 files changed, 13 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..cc30bb4 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,11 +9,11 @@
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;
@@ -83,14 +81,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