diff --git a/src/main/java/com/guwan/backend/controller/UserController.java b/src/main/java/com/guwan/backend/controller/UserController.java index 242b194..ffa2546 100644 --- a/src/main/java/com/guwan/backend/controller/UserController.java +++ b/src/main/java/com/guwan/backend/controller/UserController.java @@ -137,16 +137,7 @@ public class UserController { } } - @PostMapping("/password/change") - public Result changePassword(@RequestParam String oldPassword, @RequestParam String newPassword) { - try { - userService.changePassword(oldPassword, newPassword); - return Result.success(); - } catch (Exception e) { - log.error("修改密码失败", e); - return Result.error(e.getMessage()); - } - } + @PutMapping("/info") public Result updateUserInfo(@RequestBody @Valid UserDTO userDTO) { diff --git a/src/main/java/com/guwan/backend/security/UserDetailsServiceImpl.java b/src/main/java/com/guwan/backend/security/UserDetailsServiceImpl.java index 95bd3be..5a80475 100644 --- a/src/main/java/com/guwan/backend/security/UserDetailsServiceImpl.java +++ b/src/main/java/com/guwan/backend/security/UserDetailsServiceImpl.java @@ -39,7 +39,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { private UserDetails convertToUserDetailsWithoutPassword(UserDTO user) { List authorities = new ArrayList<>(); - authorities.add(new SimpleGrantedAuthority("ROLE_USER")); + authorities.add(new SimpleGrantedAuthority("Admin")); return new CustomUserDetails( user.getId(), diff --git a/src/main/java/com/guwan/backend/service/UserService.java b/src/main/java/com/guwan/backend/service/UserService.java index 1edf774..b70bdfe 100644 --- a/src/main/java/com/guwan/backend/service/UserService.java +++ b/src/main/java/com/guwan/backend/service/UserService.java @@ -22,7 +22,7 @@ public interface UserService { Long getCurrentUserId(); UserDTO getUserById(Long id); UserDTO updateUserInfo(UserDTO userDTO); - void changePassword(String oldPassword, String newPassword); + void resetPassword(String email); public String refreshToken(String token); diff --git a/src/main/java/com/guwan/backend/service/impl/UserServiceImpl.java b/src/main/java/com/guwan/backend/service/impl/UserServiceImpl.java index c288d0f..6c06378 100644 --- a/src/main/java/com/guwan/backend/service/impl/UserServiceImpl.java +++ b/src/main/java/com/guwan/backend/service/impl/UserServiceImpl.java @@ -10,7 +10,6 @@ import com.guwan.backend.mapper.UserMapper; import com.guwan.backend.security.CustomUserDetails; import com.guwan.backend.service.EmailService; import com.guwan.backend.service.UserService; -import com.guwan.backend.service.VerificationService; import com.guwan.backend.util.JwtUtil; import com.guwan.backend.util.RedisUtil; import com.guwan.backend.util.RedisUtils; @@ -37,7 +36,6 @@ public class UserServiceImpl implements UserService { private final JwtUtil jwtUtil; private final RedisUtil redisUtil; private final RedisUtils redisUtils; - private final VerificationService verificationService; private final EmailService emailService; private static final String USER_CACHE_KEY = "user:"; @@ -204,10 +202,7 @@ public class UserServiceImpl implements UserService { return null; } - @Override - public void changePassword(String oldPassword, String newPassword) { - } @Override public void resetPassword(String email) {