Skip to content

Commit 5739341

Browse files
author
pedro
authored
Merge pull request #22 from TaleLin/0.1.x
0.1.x
2 parents 25ce08b + 0d4e37d commit 5739341

12 files changed

Lines changed: 196 additions & 53 deletions

File tree

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>io.github.talelin</groupId>
1313
<artifactId>merak</artifactId>
14-
<version>0.0.1-RC6</version>
14+
<version>0.1.0-RELEASE</version>
1515
<name>merak</name>
1616
<description>Demo project for lin cms</description>
1717

@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>io.github.talelin</groupId>
4848
<artifactId>lin-cms-spring-boot-starter</artifactId>
49-
<version>0.0.1-RC6</version>
49+
<version>0.1.0-RELEASE</version>
5050
</dependency>
5151

5252
<dependency>

‎src/main/java/io/github/talelin/merak/common/aop/ResultAspect.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void doAfterReturning(Object ret) throws Throwable {
3030
UnifyResponseVO result = (UnifyResponseVO) ret;
3131
int code = result.getCode();
3232
String message = CodeMessageConfiguration.getMessage(code);
33-
if (StrUtil.isNotBlank(message)) {
33+
if (StrUtil.isNotBlank(message) && StrUtil.isBlank((CharSequence) result.getMessage())) {
3434
result.setMessage(message);
3535
}
3636
}

‎src/main/java/io/github/talelin/merak/common/exception/RestExceptionHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,11 @@ public UnifyResponseVO processException(HttpException exception, HttpServletRequ
5151
UnifyResponseVO unifyResponse = new UnifyResponseVO();
5252
unifyResponse.setRequest(getSimpleRequest(request));
5353
int code = exception.getCode();
54+
boolean messageOnly = exception.isMessageOnly();
5455
unifyResponse.setCode(code);
5556
response.setStatus(exception.getHttpCode());
5657
String errorMessage = CodeMessageConfiguration.getMessage(code);
57-
if (StrUtil.isBlank(errorMessage)) {
58+
if (StrUtil.isBlank(errorMessage) || messageOnly) {
5859
unifyResponse.setMessage(exception.getMessage());
5960
} else {
6061
unifyResponse.setMessage(errorMessage);

‎src/main/java/io/github/talelin/merak/common/interceptor/AuthorizeVerifyResolverImpl.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import io.github.talelin.core.token.DoubleJWT;
1818
import org.apache.logging.log4j.util.Strings;
1919
import org.springframework.beans.factory.annotation.Autowired;
20+
import org.springframework.beans.factory.annotation.Value;
2021
import org.springframework.stereotype.Component;
2122

2223
import javax.servlet.http.HttpServletRequest;
@@ -42,6 +43,12 @@ public class AuthorizeVerifyResolverImpl implements AuthorizeVerifyResolver {
4243
@Autowired
4344
private GroupService groupService;
4445

46+
@Value("${lin.cms.file.domain}")
47+
private String domain;
48+
49+
@Value("${lin.cms.file.serve-path:assets/**}")
50+
private String servePath;
51+
4552

4653
public boolean handleLogin(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
4754
String tokenStr = verifyHeader(request, response);
@@ -114,6 +121,13 @@ private boolean getClaim(Map<String, Claim> claims) {
114121
if (user == null) {
115122
throw new NotFoundException("user is not found", 10021);
116123
}
124+
String avatarUrl;
125+
if (user.getAvatar().startsWith("http")) {
126+
avatarUrl = user.getAvatar();
127+
} else {
128+
avatarUrl = domain + servePath.split("/")[0] + "/" + user.getAvatar();
129+
}
130+
user.setAvatar(avatarUrl);
117131
LocalUser.setLocalUser(user);
118132
return true;
119133
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,21 @@ public PageResponseVO getUsers(
6767
@AdminMeta(permission = "修改用户密码", module = "管理员")
6868
public UnifyResponseVO changeUserPassword(@PathVariable @Positive(message = "{id}") Long id, @RequestBody @Validated ResetPasswordDTO validator) {
6969
adminService.changeUserPassword(id, validator);
70-
return ResponseUtil.generateUnifyResponse(2);
70+
return ResponseUtil.generateUnifyResponse(4);
7171
}
7272

7373
@DeleteMapping("/user/{id}")
7474
@AdminMeta(permission = "删除用户", module = "管理员")
7575
public UnifyResponseVO deleteUser(@PathVariable @Positive(message = "{id}") Long id) {
7676
adminService.deleteUser(id);
77-
return ResponseUtil.generateUnifyResponse(3);
77+
return ResponseUtil.generateUnifyResponse(5);
7878
}
7979

8080
@PutMapping("/user/{id}")
8181
@AdminMeta(permission = "管理员更新用户信息", module = "管理员")
8282
public UnifyResponseVO updateUser(@PathVariable @Positive(message = "{id}") Long id, @RequestBody @Validated UpdateUserInfoDTO validator) {
8383
adminService.updateUserInfo(id, validator);
84-
return ResponseUtil.generateUnifyResponse(4);
84+
return ResponseUtil.generateUnifyResponse(6);
8585
}
8686

8787
@GetMapping("/group")
@@ -113,43 +113,43 @@ public GroupPermissionBO getGroup(@PathVariable @Positive(message = "{id}") Long
113113
@AdminMeta(permission = "新建权限组", module = "管理员")
114114
public UnifyResponseVO createGroup(@RequestBody @Validated NewGroupDTO validator) {
115115
adminService.createGroup(validator);
116-
return ResponseUtil.generateUnifyResponse(13);
116+
return ResponseUtil.generateUnifyResponse(15);
117117
}
118118

119119
@PutMapping("/group/{id}")
120120
@AdminMeta(permission = "更新一个权限组", module = "管理员")
121121
public UnifyResponseVO updateGroup(@PathVariable @Positive(message = "{id}") Long id,
122122
@RequestBody @Validated UpdateGroupDTO validator) {
123123
adminService.updateGroup(id, validator);
124-
return ResponseUtil.generateUnifyResponse(5);
124+
return ResponseUtil.generateUnifyResponse(7);
125125
}
126126

127127
@DeleteMapping("/group/{id}")
128128
@AdminMeta(permission = "删除一个权限组", module = "管理员")
129129
public UnifyResponseVO deleteGroup(@PathVariable @Positive(message = "{id}") Long id) {
130130
adminService.deleteGroup(id);
131-
return ResponseUtil.generateUnifyResponse(6);
131+
return ResponseUtil.generateUnifyResponse(8);
132132
}
133133

134134
@PostMapping("/permission/dispatch")
135135
@AdminMeta(permission = "分配单个权限", module = "管理员")
136136
public UnifyResponseVO dispatchPermission(@RequestBody @Validated DispatchPermissionDTO validator) {
137137
adminService.dispatchPermission(validator);
138-
return ResponseUtil.generateUnifyResponse(7);
138+
return ResponseUtil.generateUnifyResponse(9);
139139
}
140140

141141
@PostMapping("/permission/dispatch/batch")
142142
@AdminMeta(permission = "分配多个权限", module = "管理员")
143143
public UnifyResponseVO dispatchPermissions(@RequestBody @Validated DispatchPermissionsDTO validator) {
144144
adminService.dispatchPermissions(validator);
145-
return ResponseUtil.generateUnifyResponse(7);
145+
return ResponseUtil.generateUnifyResponse(9);
146146
}
147147

148148
@PostMapping("/permission/remove")
149149
@AdminMeta(permission = "删除多个权限", module = "管理员")
150150
public UnifyResponseVO removePermissions(@RequestBody @Validated RemovePermissionsDTO validator) {
151151
adminService.removePermissions(validator);
152-
return ResponseUtil.generateUnifyResponse(8);
152+
return ResponseUtil.generateUnifyResponse(10);
153153
}
154154

155155
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class UserController {
5555
@AdminRequired
5656
public UnifyResponseVO<String> register(@RequestBody @Validated RegisterDTO validator) {
5757
userService.createUser(validator);
58-
return ResponseUtil.generateUnifyResponse(9);
58+
return ResponseUtil.generateUnifyResponse(11);
5959
}
6060

6161
/**
@@ -83,7 +83,7 @@ public Tokens login(@RequestBody @Validated LoginDTO validator) {
8383
@LoginRequired
8484
public UnifyResponseVO update(@RequestBody @Validated UpdateInfoDTO validator) {
8585
userService.updateUserInfo(validator);
86-
return ResponseUtil.generateUnifyResponse(4);
86+
return ResponseUtil.generateUnifyResponse(6);
8787
}
8888

8989
/**
@@ -93,7 +93,7 @@ public UnifyResponseVO update(@RequestBody @Validated UpdateInfoDTO validator) {
9393
@LoginRequired
9494
public UnifyResponseVO updatePassword(@RequestBody @Validated ChangePasswordDTO validator) {
9595
userService.changeUserPassword(validator);
96-
return ResponseUtil.generateUnifyResponse(2);
96+
return ResponseUtil.generateUnifyResponse(4);
9797
}
9898

9999
/**

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public List<BookDO> searchBook(@RequestParam(value = "q", required = false, defa
4848
@PostMapping("")
4949
public UnifyResponseVO createBook(@RequestBody @Validated CreateOrUpdateBookDTO validator) {
5050
bookService.createBook(validator);
51-
return ResponseUtil.generateUnifyResponse(10);
51+
return ResponseUtil.generateUnifyResponse(12);
5252
}
5353

5454

@@ -59,7 +59,7 @@ public UnifyResponseVO updateBook(@PathVariable("id") @Positive(message = "{id}"
5959
throw new NotFoundException("book not found", 10022);
6060
}
6161
bookService.updateBook(book, validator);
62-
return ResponseUtil.generateUnifyResponse(11);
62+
return ResponseUtil.generateUnifyResponse(13);
6363
}
6464

6565

@@ -71,7 +71,7 @@ public UnifyResponseVO deleteBook(@PathVariable("id") @Positive(message = "{id}"
7171
throw new NotFoundException("book not found", 10022);
7272
}
7373
bookService.deleteById(book.getId());
74-
return ResponseUtil.generateUnifyResponse(12);
74+
return ResponseUtil.generateUnifyResponse(14);
7575
}
7676

7777

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package io.github.talelin.merak.vo;
2+
3+
import io.github.talelin.autoconfigure.bean.Code;
4+
import io.github.talelin.merak.common.util.ResponseUtil;
5+
import org.springframework.http.HttpStatus;
6+
7+
public class CreatedVO<T> extends UnifyResponseVO {
8+
9+
public CreatedVO() {
10+
super(Code.CREATED.getCode());
11+
ResponseUtil.setCurrentResponseHttpStatus(HttpStatus.CREATED.value());
12+
}
13+
14+
public CreatedVO(int code) {
15+
super(code);
16+
ResponseUtil.setCurrentResponseHttpStatus(HttpStatus.CREATED.value());
17+
}
18+
19+
public CreatedVO(T message) {
20+
super(message);
21+
ResponseUtil.setCurrentResponseHttpStatus(HttpStatus.CREATED.value());
22+
}
23+
24+
public CreatedVO(int code, T message) {
25+
super(code, message);
26+
ResponseUtil.setCurrentResponseHttpStatus(HttpStatus.CREATED.value());
27+
}
28+
29+
}

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package io.github.talelin.merak.vo;
2+
3+
import io.github.talelin.autoconfigure.bean.Code;
4+
5+
public class DeletedVO<T> extends UnifyResponseVO {
6+
7+
public DeletedVO() {
8+
super(Code.DELETED.getCode());
9+
}
10+
11+
public DeletedVO(int code) {
12+
super(code);
13+
}
14+
15+
public DeletedVO(T message) {
16+
super(message);
17+
}
18+
19+
public DeletedVO(int code, T message) {
20+
super(code, message);
21+
}
22+
23+
}

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

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package io.github.talelin.merak.vo;
22

3+
import io.github.talelin.autoconfigure.bean.Code;
4+
import io.github.talelin.autoconfigure.util.RequestUtil;
5+
import io.github.talelin.merak.common.util.ResponseUtil;
36
import lombok.AllArgsConstructor;
47
import lombok.Builder;
58
import lombok.Data;
6-
import lombok.NoArgsConstructor;
9+
import org.springframework.http.HttpStatus;
710

811

912
/**
@@ -12,12 +15,62 @@
1215
@Data
1316
@Builder
1417
@AllArgsConstructor
15-
@NoArgsConstructor
1618
public class UnifyResponseVO<T> {
1719

1820
private int code;
1921

2022
private T message;
2123

2224
private String request;
25+
26+
public UnifyResponseVO() {
27+
this.code = Code.SUCCESS.getCode();
28+
this.request = RequestUtil.getSimpleRequest();
29+
}
30+
31+
public UnifyResponseVO(int code) {
32+
this.code = code;
33+
this.request = RequestUtil.getSimpleRequest();
34+
}
35+
36+
public UnifyResponseVO(T message) {
37+
this.code = Code.SUCCESS.getCode();
38+
this.message = message;
39+
this.request = RequestUtil.getSimpleRequest();
40+
}
41+
42+
public UnifyResponseVO(HttpStatus httpStatus) {
43+
this.code = Code.SUCCESS.getCode();
44+
this.message = (T) Code.SUCCESS.getDescription();
45+
this.request = RequestUtil.getSimpleRequest();
46+
ResponseUtil.setCurrentResponseHttpStatus(httpStatus.value());
47+
}
48+
49+
public UnifyResponseVO(int code, T message) {
50+
this.code = code;
51+
this.message = message;
52+
this.request = RequestUtil.getSimpleRequest();
53+
}
54+
55+
public UnifyResponseVO(int code, HttpStatus httpStatus) {
56+
this.code = code;
57+
this.message = (T) Code.SUCCESS.getDescription();
58+
this.request = RequestUtil.getSimpleRequest();
59+
ResponseUtil.setCurrentResponseHttpStatus(httpStatus.value());
60+
}
61+
62+
public UnifyResponseVO(T message, HttpStatus httpStatus) {
63+
this.code = Code.SUCCESS.getCode();
64+
this.message = message;
65+
this.request = RequestUtil.getSimpleRequest();
66+
ResponseUtil.setCurrentResponseHttpStatus(httpStatus.value());
67+
}
68+
69+
public UnifyResponseVO(int code, T message, HttpStatus httpStatus) {
70+
this.code = code;
71+
this.message = message;
72+
this.request = RequestUtil.getSimpleRequest();
73+
ResponseUtil.setCurrentResponseHttpStatus(httpStatus.value());
74+
}
75+
2376
}

0 commit comments

Comments
 (0)