Skip to content

Commit 4f43ac6

Browse files
colorful3colorful3
committed
refacor: 将 UnifyResponseVO 替换为对应 UpdatedVO、CreatedVO、DeletedVO
1 parent 5739341 commit 4f43ac6

4 files changed

Lines changed: 55 additions & 50 deletions

File tree

‎src/main/java/io/github/talelin/merak/controller/cms/AdminController.java‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
import io.github.talelin.merak.model.UserDO;
99
import io.github.talelin.merak.service.AdminService;
1010
import io.github.talelin.merak.service.GroupService;
11-
import io.github.talelin.merak.vo.UnifyResponseVO;
12-
import io.github.talelin.merak.vo.PageResponseVO;
11+
import io.github.talelin.merak.vo.*;
1312
import io.github.talelin.merak.model.GroupDO;
1413
import io.github.talelin.merak.dto.admin.*;
15-
import io.github.talelin.merak.vo.UserInfoVO;
1614
import org.springframework.beans.factory.annotation.Autowired;
1715
import org.springframework.validation.annotation.Validated;
1816
import org.springframework.web.bind.annotation.*;
@@ -65,23 +63,23 @@ public PageResponseVO getUsers(
6563

6664
@PutMapping("/user/{id}/password")
6765
@AdminMeta(permission = "修改用户密码", module = "管理员")
68-
public UnifyResponseVO changeUserPassword(@PathVariable @Positive(message = "{id}") Long id, @RequestBody @Validated ResetPasswordDTO validator) {
66+
public UpdatedVO changeUserPassword(@PathVariable @Positive(message = "{id}") Long id, @RequestBody @Validated ResetPasswordDTO validator) {
6967
adminService.changeUserPassword(id, validator);
70-
return ResponseUtil.generateUnifyResponse(4);
68+
return new UpdatedVO(4);
7169
}
7270

7371
@DeleteMapping("/user/{id}")
7472
@AdminMeta(permission = "删除用户", module = "管理员")
75-
public UnifyResponseVO deleteUser(@PathVariable @Positive(message = "{id}") Long id) {
73+
public DeletedVO deleteUser(@PathVariable @Positive(message = "{id}") Long id) {
7674
adminService.deleteUser(id);
77-
return ResponseUtil.generateUnifyResponse(5);
75+
return new DeletedVO(5);
7876
}
7977

8078
@PutMapping("/user/{id}")
8179
@AdminMeta(permission = "管理员更新用户信息", module = "管理员")
82-
public UnifyResponseVO updateUser(@PathVariable @Positive(message = "{id}") Long id, @RequestBody @Validated UpdateUserInfoDTO validator) {
80+
public UpdatedVO updateUser(@PathVariable @Positive(message = "{id}") Long id, @RequestBody @Validated UpdateUserInfoDTO validator) {
8381
adminService.updateUserInfo(id, validator);
84-
return ResponseUtil.generateUnifyResponse(6);
82+
return new UpdatedVO(6);
8583
}
8684

8785
@GetMapping("/group")
@@ -111,45 +109,45 @@ public GroupPermissionBO getGroup(@PathVariable @Positive(message = "{id}") Long
111109

112110
@PostMapping("/group")
113111
@AdminMeta(permission = "新建权限组", module = "管理员")
114-
public UnifyResponseVO createGroup(@RequestBody @Validated NewGroupDTO validator) {
112+
public CreatedVO createGroup(@RequestBody @Validated NewGroupDTO validator) {
115113
adminService.createGroup(validator);
116-
return ResponseUtil.generateUnifyResponse(15);
114+
return new CreatedVO(15);
117115
}
118116

119117
@PutMapping("/group/{id}")
120118
@AdminMeta(permission = "更新一个权限组", module = "管理员")
121-
public UnifyResponseVO updateGroup(@PathVariable @Positive(message = "{id}") Long id,
119+
public UpdatedVO updateGroup(@PathVariable @Positive(message = "{id}") Long id,
122120
@RequestBody @Validated UpdateGroupDTO validator) {
123121
adminService.updateGroup(id, validator);
124-
return ResponseUtil.generateUnifyResponse(7);
122+
return new UpdatedVO(7);
125123
}
126124

127125
@DeleteMapping("/group/{id}")
128126
@AdminMeta(permission = "删除一个权限组", module = "管理员")
129-
public UnifyResponseVO deleteGroup(@PathVariable @Positive(message = "{id}") Long id) {
127+
public DeletedVO deleteGroup(@PathVariable @Positive(message = "{id}") Long id) {
130128
adminService.deleteGroup(id);
131-
return ResponseUtil.generateUnifyResponse(8);
129+
return new DeletedVO(8);
132130
}
133131

134132
@PostMapping("/permission/dispatch")
135133
@AdminMeta(permission = "分配单个权限", module = "管理员")
136-
public UnifyResponseVO dispatchPermission(@RequestBody @Validated DispatchPermissionDTO validator) {
134+
public CreatedVO dispatchPermission(@RequestBody @Validated DispatchPermissionDTO validator) {
137135
adminService.dispatchPermission(validator);
138-
return ResponseUtil.generateUnifyResponse(9);
136+
return new CreatedVO(9);
139137
}
140138

141139
@PostMapping("/permission/dispatch/batch")
142140
@AdminMeta(permission = "分配多个权限", module = "管理员")
143-
public UnifyResponseVO dispatchPermissions(@RequestBody @Validated DispatchPermissionsDTO validator) {
141+
public CreatedVO dispatchPermissions(@RequestBody @Validated DispatchPermissionsDTO validator) {
144142
adminService.dispatchPermissions(validator);
145-
return ResponseUtil.generateUnifyResponse(9);
143+
return new CreatedVO(9);
146144
}
147145

148146
@PostMapping("/permission/remove")
149147
@AdminMeta(permission = "删除多个权限", module = "管理员")
150-
public UnifyResponseVO removePermissions(@RequestBody @Validated RemovePermissionsDTO validator) {
148+
public CreatedVO removePermissions(@RequestBody @Validated RemovePermissionsDTO validator) {
151149
adminService.removePermissions(validator);
152-
return ResponseUtil.generateUnifyResponse(10);
150+
return new CreatedVO(10);
153151
}
154152

155153
}

‎src/main/java/io/github/talelin/merak/controller/cms/UserController.java‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
package io.github.talelin.merak.controller.cms;
22

3-
import io.github.talelin.core.annotation.*;
4-
import io.github.talelin.merak.common.LocalUser;
5-
import io.github.talelin.merak.common.util.ResponseUtil;
6-
import io.github.talelin.merak.model.GroupDO;
7-
import io.github.talelin.merak.service.GroupService;
8-
import io.github.talelin.merak.service.UserIdentityService;
9-
import io.github.talelin.merak.vo.UnifyResponseVO;
10-
import io.github.talelin.merak.model.UserDO;
11-
import io.github.talelin.merak.vo.UserInfoVO;
12-
import io.github.talelin.merak.vo.UserPermissionVO;
13-
import io.github.talelin.merak.service.UserService;
14-
import io.github.talelin.core.token.DoubleJWT;
15-
import io.github.talelin.core.token.Tokens;
163
import io.github.talelin.autoconfigure.exception.NotFoundException;
174
import io.github.talelin.autoconfigure.exception.ParameterException;
5+
import io.github.talelin.core.annotation.AdminRequired;
6+
import io.github.talelin.core.annotation.LoginMeta;
7+
import io.github.talelin.core.annotation.LoginRequired;
8+
import io.github.talelin.core.annotation.RefreshRequired;
9+
import io.github.talelin.core.token.DoubleJWT;
10+
import io.github.talelin.core.token.Tokens;
11+
import io.github.talelin.merak.common.LocalUser;
1812
import io.github.talelin.merak.dto.user.ChangePasswordDTO;
1913
import io.github.talelin.merak.dto.user.LoginDTO;
2014
import io.github.talelin.merak.dto.user.RegisterDTO;
2115
import io.github.talelin.merak.dto.user.UpdateInfoDTO;
16+
import io.github.talelin.merak.model.GroupDO;
17+
import io.github.talelin.merak.model.UserDO;
18+
import io.github.talelin.merak.service.GroupService;
19+
import io.github.talelin.merak.service.UserIdentityService;
20+
import io.github.talelin.merak.service.UserService;
21+
import io.github.talelin.merak.vo.CreatedVO;
22+
import io.github.talelin.merak.vo.UpdatedVO;
23+
import io.github.talelin.merak.vo.UserInfoVO;
24+
import io.github.talelin.merak.vo.UserPermissionVO;
2225
import org.springframework.beans.factory.annotation.Autowired;
2326
import org.springframework.validation.annotation.Validated;
2427
import org.springframework.web.bind.annotation.*;
@@ -53,9 +56,9 @@ public class UserController {
5356
*/
5457
@PostMapping("/register")
5558
@AdminRequired
56-
public UnifyResponseVO<String> register(@RequestBody @Validated RegisterDTO validator) {
59+
public CreatedVO<String> register(@RequestBody @Validated RegisterDTO validator) {
5760
userService.createUser(validator);
58-
return ResponseUtil.generateUnifyResponse(11);
61+
return new CreatedVO(11);
5962
}
6063

6164
/**
@@ -81,19 +84,19 @@ public Tokens login(@RequestBody @Validated LoginDTO validator) {
8184
*/
8285
@PutMapping
8386
@LoginRequired
84-
public UnifyResponseVO update(@RequestBody @Validated UpdateInfoDTO validator) {
87+
public UpdatedVO update(@RequestBody @Validated UpdateInfoDTO validator) {
8588
userService.updateUserInfo(validator);
86-
return ResponseUtil.generateUnifyResponse(6);
89+
return new UpdatedVO(6);
8790
}
8891

8992
/**
9093
* 修改密码
9194
*/
9295
@PutMapping("/change_password")
9396
@LoginRequired
94-
public UnifyResponseVO updatePassword(@RequestBody @Validated ChangePasswordDTO validator) {
97+
public UpdatedVO updatePassword(@RequestBody @Validated ChangePasswordDTO validator) {
9598
userService.changeUserPassword(validator);
96-
return ResponseUtil.generateUnifyResponse(4);
99+
return new UpdatedVO(4);
97100
}
98101

99102
/**

‎src/main/java/io/github/talelin/merak/controller/v1/BookController.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package io.github.talelin.merak.controller.v1;
22

3+
import io.github.talelin.autoconfigure.exception.NotFoundException;
34
import io.github.talelin.core.annotation.GroupMeta;
5+
import io.github.talelin.merak.dto.book.CreateOrUpdateBookDTO;
46
import io.github.talelin.merak.model.BookDO;
57
import io.github.talelin.merak.service.BookService;
6-
import io.github.talelin.merak.dto.book.CreateOrUpdateBookDTO;
7-
import io.github.talelin.merak.vo.UnifyResponseVO;
8-
import io.github.talelin.autoconfigure.exception.NotFoundException;
9-
import io.github.talelin.merak.common.util.ResponseUtil;
8+
import io.github.talelin.merak.vo.CreatedVO;
9+
import io.github.talelin.merak.vo.DeletedVO;
10+
import io.github.talelin.merak.vo.UpdatedVO;
1011
import org.springframework.beans.factory.annotation.Autowired;
1112
import org.springframework.validation.annotation.Validated;
1213
import org.springframework.web.bind.annotation.*;
@@ -46,32 +47,32 @@ public List<BookDO> searchBook(@RequestParam(value = "q", required = false, defa
4647

4748

4849
@PostMapping("")
49-
public UnifyResponseVO createBook(@RequestBody @Validated CreateOrUpdateBookDTO validator) {
50+
public CreatedVO createBook(@RequestBody @Validated CreateOrUpdateBookDTO validator) {
5051
bookService.createBook(validator);
51-
return ResponseUtil.generateUnifyResponse(12);
52+
return new CreatedVO(12);
5253
}
5354

5455

5556
@PutMapping("/{id}")
56-
public UnifyResponseVO updateBook(@PathVariable("id") @Positive(message = "{id}") Long id, @RequestBody @Validated CreateOrUpdateBookDTO validator) {
57+
public UpdatedVO updateBook(@PathVariable("id") @Positive(message = "{id}") Long id, @RequestBody @Validated CreateOrUpdateBookDTO validator) {
5758
BookDO book = bookService.getById(id);
5859
if (book == null) {
5960
throw new NotFoundException("book not found", 10022);
6061
}
6162
bookService.updateBook(book, validator);
62-
return ResponseUtil.generateUnifyResponse(13);
63+
return new UpdatedVO(13);
6364
}
6465

6566

6667
@DeleteMapping("/{id}")
6768
@GroupMeta(permission = "删除图书", module = "图书", mount = true)
68-
public UnifyResponseVO deleteBook(@PathVariable("id") @Positive(message = "{id}") Long id) {
69+
public DeletedVO deleteBook(@PathVariable("id") @Positive(message = "{id}") Long id) {
6970
BookDO book = bookService.getById(id);
7071
if (book == null) {
7172
throw new NotFoundException("book not found", 10022);
7273
}
7374
bookService.deleteById(book.getId());
74-
return ResponseUtil.generateUnifyResponse(14);
75+
return new DeletedVO(14);
7576
}
7677

7778

‎src/main/java/io/github/talelin/merak/dto/admin/UpdateGroupDTO.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
import io.github.talelin.autoconfigure.validator.Length;
44
import lombok.Data;
55

6+
import javax.validation.constraints.NotBlank;
7+
68
@Data
79
public class UpdateGroupDTO {
810

11+
@NotBlank(message = "{group.name.not-blank}")
912
@Length(min = 1, max = 60, message = "{group.name.length}")
1013
private String name;
1114

0 commit comments

Comments
 (0)