mirror of
https://github.moeyy.xyz/https://github.com/GeWuYou/forgeboot
synced 2025-10-27 16:14:32 +08:00
refactor(result): Remove unused properties in ResponseInformation and adjust parameter naming in R.kt
- Removed the responseI8nMessageArgs property that was not used in the ResponseInformation interface - In the R.kt file, rename the args parameter to i18bArgs to improve code readability and consistency - Updated related function calls, using the new i18bArgs parameter
This commit is contained in:
parent
3ce3cedc0f
commit
20118cd51c
@ -18,10 +18,4 @@ interface ResponseInformation {
|
|||||||
* @return 响应信息 code
|
* @return 响应信息 code
|
||||||
*/
|
*/
|
||||||
val responseI8nMessageCode: String
|
val responseI8nMessageCode: String
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取i18n响应信息参数
|
|
||||||
* @return 响应信息参数
|
|
||||||
*/
|
|
||||||
val responseI8nMessageArgs: Array<Any>?
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -78,12 +78,13 @@ data class R<T>(
|
|||||||
info: ResponseInformation,
|
info: ResponseInformation,
|
||||||
data: T? = null,
|
data: T? = null,
|
||||||
messageResolver: MessageResolver? = null,
|
messageResolver: MessageResolver? = null,
|
||||||
|
i18bArgs: Array<Any>? = null,
|
||||||
requestIdProvider: RequestIdProvider? = null,
|
requestIdProvider: RequestIdProvider? = null,
|
||||||
extenders: List<ResultExtender> = emptyList()
|
extenders: List<ResultExtender> = emptyList()
|
||||||
): R<T> {
|
): R<T> {
|
||||||
val msg = (messageResolver ?: DefaultMessageResolver).resolve(
|
val msg = (messageResolver ?: DefaultMessageResolver).resolve(
|
||||||
info.responseI8nMessageCode,
|
info.responseI8nMessageCode,
|
||||||
info.responseI8nMessageArgs
|
i18bArgs
|
||||||
)
|
)
|
||||||
val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId()
|
val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId()
|
||||||
return R(info.responseCode, true, msg, data, reqId).also {
|
return R(info.responseCode, true, msg, data, reqId).also {
|
||||||
@ -108,12 +109,13 @@ data class R<T>(
|
|||||||
info: ResponseInformation,
|
info: ResponseInformation,
|
||||||
data: T? = null,
|
data: T? = null,
|
||||||
messageResolver: MessageResolver? = null,
|
messageResolver: MessageResolver? = null,
|
||||||
|
i18bArgs: Array<Any>? = null,
|
||||||
requestIdProvider: RequestIdProvider? = null,
|
requestIdProvider: RequestIdProvider? = null,
|
||||||
extenders: List<ResultExtender> = emptyList()
|
extenders: List<ResultExtender> = emptyList()
|
||||||
): R<T> {
|
): R<T> {
|
||||||
val msg = (messageResolver ?: DefaultMessageResolver).resolve(
|
val msg = (messageResolver ?: DefaultMessageResolver).resolve(
|
||||||
info.responseI8nMessageCode,
|
info.responseI8nMessageCode,
|
||||||
info.responseI8nMessageArgs
|
i18bArgs
|
||||||
)
|
)
|
||||||
val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId()
|
val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId()
|
||||||
return R(info.responseCode, false, msg, data, reqId).also {
|
return R(info.responseCode, false, msg, data, reqId).also {
|
||||||
@ -139,13 +141,13 @@ data class R<T>(
|
|||||||
fun <T> success(
|
fun <T> success(
|
||||||
code: Int = 200,
|
code: Int = 200,
|
||||||
messageCode: String = "success",
|
messageCode: String = "success",
|
||||||
args: Array<Any>? = null,
|
|
||||||
data: T? = null,
|
data: T? = null,
|
||||||
|
i18bArgs: Array<Any>? = null,
|
||||||
messageResolver: MessageResolver? = null,
|
messageResolver: MessageResolver? = null,
|
||||||
requestIdProvider: RequestIdProvider? = null,
|
requestIdProvider: RequestIdProvider? = null,
|
||||||
extenders: List<ResultExtender> = emptyList()
|
extenders: List<ResultExtender> = emptyList()
|
||||||
): R<T> {
|
): R<T> {
|
||||||
val msg = (messageResolver ?: DefaultMessageResolver).resolve(messageCode, args)
|
val msg = (messageResolver ?: DefaultMessageResolver).resolve(messageCode, i18bArgs)
|
||||||
val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId()
|
val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId()
|
||||||
return R(code, true, msg, data, reqId).also {
|
return R(code, true, msg, data, reqId).also {
|
||||||
extenders.forEach { extender -> extender.extend(it.toMap()) }
|
extenders.forEach { extender -> extender.extend(it.toMap()) }
|
||||||
@ -170,13 +172,13 @@ data class R<T>(
|
|||||||
fun <T> failure(
|
fun <T> failure(
|
||||||
code: Int = 400,
|
code: Int = 400,
|
||||||
messageCode: String = "error",
|
messageCode: String = "error",
|
||||||
args: Array<Any>? = null,
|
|
||||||
data: T? = null,
|
data: T? = null,
|
||||||
|
i18bArgs: Array<Any>? = null,
|
||||||
messageResolver: MessageResolver? = null,
|
messageResolver: MessageResolver? = null,
|
||||||
requestIdProvider: RequestIdProvider? = null,
|
requestIdProvider: RequestIdProvider? = null,
|
||||||
extenders: List<ResultExtender> = emptyList()
|
extenders: List<ResultExtender> = emptyList()
|
||||||
): R<T> {
|
): R<T> {
|
||||||
val msg = (messageResolver ?: DefaultMessageResolver).resolve(messageCode, args)
|
val msg = (messageResolver ?: DefaultMessageResolver).resolve(messageCode, i18bArgs)
|
||||||
val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId()
|
val reqId = (requestIdProvider ?: DefaultRequestIdProvider).getRequestId()
|
||||||
return R(code, false, msg, data, reqId).also {
|
return R(code, false, msg, data, reqId).also {
|
||||||
extenders.forEach { extender -> extender.extend(it.toMap()) }
|
extenders.forEach { extender -> extender.extend(it.toMap()) }
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user