From b8dac589e66b578fb3d06cd60145a248dc1f564f Mon Sep 17 00:00:00 2001 From: codering Date: Thu, 3 Apr 2025 09:26:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=94=99=E8=AF=AF=E7=A0=81=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=90=8D=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nop-match/src/main/java/io/nop/match/MatchErrors.java | 2 +- nop-orm-eql/src/main/java/io/nop/orm/eql/OrmEqlErrors.java | 6 +++--- .../src/main/java/io/nop/orm/model/OrmModelErrors.java | 2 +- .../src/main/java/io/nop/rpc/core/RpcErrors.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nop-match/src/main/java/io/nop/match/MatchErrors.java b/nop-match/src/main/java/io/nop/match/MatchErrors.java index 32081b0c3..c72faae7e 100644 --- a/nop-match/src/main/java/io/nop/match/MatchErrors.java +++ b/nop-match/src/main/java/io/nop/match/MatchErrors.java @@ -88,7 +88,7 @@ public interface MatchErrors { "[{jsonPath}]对应的值[{value}]与变量[{varName}]的值[{varValue}]不匹配", ARG_JSON_PATH, ARG_VALUE, ARG_VAR_NAME, ARG_VAR_VALUE); - ErrorCode ERR_MATCH_INVALID_VAR_NAME = define("nop.err.match.invalid-var-name", "变量名[varName]格式不合法", ARG_VAR_NAME); + ErrorCode ERR_MATCH_INVALID_VAR_NAME = define("nop.err.match.invalid-var-name", "变量名[{varName}]格式不合法", ARG_VAR_NAME); ErrorCode ERR_MATCH_BETWEEN_CHECK_FAIL = define("nop.err.match.between-check-fail", "[{jsonPath}]对应的值[{value}]不在有效的区间范围内：filterOp={filterOp},min={min},max={max}", ARG_JSON_PATH, ARG_VALUE, diff --git a/nop-orm-eql/src/main/java/io/nop/orm/eql/OrmEqlErrors.java b/nop-orm-eql/src/main/java/io/nop/orm/eql/OrmEqlErrors.java index a3b13ab4c..cac76f653 100644 --- a/nop-orm-eql/src/main/java/io/nop/orm/eql/OrmEqlErrors.java +++ b/nop-orm-eql/src/main/java/io/nop/orm/eql/OrmEqlErrors.java @@ -154,13 +154,13 @@ public interface OrmEqlErrors { ErrorCode ERR_EQL_DECORATOR_ARG_TYPE_IS_NOT_EXPECTED = define("nop.err.eql.decorator-arg-type-is-not-expected", "注解[{decorator}]的参数[{argIndex}]的类型不是期待的数据类型:{expected}", ARG_DECORATOR, ARG_ARG_INDEX, ARG_EXPECTED); - ErrorCode ERR_EQL_FUNC_TOO_FEW_ARGS = define("nop.err.eql.func-too-few-args", "函数[{funcName]的参数个数不足", + ErrorCode ERR_EQL_FUNC_TOO_FEW_ARGS = define("nop.err.eql.func-too-few-args", "函数[{funcName}]的参数个数不足", ARG_FUNC_NAME); - ErrorCode ERR_EQL_FUNC_TOO_MANY_ARGS = define("nop.err.eql.func-too-many-args", "函数[{funcName]的参数个数过多", + ErrorCode ERR_EQL_FUNC_TOO_MANY_ARGS = define("nop.err.eql.func-too-many-args", "函数[{funcName}]的参数个数过多", ARG_FUNC_NAME); - ErrorCode ERR_EQL_UNKNOWN_FUNCTION = define("nop.err.eql.unknown-function", "未知的函数[{funcName]", ARG_FUNC_NAME); + ErrorCode ERR_EQL_UNKNOWN_FUNCTION = define("nop.err.eql.unknown-function", "未知的函数[{funcName}]", ARG_FUNC_NAME); ErrorCode ERR_EQL_FUNC_ONLY_ALLOW_IN_WINDOW_EXPR = define("nop.err.eql.func-only-allow-in-window-expr", "函数[{funcName}]只允许在窗口表达式中使用", ARG_FUNC_NAME); diff --git a/nop-orm-model/src/main/java/io/nop/orm/model/OrmModelErrors.java b/nop-orm-model/src/main/java/io/nop/orm/model/OrmModelErrors.java index 3486f47a1..fb5605c56 100644 --- a/nop-orm-model/src/main/java/io/nop/orm/model/OrmModelErrors.java +++ b/nop-orm-model/src/main/java/io/nop/orm/model/OrmModelErrors.java @@ -97,7 +97,7 @@ public interface OrmModelErrors { "实体[{entityName}]的关联属性[{propName}]不是数据库中的列，只支持主外键关联", ARG_ENTITY_NAME, ARG_PROP_NAME); ErrorCode ERR_ORM_MODEL_RELATION_JOIN_IS_EMPTY = define("nop.err.orm.model.relation-join-is-empty", - "对象[{entityName]的属性[{refName}]所对应的关联条件为空", ARG_ENTITY_NAME, ARG_REF_NAME); + "对象[{entityName}]的属性[{refName}]所对应的关联条件为空", ARG_ENTITY_NAME, ARG_REF_NAME); ErrorCode ERR_ORM_ENTITY_MODEL_NO_PK = define("nop.err.orm.model.entity-model-no-pk", "对象模型[{entityName}]没有定义主键"); diff --git a/nop-rpc/nop-rpc-core/src/main/java/io/nop/rpc/core/RpcErrors.java b/nop-rpc/nop-rpc-core/src/main/java/io/nop/rpc/core/RpcErrors.java index aa32bf8a1..af6b4d13c 100644 --- a/nop-rpc/nop-rpc-core/src/main/java/io/nop/rpc/core/RpcErrors.java +++ b/nop-rpc/nop-rpc-core/src/main/java/io/nop/rpc/core/RpcErrors.java @@ -37,7 +37,7 @@ public interface RpcErrors { ErrorCode ERR_RPC_CHANNEL_CLOSED = define("nop.err.rpc.channel-closed", "RPC连接已关闭"); ErrorCode ERR_RPC_TOO_MANY_INFLIGHT_MESSAGES = define("nop.err.rpc.too-many-inflight-messages", - "正在等待响应的RPC消息过多，超过最大限制[{maxInflights]", ARG_MAX_WAIT_REQUESTS); + "正在等待响应的RPC消息过多，超过最大限制[{maxWaitRequests}]", ARG_MAX_WAIT_REQUESTS); ErrorCode ERR_RPC_NO_HANDLER = define("nop.err.rpc.no-handler", "RPC服务没有找到合适的处理函数", ARG_REQUEST, ARG_SERVICE_NAME, ARG_SERVICE_METHOD); -- Gitee