Skip to content

Commit 497827c

Browse files
committed
feat: 内部调用结果不需要包装,和 @ApiFormat 无关
1 parent d9b192a commit 497827c

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/advisor/ApiResultAdvisor.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.github.cadecode.uniboot.common.core.web.response.ApiResult;
77
import com.github.cadecode.uniboot.framework.api.annotation.ApiFormat;
88
import com.github.cadecode.uniboot.framework.api.enums.FrameErrorEnum;
9+
import com.github.cadecode.uniboot.framework.api.util.RequestUtil;
910
import org.springframework.core.MethodParameter;
1011
import org.springframework.http.HttpStatus;
1112
import org.springframework.http.MediaType;
@@ -59,15 +60,20 @@ public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType
5960
private Object apiResultFormat(MethodParameter returnType, Object body, ServerHttpResponse response) {
6061
// 是否需要包装标记
6162
boolean formatFlag;
62-
// 获取方法上的 ApiFormat 注解
63-
ApiFormat formatM = returnType.getMethodAnnotation(ApiFormat.class);
64-
// 以方法上注解为主
65-
if (Objects.nonNull(formatM)) {
66-
formatFlag = formatM.value();
63+
// 如果是内部调用则不需要包装
64+
if (RequestUtil.isInnerRequest(null)) {
65+
formatFlag = false;
6766
} else {
68-
// 获取类上的 ApiFormat 注解
69-
ApiFormat formatC = returnType.getContainingClass().getAnnotation(ApiFormat.class);
70-
formatFlag = Objects.nonNull(formatC) && formatC.value();
67+
// 获取方法上的 ApiFormat 注解
68+
ApiFormat formatM = returnType.getMethodAnnotation(ApiFormat.class);
69+
// 以方法上注解为主
70+
if (Objects.nonNull(formatM)) {
71+
formatFlag = formatM.value();
72+
} else {
73+
// 获取类上的 ApiFormat 注解
74+
ApiFormat formatC = returnType.getContainingClass().getAnnotation(ApiFormat.class);
75+
formatFlag = Objects.nonNull(formatC) && formatC.value();
76+
}
7177
}
7278
// 不需要包装,直接返回
7379
if (!formatFlag) {

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/controller/SysApiController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ public List<SysApiSwaggerVo> listSwaggerVo() {
123123
}
124124

125125
@ApiInner(onlyClient = true)
126-
@ApiFormat(false)
127126
@ApiOperation("查询API列表-全部")
128127
@PostMapping("list_roles_vo")
129128
public List<SysApiRolesVo> listRolesVo() {

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/controller/SysLogController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ public boolean delete(@RequestBody @NotEmpty List<Long> idList) {
6868
}
6969

7070
@ApiInner(onlyClient = true)
71-
@ApiFormat(false)
7271
@ApiOperation("添加")
7372
@PostMapping("save")
7473
public boolean save(@RequestBody @NotEmpty List<SysLogInfoDto> dtoList) {

0 commit comments

Comments
 (0)