From a36de2a232aa4e791bfafb29b8141858d24a67f6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 28 八月 2026 11:39:20 +0800
Subject: [PATCH] feat: 登录行为验证码支持配置跳过（app.captcha.required，测试阶段关闭，正式发布开启）
---
traffic-audit-server/src/main/java/com/trafficaudit/security/controller/LoginController.java | 73 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 16 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 a49a3b9..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
@@ -1,10 +1,15 @@
package com.trafficaudit.security.controller;
+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;
@@ -21,6 +26,15 @@
@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, Object> params) {
String username = (String) params.get("username");
@@ -28,25 +42,52 @@
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 ("admin".equals(username) && "admin123".equals(password)) {
- String token = jwtUtils.generateToken(username);
- Map<String, Object> data = new HashMap<>();
- data.put("token", token);
- data.put("username", username);
- return Result.ok(data);
+ if (username == null || username.trim().isEmpty() || password == null || password.isEmpty()) {
+ return Result.error(401, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
}
- return Result.error(401, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
+ User user = userMapper.selectOne(new LambdaQueryWrapper<User>()
+ .eq(User::getUsername, username.trim()));
+ if (user == null || !Integer.valueOf(1).equals(user.getStatus())) {
+ return Result.error(401, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
+ }
+ String encoded = user.getPassword();
+ boolean ok;
+ try {
+ ok = encoded != null && passwordEncoder.matches(password, encoded);
+ } catch (IllegalArgumentException e) {
+ // 搴撲腑瀵嗙爜涓嶆槸鍚堟硶 BCrypt 鏃跺洖閫�涓烘槑鏂囧姣旓紙閬垮厤鏃ф暟鎹棤娉曠櫥褰曪級
+ ok = encoded != null && encoded.equals(password);
+ }
+ if (!ok) {
+ return Result.error(401, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
+ }
+ String token = jwtUtils.generateToken(username.trim());
+ Map<String, Object> data = new HashMap<>();
+ data.put("token", token);
+ data.put("username", username.trim());
+ data.put("realName", user.getRealName());
+ data.put("modules", user.getModules() == null ? "" : user.getModules());
+ 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")
--
Gitblit v1.9.1