From b00dd93dedca0c151a760fff48191b92ac572545 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 20 一月 2026 18:16:14 +0800
Subject: [PATCH] 优化调整，及数据导入提交1
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysLoginController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysLoginController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysLoginController.java
index 381d69a..6c4f866 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysLoginController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysLoginController.java
@@ -1,5 +1,6 @@
package com.fzzy.sys.controller;
+import com.fzzy.sys.LoginCheckManager;
import com.fzzy.sys.service.LoginService;
import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.core.controller.BaseController;
@@ -12,6 +13,7 @@
import com.ruoyi.framework.shiro.token.PhoneToken;
import com.ruoyi.framework.web.service.ConfigService;
import com.ruoyi.system.service.ISysUserService;
+import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.UsernamePasswordToken;
@@ -33,6 +35,7 @@
*
* @author ruoyi
*/
+@Slf4j
@Controller
public class SysLoginController extends BaseController {
/**
@@ -49,6 +52,9 @@
@Resource
private RedisCache redisCache;
+ @Resource
+ private LoginCheckManager loginCheckManager;
+
@GetMapping("/login")
public String login(HttpServletRequest request, HttpServletResponse response, ModelMap mmap) {
// 濡傛灉鏄疉jax璇锋眰锛岃繑鍥濲son瀛楃涓层��
@@ -61,22 +67,63 @@
String companyId = FrameworkConfig.getCompanyId();
mmap.put("isAllowRegister", Convert.toBool(configService.getKey("sys.account.registerUser", companyId), false));
mmap.put("isAllowRegister", true);
- return "login_new";
+ return "login";
}
+ /**
+ * 鐧诲綍鏂规硶 ---绯荤粺鑷甫
+ *
+ * @param username 鐢ㄦ埛鍚�
+ * @param password 瀵嗙爜
+ * @param rememberMe 璁颁綇鎴�
+ * @return 缁撴灉
+
+ @PostMapping("/login")
+ @ResponseBody
+ public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe) {
+ UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
+ Subject subject = SecurityUtils.getSubject();
+
+ try {
+ subject.login(token);
+ return success();
+ } catch (AuthenticationException e) {
+ log.error("鐧诲綍寮傚父", e);
+ String msg = "鐢ㄦ埛鍚嶆垨鑰呭瘑鐮侀敊璇紝璇锋牳瀵�";
+ return error(msg);
+ }
+ }
+ */
+ /**
+ * 鐧诲綍鏂规硶 ---鑷畾涔夎皟鏁�
+ *
+ * @param username 鐢ㄦ埛鍚�
+ * @param password 瀵嗙爜
+ * @param rememberMe 璁颁綇鎴�
+ * @return 缁撴灉
+ */
@PostMapping("/login")
@ResponseBody
public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe) {
+
UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
Subject subject = SecurityUtils.getSubject();
try {
subject.login(token);
+ //娓呴櫎閿欒淇℃伅
+ loginCheckManager.clearCheckError(username);
return success();
} catch (AuthenticationException e) {
- String msg = "璐﹀彿銆佸瘑鐮佹垨楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�";
-// if (StringUtils.isNotEmpty(e.getMessage())) {
-// msg = e.getMessage();
-// }
+
+ //鏍规嵁鑷畾涔夋崲缂撳瓨鍒ゆ柇淇℃伅
+ String errorMsg = loginCheckManager.getCheckError(username);
+ if(StringUtils.isNotBlank(errorMsg)){
+ //loginCheckManager.clearCheckError(username);
+ return error(errorMsg);
+ }
+
+ log.error("鐢ㄦ埛[" + username + "]鐧诲綍寮傚父,{}", e.getMessage());
+ String msg = "鐧诲綍寮傚父锛屼俊鎭細"+e.getMessage();
return error(msg);
}
}
--
Gitblit v1.9.3