Skip to content

Commit b00924f

Browse files
author
pedro
committed
feat:规范异常信息占位符
1 parent 2d10468 commit b00924f

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public Map<String, List<PermissionDO>> getAllPermissions() {
5050
@AdminMeta(permission = "查询所有用户", module = "管理员")
5151
public PageResponseVO getUsers(
5252
@RequestParam(name = "group_id", required = false)
53-
@Min(value = 1, message = "{group_id}") Long groupId,
53+
@Min(value = 1, message = "{group-id}") Long groupId,
5454
@RequestParam(name = "count", required = false, defaultValue = "10")
5555
@Min(value = 1, message = "{count}") Long count,
5656
@RequestParam(name = "page", required = false, defaultValue = "0")

src/main/resources/ValidationMessages.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ user.register.group-ids.not-null=\u5206\u7EC4id\u4E0D\u53EF\u4E3A\u7A7A
1111
user.register.group-ids.long-list=\u5206\u7EC4id\u6BCF\u4E00\u9879\u5FC5\u987B\u4E3A\u6B63\u6574\u6570
1212
# \u901A\u7528\u5F02\u5E38\u4FE1\u606F
1313
id=id\u5FC5\u987B\u4E3A\u6B63\u6574\u6570
14-
group_id=\u5206\u7EC4id\u5FC5\u987B\u4E3A\u6B63\u6574\u6570
14+
group-id=\u5206\u7EC4id\u5FC5\u987B\u4E3A\u6B63\u6574\u6570
1515
count=\u5206\u9875\u6570\u91CF\u5FC5\u987B\u4E3A\u6B63\u6574\u6570
1616
page=\u5206\u9875\u5FC5\u987B\u4E3A\u6B63\u6574\u6570
1717
# password

src/test/java/io/github/talelin/merak/mapper/UserMapperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void selectPageByGroupId() {
7373
userGroupMapper.insert(new UserGroupDO(userDO.getId(), group.getId()));
7474

7575
Page page = new Page(0, 10);
76-
IPage<UserDO> iPage = userMapper.selectPageByGroupId(page, group.getId(), 1L);
76+
IPage<UserDO> iPage = userMapper.selectPageByGroupId(page, group.getId(), 99999L);
7777
assertTrue(iPage.getTotal() > 0);
7878
boolean anyMatch = iPage.getRecords().stream().anyMatch(it -> it.getUsername().equals(username));
7979
assertTrue(anyMatch);

0 commit comments

Comments
 (0)