|
@@ -36,12 +36,12 @@ public class UserController {
|
|
|
private AuthenticationManager authenticationManager;
|
|
private AuthenticationManager authenticationManager;
|
|
|
|
|
|
|
|
@PostMapping("/register")
|
|
@PostMapping("/register")
|
|
|
- public ResponseEntity<String> register(@RequestBody User user) {
|
|
|
|
|
|
|
+ public SingleResult<?> register(@RequestBody User user) {
|
|
|
if (!userService.isUsernameUnique(user.getUsername())) {
|
|
if (!userService.isUsernameUnique(user.getUsername())) {
|
|
|
- return new ResponseEntity<>("Username is already taken", HttpStatus.BAD_REQUEST);
|
|
|
|
|
|
|
+ return SingleResult.failure("400","username has been taken!");
|
|
|
}
|
|
}
|
|
|
userService.save(user);
|
|
userService.save(user);
|
|
|
- return new ResponseEntity<>("User registered successfully", HttpStatus.OK);
|
|
|
|
|
|
|
+ return SingleResult.success("register successfully!");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@GetMapping("/activation/{userId}/{code}")
|
|
@GetMapping("/activation/{userId}/{code}")
|