From 91d7eee872986f3aaa6e04edf843dd3a0526ba8f Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期二, 01 九月 2026 17:31:33 +0800
Subject: [PATCH] fix: 投资系统基准导入兼容查询结果表头（行号/单位/时期/计划总投资）
---
traffic-audit-server/src/main/java/com/trafficaudit/security/controller/LoginController.java | 129 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 118 insertions(+), 11 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 5424c4e..18572ae 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,11 +1,19 @@
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;
+import java.util.List;
import java.util.Map;
@RestController
@@ -15,18 +23,117 @@
@Resource
private JwtUtils jwtUtils;
- @PostMapping("/login")
- public Result<Map<String, Object>> login(@RequestBody Map<String, String> params) {
- String username = params.get("username");
- String password = params.get("password");
+ @Resource
+ private CaptchaService captchaService;
- 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);
+ @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");
+ 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, "琛屼负楠岃瘉鏈�氳繃锛岃閲嶆柊楠岃瘉");
+ }
}
- return Result.error(401, "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
+
+ 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()));
+ 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);
+ }
+
+ /** 鐢ㄦ埛淇敼鑷繁鐨勫瘑鐮侊細闇�鎻愪緵鍘熷瘑鐮侊紝鏂板瘑鐮佽嚦灏� 6 浣� */
+ @PostMapping("/change-password")
+ public Result<Void> changePassword(@RequestHeader(value = "Authorization", required = false) String auth,
+ @RequestBody Map<String, Object> params) {
+ String username = jwtUtils.resolveUsername(auth);
+ if (username == null) {
+ return Result.error(401, "鏈櫥褰曟垨鐧诲綍宸茶繃鏈�");
+ }
+ String oldPassword = (String) params.get("oldPassword");
+ String newPassword = (String) params.get("newPassword");
+ if (oldPassword == null || oldPassword.isEmpty()) {
+ return Result.error(400, "璇疯緭鍏ュ師瀵嗙爜");
+ }
+ if (newPassword == null || newPassword.length() < 6) {
+ return Result.error(400, "鏂板瘑鐮侀暱搴︿笉鑳藉皯浜� 6 浣�");
+ }
+ if (newPassword.equals(oldPassword)) {
+ return Result.error(400, "鏂板瘑鐮佷笉鑳戒笌鍘熷瘑鐮佺浉鍚�");
+ }
+ User user = userMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getUsername, username));
+ if (user == null) {
+ return Result.error(404, "鐢ㄦ埛涓嶅瓨鍦�");
+ }
+ String encoded = user.getPassword();
+ boolean ok;
+ try {
+ ok = encoded != null && passwordEncoder.matches(oldPassword, encoded);
+ } catch (IllegalArgumentException e) {
+ // 搴撲腑瀵嗙爜涓嶆槸鍚堟硶 BCrypt 鏃跺洖閫�涓烘槑鏂囧姣旓紙涓庣櫥褰曚竴鑷达級
+ ok = encoded != null && encoded.equals(oldPassword);
+ }
+ if (!ok) {
+ return Result.error(400, "鍘熷瘑鐮侀敊璇�");
+ }
+ user.setPassword(passwordEncoder.encode(newPassword));
+ userMapper.updateById(user);
+ return Result.ok(null);
+ }
+
+ @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