diff --git a/forgeboot-common/forgeboot-common-result/forgeboot-common-result-api/src/main/java/com/gewuyou/forgeboot/common/result/api/ResponseInformation.kt b/forgeboot-common/forgeboot-common-result/forgeboot-common-result-api/src/main/java/com/gewuyou/forgeboot/common/result/api/ResponseInformation.kt index 381efbc..3a04aaf 100644 --- a/forgeboot-common/forgeboot-common-result/forgeboot-common-result-api/src/main/java/com/gewuyou/forgeboot/common/result/api/ResponseInformation.kt +++ b/forgeboot-common/forgeboot-common-result/forgeboot-common-result-api/src/main/java/com/gewuyou/forgeboot/common/result/api/ResponseInformation.kt @@ -18,10 +18,4 @@ interface ResponseInformation { * @return 响应信息 code */ val responseI8nMessageCode: String - - /** - * 获取i18n响应信息参数 - * @return 响应信息参数 - */ - val responseI8nMessageArgs: Array? } diff --git a/forgeboot-common/forgeboot-common-result/forgeboot-common-result-impl/src/main/kotlin/com/gewuyou/forgeboot/common/result/R.kt b/forgeboot-common/forgeboot-common-result/forgeboot-common-result-impl/src/main/kotlin/com/gewuyou/forgeboot/common/result/R.kt index d999308..5184d2c 100644 --- a/forgeboot-common/forgeboot-common-result/forgeboot-common-result-impl/src/main/kotlin/com/gewuyou/forgeboot/common/result/R.kt +++ b/forgeboot-common/forgeboot-common-result/forgeboot-common-result-impl/src/main/kotlin/com/gewuyou/forgeboot/common/result/R.kt @@ -78,12 +78,13 @@ data class R( info: ResponseInformation, data: T? = null, messageResolver: MessageResolver? = null, + i18bArgs: Array? = null, requestIdProvider: RequestIdProvider? = null, extenders: List = emptyList() ): R { val msg = (messageResolver ?: DefaultMessageResolver).resolve( info.responseI8nMessageCode, - info.responseI8nMessageArgs + i18bArgs ) val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId() return R(info.responseCode, true, msg, data, reqId).also { @@ -108,12 +109,13 @@ data class R( info: ResponseInformation, data: T? = null, messageResolver: MessageResolver? = null, + i18bArgs: Array? = null, requestIdProvider: RequestIdProvider? = null, extenders: List = emptyList() ): R { val msg = (messageResolver ?: DefaultMessageResolver).resolve( info.responseI8nMessageCode, - info.responseI8nMessageArgs + i18bArgs ) val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId() return R(info.responseCode, false, msg, data, reqId).also { @@ -139,13 +141,13 @@ data class R( fun success( code: Int = 200, messageCode: String = "success", - args: Array? = null, data: T? = null, + i18bArgs: Array? = null, messageResolver: MessageResolver? = null, requestIdProvider: RequestIdProvider? = null, extenders: List = emptyList() ): R { - val msg = (messageResolver ?: DefaultMessageResolver).resolve(messageCode, args) + val msg = (messageResolver ?: DefaultMessageResolver).resolve(messageCode, i18bArgs) val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId() return R(code, true, msg, data, reqId).also { extenders.forEach { extender -> extender.extend(it.toMap()) } @@ -170,13 +172,13 @@ data class R( fun failure( code: Int = 400, messageCode: String = "error", - args: Array? = null, data: T? = null, + i18bArgs: Array? = null, messageResolver: MessageResolver? = null, requestIdProvider: RequestIdProvider? = null, extenders: List = emptyList() ): R { - val msg = (messageResolver ?: DefaultMessageResolver).resolve(messageCode, args) + val msg = (messageResolver ?: DefaultMessageResolver).resolve(messageCode, i18bArgs) val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId() return R(code, false, msg, data, reqId).also { extenders.forEach { extender -> extender.extend(it.toMap()) }