From 2ecb68fbb69cf37c4a6cc4d9cc715e854cdf550b Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 28 Apr 2026 18:36:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=92=8C=E9=AA=8C=E8=AF=81=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yfd/platform/config/SecurityConfig.java | 1 + .../platform/data/service/impl/FishImportServiceImpl.java | 8 ++++---- .../system/controller/SmsVerifyCodeController.java | 6 +++++- .../yfd/platform/system/service/impl/UserServiceImpl.java | 3 +-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java index e249dc7..108616e 100644 --- a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -53,6 +53,7 @@ public class SecurityConfig { .authorizeHttpRequests(auth -> auth .requestMatchers("/user/login").anonymous() .requestMatchers("/user/code").permitAll() + .requestMatchers("/sms/resetPassword").permitAll() .requestMatchers("/system/user/auditUser").permitAll() .requestMatchers("/eng/**").permitAll() .requestMatchers("/env/**").permitAll() diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java index 30a1dbe..37fc0d2 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java @@ -439,7 +439,7 @@ public class FishImportServiceImpl implements IFishImportService { return STATION_NAME_CACHE.get(lowerName); } for (Map.Entry entry : STATION_NAME_CACHE.entrySet()) { - if (entry.getKey().contains(lowerName) || lowerName.contains(entry.getKey())) { + if (entry.getKey().contains(lowerName)) { return entry.getValue(); } } @@ -455,7 +455,7 @@ public class FishImportServiceImpl implements IFishImportService { return FPSS_BH_CACHE.get(lowerName); } for (Map.Entry entry : FPSS_BH_CACHE.entrySet()) { - if (entry.getKey().contains(lowerName) || lowerName.contains(entry.getKey())) { + if (entry.getKey().contains(lowerName)) { return entry.getValue(); } } @@ -487,7 +487,7 @@ public class FishImportServiceImpl implements IFishImportService { return BASE_NAME_CACHE.get(lowerName); } for (Map.Entry entry : BASE_NAME_CACHE.entrySet()) { - if (entry.getKey().contains(lowerName) || lowerName.contains(entry.getKey())) { + if (entry.getKey().contains(lowerName)) { return entry.getValue(); } } @@ -503,7 +503,7 @@ public class FishImportServiceImpl implements IFishImportService { return RIVER_NAME_CACHE.get(lowerName); } for (Map.Entry entry : RIVER_NAME_CACHE.entrySet()) { - if (entry.getKey().contains(lowerName) || lowerName.contains(entry.getKey())) { + if (entry.getKey().contains(lowerName)) { return entry.getValue(); } } diff --git a/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java b/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java index 7daf181..774df19 100644 --- a/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java +++ b/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java @@ -199,7 +199,11 @@ public class SmsVerifyCodeController { if (existUser == null) { return ResponseResult.error("该手机号未注册"); } - + try { + password = RsaUtils.decryptByPrivateKey(privateKey, smsVerifyCodeRequest.getPassword()); + } catch (Exception e) { + return ResponseResult.error("密码解密失败"); + } BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); String encryptedPassword = passwordEncoder.encode(password); diff --git a/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java b/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java index 602f121..383e7a3 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java @@ -577,8 +577,7 @@ public class UserServiceImpl extends ServiceImpl impleme updateWrapper.eq("phone", phone) .set("password", encryptedPassword) .set("pwdresettime", new Timestamp(System.currentTimeMillis())) - .set("lastmodifydate", new Timestamp(System.currentTimeMillis())) - .set("lastmodifier", getUsername()); + .set("lastmodifydate", new Timestamp(System.currentTimeMillis())); return this.update(updateWrapper); }