From e4a55083ff3a59a6393e95abafd3cdca86ac2cda Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 28 八月 2026 11:39:25 +0800
Subject: [PATCH] docs: 交接更新——验证码跳过开关、目录导入加固、崩溃排查进展
---
traffic-audit-server/src/main/java/com/trafficaudit/security/controller/LoginController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 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 dac86e5..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
@@ -2,14 +2,18 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.trafficaudit.common.Result;
+import com.trafficaudit.security.captcha.CaptchaService;
import com.trafficaudit.security.utils.JwtUtils;
import com.trafficaudit.system.entity.User;
import com.trafficaudit.system.mapper.UserMapper;
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;
+import java.util.List;
import java.util.Map;
@RestController
@@ -18,20 +22,44 @@
@Resource
private JwtUtils jwtUtils;
+
+ @Resource
+ private CaptchaService captchaService;
+
@Resource
private UserMapper userMapper;
+
@Resource
private PasswordEncoder passwordEncoder;
+ @Value("${app.captcha.required:true}")
+ private boolean captchaRequired;
+
@PostMapping("/login")
- public Result<Map<String, Object>> login(@RequestBody Map<String, String> params) {
- String username = params.get("username");
- String password = params.get("password");
+ public Result<Map<String, Object>> login(@RequestBody Map<String, Object> params) {
+ String username = (String) params.get("username");
+ String password = (String) params.get("password");
+ String captchaId = (String) params.get("captchaId");
+ List<String> clickIds = strList(params.get("captchaClickIds"));
+
+ 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()) {
return Result.error(401, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
}
User user = userMapper.selectOne(new LambdaQueryWrapper<User>()
- .eq(User::getUsername, username.trim()));
+ .eq(User::getUsername, username.trim()));
if (user == null || !Integer.valueOf(1).equals(user.getStatus())) {
return Result.error(401, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
}
@@ -54,4 +82,19 @@
data.put("modules", user.getModules() == null ? "" : user.getModules());
return Result.ok(data);
}
-}
\ No newline at end of file
+
+ @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) {
+ return (List<String>) o;
+ }
+ return Collections.emptyList();
+ }
+}
--
Gitblit v1.9.1