From 62f5d3dcda4d00a4bba7e8c187a4a00340ad721b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E7=AB=9E=E7=94=B1?= <1193626695@qq.com> Date: Mon, 8 Dec 2025 11:05:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/campus/water/config/SecurityConfig.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/campus/water/config/SecurityConfig.java b/src/main/java/com/campus/water/config/SecurityConfig.java index 55c06fa..8b2b559 100644 --- a/src/main/java/com/campus/water/config/SecurityConfig.java +++ b/src/main/java/com/campus/water/config/SecurityConfig.java @@ -12,7 +12,6 @@ import org.springframework.security.config.annotation.method.configuration.Enabl import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @@ -27,7 +26,7 @@ import java.util.Arrays; */ @Configuration @EnableWebSecurity -@EnableMethodSecurity(prePostEnabled = true) // 启用方法级权限控制 +@EnableMethodSecurity() // 启用方法级权限控制 public class SecurityConfig { private final UserDetailsServiceImpl userDetailsService; -- 2.34.1 From c86a25a9848d833f783d96831c573d034932ee2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E7=AB=9E=E7=94=B1?= <1193626695@qq.com> Date: Tue, 9 Dec 2025 08:34:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E4=B8=80repairman=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/campus/water/service/LoginService.java | 6 +++--- .../campus/water/service/RegisterService.java | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/campus/water/service/LoginService.java b/src/main/java/com/campus/water/service/LoginService.java index 9e5ed92..a8c82e2 100644 --- a/src/main/java/com/campus/water/service/LoginService.java +++ b/src/main/java/com/campus/water/service/LoginService.java @@ -33,7 +33,7 @@ public class LoginService { return switch (userType) { case "admin" -> handleAdminLogin(username, password); case "user" -> handleUserLogin(username, password); - case "repairer" -> handleRepairerLogin(username, password); + case "repairman" -> handleRepairmanLogin(username, password); default -> throw new RuntimeException("无效的用户类型：" + userType); }; } @@ -84,7 +84,7 @@ public class LoginService { return createLoginVO(user.getStudentId(), username, "user"); } - private LoginVO handleRepairerLogin(String username, String password) { + private LoginVO handleRepairmanLogin(String username, String password) { // 此处将RepairerAuthPO改为RepairerAuth RepairerAuth repairer = repairerAuthRepository.findByUsername(username) .orElseThrow(() -> new RuntimeException("维修人员不存在")); @@ -93,7 +93,7 @@ public class LoginService { throw new RuntimeException("密码错误"); } - return createLoginVO(repairer.getRepairmanId(), username, "repairer"); + return createLoginVO(repairer.getRepairmanId(), username, "repairman"); } private LoginVO createLoginVO(String userId, String username, String userType) { diff --git a/src/main/java/com/campus/water/service/RegisterService.java b/src/main/java/com/campus/water/service/RegisterService.java index 61abe87..e7de19d 100644 --- a/src/main/java/com/campus/water/service/RegisterService.java +++ b/src/main/java/com/campus/water/service/RegisterService.java @@ -40,8 +40,8 @@ public class RegisterService { case "user": handleUserRegister(username, encryptedPwd, request); break; - case "repairer": - handleRepairerRegister(username, encryptedPwd, request); + case "repairman": + handleRepairmanRegister(username, encryptedPwd, request); break; default: throw new RuntimeException("无效的用户类型：" + userType); @@ -89,7 +89,7 @@ public class RegisterService { } // 维修人员注册逻辑保持不变 - private void handleRepairerRegister(String username, String password, RegisterRequest request) { + private void handleRepairmanRegister(String username, String password, RegisterRequest request) { if (repairerAuthRepository.existsByUsername(username)) { throw new RuntimeException("维修人员用户名已存在"); } @@ -97,12 +97,12 @@ public class RegisterService { throw new RuntimeException("维修人员ID已被注册"); } - RepairerAuth repairer = new RepairerAuth(); - repairer.setUsername(username); - repairer.setPassword(password); - repairer.setRepairmanId(request.getRepairmanId()); - repairer.setAccountStatus(RepairerAuth.AccountStatus.active); + RepairerAuth repairman = new RepairerAuth(); + repairman.setUsername(username); + repairman.setPassword(password); + repairman.setRepairmanId(request.getRepairmanId()); + repairman.setAccountStatus(RepairerAuth.AccountStatus.active); - repairerAuthRepository.save(repairer); + repairerAuthRepository.save(repairman); } } \ No newline at end of file -- 2.34.1