From 37496dcec47bc98dc545d94287f39b33eb181bca Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 28 八月 2026 17:36:48 +0800
Subject: [PATCH] docs: 关机交接——菜单布局修复(2bd663b)与实测结论、/import 主线程卡死新发现、sessionStorage 强制登录待办
---
traffic-audit-server/src/main/java/com/trafficaudit/security/controller/LoginController.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/security/controller/LoginController.java b/traffic-audit-server/src/main/java/com/trafficaudit/security/controller/LoginController.java
index 92b43c1..212fd36 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/security/controller/LoginController.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/security/controller/LoginController.java
@@ -9,6 +9,7 @@
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Value;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.HashMap;
@@ -31,6 +32,9 @@
@Resource
private PasswordEncoder passwordEncoder;
+ @Value("${app.captcha.required:true}")
+ private boolean captchaRequired;
+
@PostMapping("/login")
public Result<Map<String, Object>> login(@RequestBody Map<String, Object> params) {
String username = (String) params.get("username");
@@ -38,15 +42,17 @@
String captchaId = (String) params.get("captchaId");
List<String> clickIds = strList(params.get("captchaClickIds"));
- CaptchaService.ConsumeResult cr = captchaService.consume(captchaId, clickIds);
- if (cr == CaptchaService.ConsumeResult.NOT_FOUND) {
- return Result.error(4002, "楠岃瘉鐮佷笉瀛樺湪鎴栧凡杩囨湡锛岃鍒锋柊閲嶈瘯");
- }
- if (cr == CaptchaService.ConsumeResult.NOT_VERIFIED) {
- return Result.error(4003, "璇峰厛瀹屾垚琛屼负楠岃瘉");
- }
- if (cr == CaptchaService.ConsumeResult.WRONG) {
- return Result.error(4001, "琛屼负楠岃瘉鏈�氳繃锛岃閲嶆柊楠岃瘉");
+ if (captchaRequired) {
+ CaptchaService.ConsumeResult cr = captchaService.consume(captchaId, clickIds);
+ if (cr == CaptchaService.ConsumeResult.NOT_FOUND) {
+ return Result.error(4002, "楠岃瘉鐮佷笉瀛樺湪鎴栧凡杩囨湡锛岃鍒锋柊閲嶈瘯");
+ }
+ if (cr == CaptchaService.ConsumeResult.NOT_VERIFIED) {
+ return Result.error(4003, "璇峰厛瀹屾垚琛屼负楠岃瘉");
+ }
+ if (cr == CaptchaService.ConsumeResult.WRONG) {
+ return Result.error(4001, "琛屼负楠岃瘉鏈�氳繃锛岃閲嶆柊楠岃瘉");
+ }
}
if (username == null || username.trim().isEmpty() || password == null || password.isEmpty()) {
@@ -77,6 +83,13 @@
return Result.ok(data);
}
+ @GetMapping("/captcha-config")
+ public Result<Map<String, Object>> captchaConfig() {
+ Map<String, Object> data = new HashMap<>();
+ data.put("required", captchaRequired);
+ return Result.ok(data);
+ }
+
@SuppressWarnings("unchecked")
private List<String> strList(Object o) {
if (o instanceof List) {
--
Gitblit v1.9.1