Guwan
/
yl-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 出现循环依赖 

出现循环依赖
This commit is contained in:
Guwan 2024-12-07 20:08:40 +08:00
parent 287ac0be85
commit 12542ae115
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/guwan/backend/controller/UserController.java
View File

@ -137,16 +137,7 @@ public class UserController {
} }
} }
@PostMapping("/password/change")
public Result<Void> 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") @PutMapping("/info")
public Result<UserDTO> updateUserInfo(@RequestBody @Valid UserDTO userDTO) { public Result<UserDTO> updateUserInfo(@RequestBody @Valid UserDTO userDTO) {

2
src/main/java/com/guwan/backend/security/UserDetailsServiceImpl.java
View File

@ -39,7 +39,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
private UserDetails convertToUserDetailsWithoutPassword(UserDTO user) { private UserDetails convertToUserDetailsWithoutPassword(UserDTO user) {
List<SimpleGrantedAuthority> authorities = new ArrayList<>(); List<SimpleGrantedAuthority> authorities = new ArrayList<>();
authorities.add(new SimpleGrantedAuthority("ROLE_USER")); authorities.add(new SimpleGrantedAuthority("Admin"));
return new CustomUserDetails( return new CustomUserDetails(
user.getId(), user.getId(),

2
src/main/java/com/guwan/backend/service/UserService.java
View File

@ -22,7 +22,7 @@ public interface UserService {
Long getCurrentUserId(); Long getCurrentUserId();
UserDTO getUserById(Long id); UserDTO getUserById(Long id);
UserDTO updateUserInfo(UserDTO userDTO); UserDTO updateUserInfo(UserDTO userDTO);
void changePassword(String oldPassword, String newPassword);
void resetPassword(String email); void resetPassword(String email);
public String refreshToken(String token); public String refreshToken(String token);

5
src/main/java/com/guwan/backend/service/impl/UserServiceImpl.java
View File

@ -10,7 +10,6 @@ import com.guwan.backend.mapper.UserMapper;
import com.guwan.backend.security.CustomUserDetails; import com.guwan.backend.security.CustomUserDetails;
import com.guwan.backend.service.EmailService; import com.guwan.backend.service.EmailService;
import com.guwan.backend.service.UserService; import com.guwan.backend.service.UserService;
import com.guwan.backend.service.VerificationService;
import com.guwan.backend.util.JwtUtil; import com.guwan.backend.util.JwtUtil;
import com.guwan.backend.util.RedisUtil; import com.guwan.backend.util.RedisUtil;
import com.guwan.backend.util.RedisUtils; import com.guwan.backend.util.RedisUtils;
@ -37,7 +36,6 @@ public class UserServiceImpl implements UserService {
private final JwtUtil jwtUtil; private final JwtUtil jwtUtil;
private final RedisUtil redisUtil; private final RedisUtil redisUtil;
private final RedisUtils redisUtils; private final RedisUtils redisUtils;
private final VerificationService verificationService;
private final EmailService emailService; private final EmailService emailService;
private static final String USER_CACHE_KEY = "user:"; private static final String USER_CACHE_KEY = "user:";
@ -204,10 +202,7 @@ public class UserServiceImpl implements UserService {
return null; return null;
} }
@Override
public void changePassword(String oldPassword, String newPassword) {
}
@Override @Override
public void resetPassword(String email) { public void resetPassword(String email) {