diff --git a/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/handler/AbstractExceptionApiResultHandler.java b/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/handler/AbstractExceptionApiResultHandler.java index 1e490be..131516d 100644 --- a/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/handler/AbstractExceptionApiResultHandler.java +++ b/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/handler/AbstractExceptionApiResultHandler.java @@ -71,7 +71,7 @@ public abstract class AbstractExceptionApiResultHandler imp log(status, request, errorMsg, error); // 6.返回body - return err(code, message); + return err(Integer.parseInt(code), message); } protected T getRealCause(T ex) { diff --git a/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/handler/internal/StandardExceptionResultHandler.java b/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/handler/internal/StandardExceptionResultHandler.java index 2930588..606b0cc 100644 --- a/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/handler/internal/StandardExceptionResultHandler.java +++ b/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/handler/internal/StandardExceptionResultHandler.java @@ -37,7 +37,7 @@ public class StandardExceptionResultHandler extends AbstractExceptionApiResultHa final String message; if (error instanceof ApiException || error instanceof ServiceException) { if (error instanceof ApiException) { - code = ((ApiException) error).getCode(); + code = String.valueOf(((ApiException) error).getCode()); message = errorMsg; } else { String serviceCode = ((ServiceException) error).getCode(); diff --git a/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/support/GlobalErrorController.java b/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/support/GlobalErrorController.java index 57a708c..63eca2c 100644 --- a/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/support/GlobalErrorController.java +++ b/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/support/GlobalErrorController.java @@ -66,7 +66,7 @@ public class GlobalErrorController extends AbstractErrorController { String msg = getMessage(baseCode, status, cause, request); // 4.响应 - val body = ApiResult.err(code, msg); + val body = ApiResult.err(Integer.parseInt(code), msg); return new ResponseEntity<>(body, status); } diff --git a/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/support/GlobalExceptionHandler.java b/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/support/GlobalExceptionHandler.java index 20aba4b..b5739d8 100644 --- a/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/support/GlobalExceptionHandler.java +++ b/axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/exception/support/GlobalExceptionHandler.java @@ -85,7 +85,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { } // 3.响应 - return ApiResult.err(code, message); + return ApiResult.err(Integer.parseInt(code), message); }); return super.handleExceptionInternal(ex, result, headers, status, request); @@ -111,7 +111,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { } // 3.响应 - return ApiResult.err(code, message); + return ApiResult.err(Integer.parseInt(code), message); }); return super.handleExceptionInternal(ex, result, headers, status, request); } @@ -136,7 +136,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { } // 3.响应 - return ApiResult.err(code, message); + return ApiResult.err(Integer.parseInt(code), message); }); return super.handleExceptionInternal(ex, result, headers, status, request); } @@ -162,7 +162,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { } // 3.响应 - return ApiResult.err(code, message); + return ApiResult.err(Integer.parseInt(code), message); }); return super.handleExceptionInternal(ex, result, headers, status, request); } @@ -185,7 +185,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { message = "Required parameter '" + field + "' is not present"; // 3.响应 - return ApiResult.err(code, message); + return ApiResult.err(Integer.parseInt(code), message); }); return super.handleExceptionInternal(ex, result, headers, status, request); } @@ -230,7 +230,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { } // 3.响应 - return ApiResult.err(code, message); + return ApiResult.err(Integer.parseInt(code), message); }); return super.handleExceptionInternal(ex, result, headers, status, request); } diff --git a/axzo-common-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/axzo-common-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..61a1404 --- /dev/null +++ b/axzo-common-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,53 @@ +{ + "groups": [ + { + "sourceType": "cn.axzo.framework.boot.env.configoverride.ConfigOverrideProperties", + "name": "spring.config.override", + "type": "cn.axzo.framework.boot.env.configoverride.ConfigOverrideProperties" + } + ], + "properties": [ + { + "sourceType": "cn.axzo.framework.boot.env.configoverride.ConfigOverrideProperties", + "name": "enabled", + "type": "java.lang.Boolean", + "defaultValue": false + }, + { + "sourceType": "cn.axzo.framework.boot.env.configoverride.ConfigOverrideProperties", + "name": "props-file", + "type": "java.lang.String", + "defaultValue": "override" + }, + { + "name": "system.properties.fetch-local-ip", + "type": "java.lang.Boolean", + "defaultValue": true + }, + { + "name": "system.properties.fetch-local-ip-timeout-seconds", + "type": "java.lang.Integer", + "defaultValue": 2 + }, + { + "name": "spring.application.id", + "type": "java.lang.String", + "defaultValue": "000" + }, + { + "name": "spring.profiles.default", + "type": "java.lang.String", + "defaultValue": "local" + }, + { + "name": "spring.profiles.check-active", + "type": "java.lang.Boolean", + "defaultValue": true + }, + { + "name": "logging.file-enabled", + "type": "java.lang.Boolean", + "defaultValue": true + } + ] +} \ No newline at end of file diff --git a/axzo-common-boot/src/main/resources/META-INF/spring.factories b/axzo-common-boot/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..a1f1882 --- /dev/null +++ b/axzo-common-boot/src/main/resources/META-INF/spring.factories @@ -0,0 +1,18 @@ +# PropertySource Loaders +org.springframework.boot.env.PropertySourceLoader=\ +cn.axzo.framework.boot.env.UnicodePropertiesPropertySourceLoader + +# Application Listeners +org.springframework.context.ApplicationListener=\ +cn.axzo.framework.boot.logging.log4j2.Log4j2MDCSetupListener,\ +cn.axzo.framework.boot.logging.log4j2.Log4j2MDCListener,\ +cn.axzo.framework.boot.system.SystemPropertiesListener,\ +cn.axzo.framework.boot.DefaultProfileOverrideListener,\ +cn.axzo.framework.boot.env.CheckActiveProfilesListener,\ +cn.axzo.framework.boot.script.ScriptListener + +# Environment Post Processors +org.springframework.boot.env.EnvironmentPostProcessor=\ +cn.axzo.framework.boot.env.configoverride.ConfigOverrideEnvironmentPostProcessor,\ +cn.axzo.framework.boot.env.devtools.DevToolsPropertyPostProcessor,\ +cn.axzo.framework.boot.DynamicBannerEnvironmentPostProcessor \ No newline at end of file diff --git a/axzo-common-boot/src/main/resources/log4j2.StatusLogger.properties b/axzo-common-boot/src/main/resources/log4j2.StatusLogger.properties new file mode 100644 index 0000000..1706f14 --- /dev/null +++ b/axzo-common-boot/src/main/resources/log4j2.StatusLogger.properties @@ -0,0 +1,17 @@ +# 关闭log4j2在加载配置文件期间,由于找不到配置文件而打印的错误日志 +# spring-boot已经封装了加载配置文件的过程,log4j2无需再关心加载期, +# 为了避免两个框架都去加载配置文件,文件名最好不要用标准的命名,官方建议加上-spring, +# 这样一来,log4j2就找不到配置文件了,默认会打一条ERROR日志,所以要关闭此期间的StatusLogger + +# log4j2官网描述 +# Before a configuration is found, +# status logger level can be controlled with system property:org.apache.logging.log4j.simplelog.StatusLogger.level. +# After a configuration is found, +# status logger level can be controlled in the configuration file with the "status" attribute, +# for example: . + +# SpringBoot官网描述 +# When possible we recommend that you use the -spring variants for your logging configuration. +# For example log4j2-spring.xml rather than log4j2.xml. +# If you use standard configuration locations, Spring cannot completely control http initialization. +org.apache.logging.log4j.simplelog.StatusLogger.level=off \ No newline at end of file diff --git a/axzo-common-boot/src/main/resources/log4j2.component.properties b/axzo-common-boot/src/main/resources/log4j2.component.properties new file mode 100644 index 0000000..463ac4e --- /dev/null +++ b/axzo-common-boot/src/main/resources/log4j2.component.properties @@ -0,0 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#log4j的shutdownHook会托管给spring +log4j.shutdownHookEnabled=false \ No newline at end of file diff --git a/axzo-common-clients/feign-starter/src/main/java/cn.axzo.framework.client.feign/decoder/ApiResultErrorDecoder.java b/axzo-common-clients/feign-starter/src/main/java/cn.axzo.framework.client.feign/decoder/ApiResultErrorDecoder.java index 7cf339a..6f333dd 100644 --- a/axzo-common-clients/feign-starter/src/main/java/cn.axzo.framework.client.feign/decoder/ApiResultErrorDecoder.java +++ b/axzo-common-clients/feign-starter/src/main/java/cn.axzo.framework.client.feign/decoder/ApiResultErrorDecoder.java @@ -46,12 +46,12 @@ public class ApiResultErrorDecoder implements ErrorDecoder { } ApiResult apiResult = JSON.parseObject(response.body().asInputStream(), ApiResult.class); - String code = apiResult.getCode(); + Integer code = apiResult.getCode(); if (code == null) { return new ServiceException("ApiResult code is null"); } - IRespCode respCode = new RespCode(code, apiResult.getMsg()); + IRespCode respCode = new RespCode(String.valueOf(code), apiResult.getMsg()); if (isHystrixPresent && status.is4xxClientError()) { return new ClientException(respCode); // 不熔断 } diff --git a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/ApiException.java b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/ApiException.java index 79381ad..cce09c2 100644 --- a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/ApiException.java +++ b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/ApiException.java @@ -15,7 +15,7 @@ import static java.lang.String.format; public class ApiException extends RuntimeException { @Getter - private final String code; + private final Integer code; @Getter private final boolean badRequest; @@ -38,7 +38,7 @@ public class ApiException extends RuntimeException { ApiException(boolean badRequest, String message, IRespCode code, Object... args) { super(format(message == null ? code.getMessage() : message, args)); - this.code = code.getRespCode(); + this.code = Integer.parseInt(code.getRespCode()); this.badRequest = badRequest; } } diff --git a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/code/BaseCode.java b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/code/BaseCode.java index f9c42ea..c31ba37 100644 --- a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/code/BaseCode.java +++ b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/code/BaseCode.java @@ -16,7 +16,7 @@ import java.util.stream.Stream; @Description("基础错误码") public enum BaseCode implements IModuleRespCode{ - SUCCESS("000", "success", 200) { + SUCCESS("200", "success", 200) { @Override public String getRespCode() { return "200"; diff --git a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiCoreResult.java b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiCoreResult.java index d906334..55c90d4 100644 --- a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiCoreResult.java +++ b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiCoreResult.java @@ -29,7 +29,7 @@ import static jodd.util.StringUtil.isNotBlank; public abstract class ApiCoreResult implements Result { @ApiModelProperty(value = "业务码", required = true, position = 1) - protected String code; + protected Integer code; @ApiModelProperty(value = "业务码说明", required = true, example = "成功", position = 2) protected String msg; @@ -45,7 +45,7 @@ public abstract class ApiCoreResult implements Result { @Transient public boolean isSuccess() { // 兼容 - return code.equals("00000000") || of(getOKCodes()).anyMatch(respOKCode -> Objects.equals(this.code, respOKCode.getRespCode())); + return code == 200 || of(getOKCodes()).anyMatch(respOKCode -> Objects.equals(String.valueOf(this.code), respOKCode.getRespCode())); } @Transient @@ -58,7 +58,7 @@ public abstract class ApiCoreResult implements Result { return new IRespCode() { @Override public String getCode() { - return code; + return String.valueOf(code); } @Override @@ -83,9 +83,9 @@ public abstract class ApiCoreResult implements Result { private static final String GLOBAL_SUCCESS_CODE = System.getProperty("apiresult.success_code"); - public String getCode() { + public Integer getCode() { if (isNotBlank(GLOBAL_SUCCESS_CODE) && isSuccess()) { - return GLOBAL_SUCCESS_CODE; + return Integer.parseInt(GLOBAL_SUCCESS_CODE); } return this.code; } diff --git a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiListResult.java b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiListResult.java index 69afa73..ceb2bce 100644 --- a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiListResult.java +++ b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiListResult.java @@ -22,7 +22,7 @@ public class ApiListResult extends ApiCoreResult> { } public static ApiListResult ok(List data) { - return build(BaseCode.SUCCESS.getRespCode(), BaseCode.SUCCESS.getMessage(), data); + return build(Integer.parseInt(BaseCode.SUCCESS.getRespCode()), BaseCode.SUCCESS.getMessage(), data); } public static ApiListResult err(IRespCode code) { @@ -30,18 +30,18 @@ public class ApiListResult extends ApiCoreResult> { } public static ApiListResult err(IRespCode code, String message) { - return err(code.getRespCode(), message); + return err(Integer.parseInt(code.getRespCode()), message); } public static ApiListResult err(String message) { - return err(BaseCode.SERVER_ERROR.getRespCode(), message); + return err(Integer.parseInt(BaseCode.SERVER_ERROR.getRespCode()), message); } public static ApiListResult err(IRespCode code, List data) { - return build(code.getRespCode(), code.getMessage(), data); + return build(Integer.parseInt(code.getRespCode()), code.getMessage(), data); } - public static ApiListResult err(String code, String message) { + public static ApiListResult err(Integer code, String message) { if (code == null) { return err(message); } @@ -53,15 +53,15 @@ public class ApiListResult extends ApiCoreResult> { } public static ApiListResult build(IRespCode code, List data) { - return build(code.getRespCode(), code.getMessage(), data); + return build(Integer.parseInt(code.getRespCode()), code.getMessage(), data); } - public static ApiListResult build(String code, String message, List data) { + public static ApiListResult build(Integer code, String message, List data) { return new ApiListResult<>(code, message, data); } @ConstructorProperties({"code", "msg", "data"}) - public ApiListResult(String code, String message, List data) { + public ApiListResult(Integer code, String message, List data) { super(code, message, data); } } diff --git a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java index 45037d9..2800bcc 100644 --- a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java +++ b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java @@ -70,17 +70,17 @@ public class ApiPageResult extends ApiCoreResult>{ } public static ApiPageResult ok(List data, Long total) { - return build(total, SUCCESS.getRespCode(), SUCCESS.getMessage(), data, + return build(total, Integer.parseInt(SUCCESS.getRespCode()), SUCCESS.getMessage(), data, null, null, null); } public static ApiPageResult ok(List data, Long total, Integer pageNumber, Integer pageSize) { - return build(total, SUCCESS.getRespCode(), SUCCESS.getMessage(), data, pageNumber, pageSize, null); + return build(total, Integer.parseInt(SUCCESS.getRespCode()), SUCCESS.getMessage(), data, pageNumber, pageSize, null); } public static ApiPageResult ok(List data, Long total, Integer pageNumber, Integer pageSize, PageVerbose verbose) { - return build(total, SUCCESS.getRespCode(), SUCCESS.getMessage(), data, pageNumber, pageSize, verbose); + return build(total, Integer.parseInt(SUCCESS.getRespCode()), SUCCESS.getMessage(), data, pageNumber, pageSize, verbose); } public static ApiPageResult err(IRespCode code) { @@ -88,10 +88,10 @@ public class ApiPageResult extends ApiCoreResult>{ } public static ApiPageResult err(IRespCode code, String message) { - return err(code.getRespCode(), message); + return err(Integer.parseInt(code.getRespCode()), message); } - public static ApiPageResult err(String code, String message) { + public static ApiPageResult err(Integer code, String message) { return build(null, code, message, null, null, null, null); } @@ -101,21 +101,21 @@ public class ApiPageResult extends ApiCoreResult>{ public static ApiPageResult build(Long total, IRespCode code, List data, Integer pageNum, Integer pageSize) { - return build(total, code.getRespCode(), code.getMessage(), data, pageNum, pageSize, null); + return build(total, Integer.parseInt(code.getRespCode()), code.getMessage(), data, pageNum, pageSize, null); } - public static ApiPageResult build(Long total, String code, String message, List data, + public static ApiPageResult build(Long total, Integer code, String message, List data, Integer pageNum, Integer pageSize) { return new ApiPageResult<>(total, code, message, data, pageNum, pageSize, null); } - public static ApiPageResult build(Long total, String code, String message, List data, + public static ApiPageResult build(Long total, Integer code, String message, List data, Integer pageNum, Integer pageSize, PageVerbose verbose) { return new ApiPageResult<>(total, code, message, data, pageNum, pageSize, verbose); } @ConstructorProperties({"code", "msg", "data"}) - public ApiPageResult(Long total, String code, String message, List list, Integer pageNum, Integer pageSize, + public ApiPageResult(Long total, Integer code, String message, List list, Integer pageNum, Integer pageSize, PageVerbose verbose) { PageData data = new PageData(); data.setList(list); diff --git a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiResult.java b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiResult.java index 2e29c1d..f746134 100644 --- a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiResult.java +++ b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiResult.java @@ -33,18 +33,18 @@ public class ApiResult extends ApiCoreResult { } public static ApiResult err(IRespCode code, String message) { - return err(code.getRespCode(), message); + return err(Integer.parseInt(code.getRespCode()), message); } public static ApiResult err(IRespCode code, E data) { - return build(code.getRespCode(), code.getMessage(), data); + return build(Integer.parseInt(code.getRespCode()), code.getMessage(), data); } public static ApiResult err(String message) { - return err(SERVER_ERROR.getRespCode(), message); + return err(Integer.parseInt(SERVER_ERROR.getRespCode()), message); } - public static ApiResult err(String code, String message) { + public static ApiResult err(Integer code, String message) { if (code == null) { return err(message); } @@ -56,10 +56,10 @@ public class ApiResult extends ApiCoreResult { } public static ApiResult build(IRespCode code, E data) { - return build(code.getRespCode(), code.getMessage(), data); + return build(Integer.parseInt(code.getRespCode()), code.getMessage(), data); } - public static ApiResult build(String code, String message, E data) { + public static ApiResult build(Integer code, String message, E data) { return new ApiResult<>(code, message, data); } @@ -74,7 +74,7 @@ public class ApiResult extends ApiCoreResult { } @ConstructorProperties({"code", "msg", "data"}) - public ApiResult(String code, String message, E data) { + public ApiResult(Integer code, String message, E data) { super(code, message, data); } diff --git a/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiListResponse.java b/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiListResponse.java index 34a657f..8f28402 100644 --- a/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiListResponse.java +++ b/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiListResponse.java @@ -139,7 +139,7 @@ public class ApiListResponse extends ApiCoreResponse, ApiListResult ApiListResponse err(String code, String message) { + public ApiListResponse err(Integer code, String message) { return wrapper(ApiListResult.err(code, message)); } @@ -151,7 +151,7 @@ public class ApiListResponse extends ApiCoreResponse, ApiListResult ApiListResponse build(String code, String message, List data) { + public ApiListResponse build(Integer code, String message, List data) { return wrapper(ApiListResult.build(code, message, data)); } diff --git a/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiPageResponse.java b/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiPageResponse.java index a5f6f0c..a488cb4 100644 --- a/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiPageResponse.java +++ b/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiPageResponse.java @@ -167,7 +167,7 @@ public class ApiPageResponse extends ApiCoreResponse, ApiPageResu return wrapper(ApiPageResult.err(code, message)); } - public ApiPageResponse err(String code, String message) { + public ApiPageResponse err(Integer code, String message) { return wrapper(ApiPageResult.err(code, message)); } @@ -179,7 +179,7 @@ public class ApiPageResponse extends ApiCoreResponse, ApiPageResu return wrapper(ApiPageResult.build(total, code, data, pageNum, pageSize)); } - public ApiPageResponse build(Long total, String code, String message, List data, + public ApiPageResponse build(Long total, Integer code, String message, List data, Integer pageNum, Integer pageSize) { return wrapper(ApiPageResult.build(total, code, message, data, pageNum, pageSize)); } diff --git a/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiResponse.java b/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiResponse.java index a293b2a..dca3374 100644 --- a/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiResponse.java +++ b/axzo-common-web/src/main/java/cn.axzo.framework.web/http/ApiResponse.java @@ -161,7 +161,7 @@ public class ApiResponse extends ApiCoreResponse> { return wrapper(ApiResult.err(message)); } - public ApiResponse err(String code, String message) { + public ApiResponse err(Integer code, String message) { return wrapper(ApiResult.err(code, message)); } @@ -177,7 +177,7 @@ public class ApiResponse extends ApiCoreResponse> { return wrapper(ApiResult.build(code, data)); } - public ApiResponse build(String code, String message, E data) { + public ApiResponse build(Integer code, String message, E data) { return wrapper(ApiResult.build(code, message, data)); }