Skip to content

Commit 041441f

Browse files
author
pedro
committed
feat:优化一些小细节
1 parent 49d9585 commit 041441f

6 files changed

Lines changed: 27 additions & 16 deletions

File tree

‎src/main/java/io/github/talelin/merak/common/utils/ResponseUtil.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
package io.github.talelin.merak.common.utils;
22

3+
import io.github.talelin.merak.vo.PageResponseVO;
34
import io.github.talelin.merak.vo.UnifyResponseVO;
45
import io.github.talelin.autoconfigure.exception.HttpException;
56
import io.github.talelin.autoconfigure.response.Created;
67
import io.github.talelin.autoconfigure.response.Success;
78
import io.github.talelin.autoconfigure.beans.Code;
89
import io.github.talelin.autoconfigure.utils.RequestUtil;
910
import lombok.extern.slf4j.Slf4j;
11+
import org.springframework.web.context.request.RequestContextHolder;
12+
import org.springframework.web.context.request.ServletRequestAttributes;
13+
14+
import javax.servlet.http.HttpServletResponse;
15+
import java.util.List;
1016

1117

1218
/**
@@ -15,6 +21,15 @@
1521
@Slf4j
1622
public class ResponseUtil {
1723

24+
/**
25+
* 获得当前相应
26+
*
27+
* @return 相应
28+
*/
29+
public static HttpServletResponse getResponse() {
30+
return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
31+
}
32+
1833
public static UnifyResponseVO generateUnifyResponse(HttpException e) {
1934
return UnifyResponseVO.builder()
2035
.message(e.getMessage())
@@ -55,4 +70,8 @@ public static <T> UnifyResponseVO<T> generateUnifyResponse(Code code, int httpCo
5570
.request(RequestUtil.getSimpleRequest())
5671
.build();
5772
}
73+
74+
public static PageResponseVO generatePageResult(long total, List items, long page, long count) {
75+
return new PageResponseVO(total, items, page, count);
76+
}
5877
}

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.github.talelin.merak.model.GroupDO;
1515
import io.github.talelin.merak.dto.admin.*;
1616
import io.github.talelin.merak.vo.UserInfoVO;
17-
import io.github.talelin.merak.dto.admin.*;
1817
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.validation.annotation.Validated;
2019
import org.springframework.web.bind.annotation.*;
@@ -64,7 +63,7 @@ public PageResponseVO getUsers(
6463
List<GroupDO> groups = groupService.getUserGroupsByUserId(user.getId());
6564
return new UserInfoVO(user, groups);
6665
}).collect(Collectors.toList());
67-
return PageResponseVO.genPageResult(iPage.getTotal(), userInfos, page, count);
66+
return ResponseUtil.generatePageResult(iPage.getTotal(), userInfos, page, count);
6867
}
6968

7069
@PutMapping("/user/{id}/password")
@@ -83,7 +82,6 @@ public UnifyResponseVO deleteUser(@PathVariable @Positive(message = "{id}") Long
8382
return ResponseUtil.generateUnifyResponse(3);
8483
}
8584

86-
8785
@PutMapping("/user/{id}")
8886
@AdminRequired
8987
@RouteMeta(permission = "管理员更新用户信息", module = "管理员")
@@ -101,10 +99,9 @@ public PageResponseVO getGroups(
10199
@RequestParam(name = "page", required = false, defaultValue = "0")
102100
@Min(value = 0, message = "{page}") Long page) {
103101
IPage<GroupDO> iPage = adminService.getGroupPage(page, count);
104-
return PageResponseVO.genPageResult(iPage.getTotal(), iPage.getRecords(), page, count);
102+
return ResponseUtil.generatePageResult(iPage.getTotal(), iPage.getRecords(), page, count);
105103
}
106104

107-
108105
@GetMapping("/group/all")
109106
@AdminRequired
110107
@RouteMeta(permission = "查询所有权限组", module = "管理员")
@@ -121,7 +118,6 @@ public GroupPermissionsBO getGroup(@PathVariable @Positive(message = "{id}") Lon
121118
return groupPermissions;
122119
}
123120

124-
125121
@PostMapping("/group")
126122
@AdminRequired
127123
@RouteMeta(permission = "新建权限组", module = "管理员")
@@ -130,7 +126,6 @@ public UnifyResponseVO createGroup(@RequestBody @Validated NewGroupDTO validator
130126
return ResponseUtil.generateUnifyResponse(13);
131127
}
132128

133-
134129
@PutMapping("/group/{id}")
135130
@AdminRequired
136131
@RouteMeta(permission = "更新一个权限组", module = "管理员")

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.baomidou.mybatisplus.core.metadata.IPage;
44
import io.github.talelin.core.annotation.GroupRequired;
55
import io.github.talelin.core.annotation.RouteMeta;
6+
import io.github.talelin.merak.common.utils.ResponseUtil;
67
import io.github.talelin.merak.model.LogDO;
78
import io.github.talelin.merak.vo.PageResponseVO;
89
import io.github.talelin.merak.service.LogService;
@@ -37,7 +38,7 @@ public PageResponseVO getLogs(
3738
@RequestParam(name = "page", required = false, defaultValue = "0")
3839
@Min(value = 0, message = "{page}") Long page) {
3940
IPage<LogDO> iPage = logService.getLogPage(page, count, name, start, end);
40-
return PageResponseVO.genPageResult(iPage.getTotal(), iPage.getRecords(), page, count);
41+
return ResponseUtil.generatePageResult(iPage.getTotal(), iPage.getRecords(), page, count);
4142
}
4243

4344
@GetMapping("/search")
@@ -53,7 +54,7 @@ public PageResponseVO searchLogs(
5354
@RequestParam(name = "page", required = false, defaultValue = "0")
5455
@Min(value = 0, message = "{page}") Long page) {
5556
IPage<LogDO> iPage = logService.searchLogPage(page, count, name, keyword, start, end);
56-
return PageResponseVO.genPageResult(iPage.getTotal(), iPage.getRecords(), page, count);
57+
return ResponseUtil.generatePageResult(iPage.getTotal(), iPage.getRecords(), page, count);
5758
}
5859

5960
@GetMapping("/users")
@@ -65,6 +66,6 @@ public PageResponseVO getUsers(
6566
@RequestParam(name = "page", required = false, defaultValue = "0")
6667
@Min(value = 0, message = "{page}") Long page) {
6768
IPage<String> iPage = logService.getUserNamePage(page, count);
68-
return PageResponseVO.genPageResult(iPage.getTotal(), iPage.getRecords(), page, count);
69+
return ResponseUtil.generatePageResult(iPage.getTotal(), iPage.getRecords(), page, count);
6970
}
7071
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public UnifyResponseVO updatePassword(@RequestBody @Validated ChangePasswordDTO
105105
*/
106106
@GetMapping("/refresh")
107107
@RefreshRequired
108-
public Tokens refreshToken() {
108+
public Tokens getRefreshToken() {
109109
UserDO user = LocalUser.getLocalUser();
110110
return jwt.generateTokens(user.getId());
111111
}

‎src/main/java/io/github/talelin/merak/vo/PageResponseVO.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,4 @@ public class PageResponseVO<T> {
2323
private long page;
2424

2525
private long count;
26-
27-
public static PageResponseVO genPageResult(long total, List items, long page, long count) {
28-
return new PageResponseVO(total, items, page, count);
29-
}
3026
}

‎src/main/resources/code.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ lin.cms.code-message[10077]=\u4E0D\u53EF\u5C06\u7528\u6237\u5206\u914D\u7ED9\u4E
5353
lin.cms.code-message[10121]=\u6587\u4EF6\u592A\u591A\uFF0C\u6587\u4EF6\u603B\u6570\u4E0D\u53EF\u8D85\u8FC7${lin.cms.file.nums}
5454
# lin.cms.code-message[10130]=\u6587\u4EF6\u6269\u5C55\u540D\u4E0D\u7B26\u5408\u89C4\u8303
5555
# lin.cms.code-message[10140]=\u8BF7\u6C42\u8FC7\u4E8E\u9891\u7E41\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5
56-
lin.cms.code-message[10150]=\u4E22\u5931\u53C2\u6570\uFF1A
56+
lin.cms.code-message[10150]=\u4E22\u5931\u53C2\u6570
5757
lin.cms.code-message[10160]=\u7C7B\u578B\u9519\u8BEF
5858
lin.cms.code-message[10170]=\u8BF7\u6C42\u4F53\u4E0D\u53EF\u4E3A\u7A7A
5959
lin.cms.code-message[10180]=\u5168\u90E8\u6587\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7

0 commit comments

Comments
 (0)