修改
Change-Id: I18193ed65cb577ff03f82079a7c0a4d98ca3f236
diff --git a/src/main/java/com/pt/controller/AdminController.java b/src/main/java/com/pt/controller/AdminController.java
index 1ddfc92..22e2b86 100644
--- a/src/main/java/com/pt/controller/AdminController.java
+++ b/src/main/java/com/pt/controller/AdminController.java
@@ -31,7 +31,9 @@
Admin admin = adminService.findByUsernameAndPassword(username, password);
if (admin != null) {
ans.put("result", "Login successful");
- ans.put("token", JWTUtils.generateToken(username, Constants.UserRole.ADMIN, (int)1.2e8));
+ ans.put("data", Map.of(
+ "token", JWTUtils.generateToken(username, Constants.UserRole.ADMIN, (int)1.2e8)
+ ));
return ResponseEntity.ok().body(ans);
} else {
ans.put("result", "Invalid username or password");
diff --git a/src/main/java/com/pt/controller/CommentController.java b/src/main/java/com/pt/controller/CommentController.java
index a85d131..17dabb3 100644
--- a/src/main/java/com/pt/controller/CommentController.java
+++ b/src/main/java/com/pt/controller/CommentController.java
@@ -72,7 +72,9 @@
List<Comment> comments = commentService.getCommentsByPostId(postId);
ans.put("result", "Comments retrieved successfully");
- ans.put("comments", comments);
+ ans.put("data", Map.of(
+ "comments", comments
+ ));
return ResponseEntity.ok(ans);
}
}
diff --git a/src/main/java/com/pt/controller/PostController.java b/src/main/java/com/pt/controller/PostController.java
index 387cc2d..0ab86ed 100644
--- a/src/main/java/com/pt/controller/PostController.java
+++ b/src/main/java/com/pt/controller/PostController.java
@@ -92,7 +92,9 @@
posts.removeIf(post -> !post.getPublishDate().toString().equals(date));
}
ans.put("result", "Post retrieved successfully");
- ans.put("post", posts);
+ ans.put("data", Map.of(
+ "post", posts
+ ));
return ResponseEntity.ok(ans);
}
diff --git a/src/main/java/com/pt/controller/UserController.java b/src/main/java/com/pt/controller/UserController.java
index 3978831..7603f9d 100644
--- a/src/main/java/com/pt/controller/UserController.java
+++ b/src/main/java/com/pt/controller/UserController.java
@@ -43,8 +43,7 @@
userService.save(newUser);
Map<String, Object> ans = new HashMap<>();
- ans.put("success", true);
- ans.put("message", "User registered successfully");
+ ans.put("result", "User registered successfully");
ans.put("data", newUser);
return ResponseEntity.ok().body(ans);
@@ -52,9 +51,9 @@
}
@PostMapping("/login")
- public ResponseEntity<?> loginUser(@RequestBody Map<String, String> request) {
- String username = request.get("username");
- String password = request.get("password");
+ public ResponseEntity<?> loginUser(@RequestParam("username") String username,
+ @RequestParam("password") String password) {
+
if (username == null || password == null) {
return ResponseEntity.badRequest().body("Missing username or password");
@@ -64,16 +63,11 @@
Map<String, Object> ans = new HashMap<>();
if (user != null) {
String token = JWTUtils.generateToken(username, Constants.UserRole.USER, Constants.DEFAULT_EXPIRE_TIME);
- ans.put("success", true);
- ans.put("message", "Login successful");
- ans.put("data", Map.of(
- "token", token,
- "user", user
- ));
+ ans.put("result", "Login successful");
+ ans.put("data", token);
return ResponseEntity.ok().body(ans);
} else {
- ans.put("success", false);
- ans.put("message", "Invalid username or password");
+ ans.put("result", "Invalid username or password");
return ResponseEntity.badRequest().body(ans);
}
}
@@ -82,17 +76,21 @@
public ResponseEntity<?> updateUsername(@RequestHeader("token") String token,
@RequestParam("username") String oldUsername,
@RequestParam("newUsername") String newUsername) {
+ Map<String, Object> ans = new HashMap<>();
if(!JWTUtils.checkToken(token, oldUsername, Constants.UserRole.USER)) {
- return ResponseEntity.badRequest().body("Invalid token");
+ ans.put("result", "Invalid token");
+ return ResponseEntity.badRequest().body(ans);
}
User user = userService.findByUsername(oldUsername);
if (user != null) {
user.setUsername(newUsername);
userService.save(user);
- return ResponseEntity.ok("Username updated successfully");
+ ans.put("result", "Username updated successfully");
+ return ResponseEntity.ok(ans);
} else {
- return ResponseEntity.badRequest().body("User not found");
+ ans.put("result", "User not found");
+ return ResponseEntity.badRequest().body(ans);
}
}
@@ -100,17 +98,21 @@
public ResponseEntity<?> updatePassword(@RequestHeader("token") String token,
@RequestParam("username") String username,
@RequestParam("newPassword") String newPassword) {
+ Map<String, Object> ans = new HashMap<>();
if(!JWTUtils.checkToken(token, username, Constants.UserRole.USER)) {
- return ResponseEntity.badRequest().body("Invalid token");
+ ans.put("result", "Invalid token");
+ return ResponseEntity.badRequest().body(ans);
}
User user = userService.findByUsername(username);
if (user != null) {
user.setPassword(newPassword);
userService.save(user);
- return ResponseEntity.ok("Password updated successfully");
+ ans.put("result", "Password updated successfully");
+ return ResponseEntity.ok(ans);
} else {
- return ResponseEntity.badRequest().body("Invalid username or password");
+ ans.put("result", "Invalid username or password");
+ return ResponseEntity.badRequest().body(ans);
}
}
@@ -118,17 +120,22 @@
public ResponseEntity<?> updateEmail(@RequestHeader("token") String token,
@RequestParam("username") String username,
@RequestParam("newEmail") String newEmail) {
+
+ Map<String, Object> ans = new HashMap<>();
if(!JWTUtils.checkToken(token, username, Constants.UserRole.USER)) {
- return ResponseEntity.badRequest().body("Invalid token");
+ ans.put("result", "Invalid token");
+ return ResponseEntity.badRequest().body(ans);
}
User user = userService.findByUsername(username);
if (user != null) {
user.setEmail(newEmail);
userService.save(user);
- return ResponseEntity.ok("Email updated successfully");
+ ans.put("result", "Email updated successfully");
+ return ResponseEntity.ok(ans);
} else {
- return ResponseEntity.badRequest().body("User not found");
+ ans.put("result", "User not found");
+ return ResponseEntity.badRequest().body(ans);
}
}
@@ -137,16 +144,20 @@
@RequestParam("username") String username,
@RequestParam("targetUsername") String targetUsername
) {
+ Map<String, Object> ans = new HashMap<>();
if(!JWTUtils.checkToken(token, username, Constants.UserRole.ADMIN)) {
- return ResponseEntity.badRequest().body("Invalid token");
+ ans.put("result", "Invalid token");
+ return ResponseEntity.badRequest().body(ans);
}
User user = userService.findByUsername(targetUsername);
if (user != null) {
userService.deleteById(user.getUid());
- return ResponseEntity.ok("User deleted successfully");
+ ans.put("result", "User deleted successfully");
+ return ResponseEntity.ok(ans);
} else {
- return ResponseEntity.badRequest().body("User not found");
+ ans.put("result", "User not found");
+ return ResponseEntity.badRequest().body(ans);
}
}
@@ -159,26 +170,30 @@
Map<String, Object> ans = new HashMap<>();
ans.put("result", "User list retrieved successfully");
- ans.put("amount", userService.listAll().size());
- ans.put("users", userService.listAll());
+ ans.put("data", Map.of(
+ "amount", userService.listAll().size(),
+ "users", userService.listAll()
+ ));
return ResponseEntity.ok(ans);
}
@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)) {
- return ResponseEntity.badRequest().body("Invalid token");
+ ans.put("result", "Invalid token");
+ return ResponseEntity.badRequest().body(ans);
}
User user = userService.findByUsername(username);
if (user != null) {
- Map<String, Object> ans = new HashMap<>();
ans.put("result", "User info retrieved successfully");
- ans.put("user", user);
+ ans.put("data", user);
return ResponseEntity.ok(ans);
} else {
- return ResponseEntity.badRequest().body("User not found");
+ ans.put("result", "User not found");
+ return ResponseEntity.badRequest().body(ans);
}
}
}