From 12bbc62ef0d5fdeed5321033113426e89458c14e Mon Sep 17 00:00:00 2001 From: Timi Date: Fri, 7 Nov 2025 16:54:56 +0800 Subject: [PATCH] fix TimiX multilingual --- .../com/imyeyu/java/bean/timi/TimiError.java | 6 ++-- .../imyeyu/java/bean/timi/TimiException.java | 31 +++++++++++++------ .../imyeyu/java/bean/timi/TimiResponse.java | 4 +-- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/imyeyu/java/bean/timi/TimiError.java b/src/main/java/com/imyeyu/java/bean/timi/TimiError.java index 06a1bca..3e9a8d7 100644 --- a/src/main/java/com/imyeyu/java/bean/timi/TimiError.java +++ b/src/main/java/com/imyeyu/java/bean/timi/TimiError.java @@ -15,9 +15,9 @@ public class TimiError extends AssertionError implements LanguageMsgMapping msgArgs; + protected transient Map msgArgs; /** @param code 代码 */ public TimiError(TimiCode code) { @@ -45,7 +45,7 @@ public class TimiError extends AssertionError implements LanguageMsgMapping toResponse() { - return new TimiResponse<>(code).msg(getMessage()).msgKey(msgKey); + return new TimiResponse<>(code).msg(getMessage()).msgKey(msgKey, msgArgs); } @Override diff --git a/src/main/java/com/imyeyu/java/bean/timi/TimiException.java b/src/main/java/com/imyeyu/java/bean/timi/TimiException.java index 9393075..1800915 100644 --- a/src/main/java/com/imyeyu/java/bean/timi/TimiException.java +++ b/src/main/java/com/imyeyu/java/bean/timi/TimiException.java @@ -17,9 +17,9 @@ public class TimiException extends RuntimeException implements LanguageMsgMappin /** 代码 */ protected final TimiCode code; - protected String msgKey; + protected transient String msgKey; - protected Map msgArgs; + protected transient Map msgArgs; /** @param code 代码 */ public TimiException(TimiCode code) { @@ -58,7 +58,7 @@ public class TimiException extends RuntimeException implements LanguageMsgMappin } public TimiResponse toResponse() { - return new TimiResponse<>(code).msg(getMessage()).msgKey(msgKey); + return new TimiResponse<>(code).msg(getMessage()).msgKey(msgKey, msgArgs); } @Override @@ -116,12 +116,25 @@ public class TimiException extends RuntimeException implements LanguageMsgMappin return t; } + public static T required(T t, String message, String msgKey) { + if (TimiJava.isEmpty(t)) { + throw new TimiException(TimiCode.ARG_MISS, message).msgKey(msgKey); + } + return t; + } + public static void requiredNull(T t, String message) throws TimiException { if (t != null) { throw new TimiException(TimiCode.ERROR, message); } } + public static void requiredNull(T t, String message, String msgKey) throws TimiException { + if (t != null) { + throw new TimiException(TimiCode.ERROR, message).msgKey(msgKey); + } + } + public static void requiredTrue(boolean bool, String message) throws TimiException { if (bool) { return; @@ -129,11 +142,11 @@ public class TimiException extends RuntimeException implements LanguageMsgMappin throw new TimiException(TimiCode.ERROR, message); } - public static void requiredFalse(boolean bool, String message) throws TimiException { - if (!bool) { + public static void requiredTrue(boolean bool, String message, String msgKey) throws TimiException { + if (bool) { return; } - throw new TimiException(TimiCode.ERROR, message); + throw new TimiException(TimiCode.ERROR, message).msgKey(msgKey); } public static void requiredTrue(CallbackReturn callback, String message) throws TimiException { @@ -144,11 +157,11 @@ public class TimiException extends RuntimeException implements LanguageMsgMappin throw new TimiException(TimiCode.ERROR, message); } - public static void requiredFalse(CallbackReturn callback, String message) throws TimiException { + public static void requiredTrue(CallbackReturn callback, String message, String msgKey) throws TimiException { TimiException.required(callback, "not found callback"); - if (!callback.handler()) { + if (callback.handler()) { return; } - throw new TimiException(TimiCode.ERROR, message); + throw new TimiException(TimiCode.ERROR, message).msgKey(msgKey); } } diff --git a/src/main/java/com/imyeyu/java/bean/timi/TimiResponse.java b/src/main/java/com/imyeyu/java/bean/timi/TimiResponse.java index cca888f..d124247 100644 --- a/src/main/java/com/imyeyu/java/bean/timi/TimiResponse.java +++ b/src/main/java/com/imyeyu/java/bean/timi/TimiResponse.java @@ -19,9 +19,9 @@ public class TimiResponse implements Serializable, LanguageMsgMapping msgArgs; + protected transient Map msgArgs; /** 数据体 */ protected T data;