修改部分接口，方便前后端链接
Change-Id: Icce71f5085084a4185cb11fe3313d618dfb01177
diff --git a/src/main/java/com/pt/controller/UserController.java b/src/main/java/com/pt/controller/UserController.java
index 577b2a3..7222f36 100644
--- a/src/main/java/com/pt/controller/UserController.java
+++ b/src/main/java/com/pt/controller/UserController.java
@@ -56,7 +56,7 @@
userService.save(newUser);
Map<String, Object> ans = new HashMap<>();
- ans.put("result", "User registered successfully");
+ ans.put("message", "User registered successfully");
ans.put("data", newUser);
return ResponseEntity.ok().body(ans);
@@ -64,9 +64,9 @@
}
@PostMapping("/login")
- public ResponseEntity<?> loginUser(@RequestParam("username") String username,
- @RequestParam("password") String password) {
-
+ public ResponseEntity<?> loginUser(@RequestBody Map<String, String> request) {
+ String username = request.get("username");
+ String password = request.get("password");
if (username == null || password == null) {
return ResponseEntity.badRequest().body("Missing username or password");
@@ -76,22 +76,24 @@
Map<String, Object> ans = new HashMap<>();
if (user != null) {
String token = JWTUtils.generateToken(username, Constants.UserRole.USER, Constants.DEFAULT_EXPIRE_TIME);
- ans.put("result", "Login successful");
+ ans.put("message", "Login successful");
ans.put("data", token);
return ResponseEntity.ok().body(ans);
} else {
- ans.put("result", "Invalid username or password");
+ ans.put("message", "Invalid username or password");
return ResponseEntity.badRequest().body(ans);
}
}
@PostMapping("/update/username")
public ResponseEntity<?> updateUsername(@RequestHeader("token") String token,
- @RequestParam("username") String oldUsername,
- @RequestParam("newUsername") String newUsername) {
+ @RequestBody Map<String, String> request) {
+ String oldUsername = request.get("username");
+ String newUsername = request.get("newUsername");
+
Map<String, Object> ans = new HashMap<>();
if(!JWTUtils.checkToken(token, oldUsername, Constants.UserRole.USER)) {
- ans.put("result", "Invalid token");
+ ans.put("message", "Invalid token");
return ResponseEntity.badRequest().body(ans);
}
@@ -99,21 +101,24 @@
if (user != null) {
user.setUsername(newUsername);
userService.save(user);
- ans.put("result", "Username updated successfully");
+ ans.put("message", "Username updated successfully");
return ResponseEntity.ok(ans);
} else {
- ans.put("result", "User not found");
+ ans.put("message", "User not found");
return ResponseEntity.badRequest().body(ans);
}
}
@PostMapping("/update/password")
public ResponseEntity<?> updatePassword(@RequestHeader("token") String token,
- @RequestParam("username") String username,
- @RequestParam("newPassword") String newPassword) {
+ @RequestBody Map<String, String> request
+ ) {
+ String username = request.get("username");
+ String newPassword = request.get("newPassword");
+
Map<String, Object> ans = new HashMap<>();
if(!JWTUtils.checkToken(token, username, Constants.UserRole.USER)) {
- ans.put("result", "Invalid token");
+ ans.put("message", "Invalid token");
return ResponseEntity.badRequest().body(ans);
}
@@ -121,22 +126,23 @@
if (user != null) {
user.setPassword(newPassword);
userService.save(user);
- ans.put("result", "Password updated successfully");
+ ans.put("message", "Password updated successfully");
return ResponseEntity.ok(ans);
} else {
- ans.put("result", "Invalid username or password");
+ ans.put("message", "Invalid username or password");
return ResponseEntity.badRequest().body(ans);
}
}
@PostMapping("/update/email")
public ResponseEntity<?> updateEmail(@RequestHeader("token") String token,
- @RequestParam("username") String username,
- @RequestParam("newEmail") String newEmail) {
+ @RequestBody Map<String, String> request) {
+ String username = request.get("username");
+ String newEmail = request.get("newEmail");
Map<String, Object> ans = new HashMap<>();
if(!JWTUtils.checkToken(token, username, Constants.UserRole.USER)) {
- ans.put("result", "Invalid token");
+ ans.put("message", "Invalid token");
return ResponseEntity.badRequest().body(ans);
}
@@ -144,45 +150,47 @@
if (user != null) {
user.setEmail(newEmail);
userService.save(user);
- ans.put("result", "Email updated successfully");
+ ans.put("message", "Email updated successfully");
return ResponseEntity.ok(ans);
} else {
- ans.put("result", "User not found");
+ ans.put("message", "User not found");
return ResponseEntity.badRequest().body(ans);
}
}
@DeleteMapping("/delete")
public ResponseEntity<?> deleteUser(@RequestHeader("token") String token,
- @RequestParam("username") String username,
- @RequestParam("targetUsername") String targetUsername
- ) {
+ @RequestBody Map<String, String> request) {
+ String username = request.get("username");
+ String targetUsername = request.get("targetUsername");
+
Map<String, Object> ans = new HashMap<>();
if(!JWTUtils.checkToken(token, username, Constants.UserRole.ADMIN)) {
- ans.put("result", "Invalid token");
+ ans.put("message", "Invalid token");
return ResponseEntity.badRequest().body(ans);
}
User user = userService.findByUsername(targetUsername);
if (user != null) {
userService.deleteById(user.getUid());
- ans.put("result", "User deleted successfully");
+ ans.put("message", "User deleted successfully");
return ResponseEntity.ok(ans);
} else {
- ans.put("result", "User not found");
+ ans.put("message", "User not found");
return ResponseEntity.badRequest().body(ans);
}
}
@GetMapping("/list")
public ResponseEntity<?> listUsers(@RequestHeader("token") String token,
- @RequestParam("username") String username) {
+ @RequestBody Map<String, String> request) {
+ String username = request.get("username");
if(!JWTUtils.checkToken(token, username, Constants.UserRole.ADMIN)) {
return ResponseEntity.badRequest().body("Invalid token");
}
Map<String, Object> ans = new HashMap<>();
- ans.put("result", "User list retrieved successfully");
+ ans.put("message", "User list retrieved successfully");
ans.put("data", Map.of(
"amount", userService.listAll().size(),
"users", userService.listAll()
@@ -193,19 +201,20 @@
@GetMapping("/get/info")
public ResponseEntity<?> getUserInfo(@RequestHeader("token") String token,
@RequestParam("username") String username) {
+
Map<String, Object> ans = new HashMap<>();
if(!JWTUtils.checkToken(token, username, Constants.UserRole.USER)) {
- ans.put("result", "Invalid token");
+ ans.put("message", "Invalid token");
return ResponseEntity.badRequest().body(ans);
}
User user = userService.findByUsername(username);
if (user != null) {
- ans.put("result", "User info retrieved successfully");
+ ans.put("message", "User info retrieved successfully");
ans.put("data", user);
return ResponseEntity.ok(ans);
} else {
- ans.put("result", "User not found");
+ ans.put("message", "User not found");
return ResponseEntity.badRequest().body(ans);
}
}