优化登录报错和远程函数执行报错的提示

TommyLemon · TommyLemon · commit 0e2b645465a3 · 2022-05-02T00:39:16.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java
@@ -16,6 +16,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
+import apijson.Log;
 import apijson.NotNull;
 import apijson.RequestMethod;
 import apijson.StringUtil;
@@ -178,15 +179,16 @@ public static Object invoke(@NotNull AbstractFunctionParser parser, @NotNull Str
 						+ "\n请检查函数名和参数数量是否与已定义的函数一致！"
 						+ "\n且必须为 function(key0,key1,...) 这种单函数格式！"
 						+ "\nfunction必须符合Java函数命名，key是用于在request内取值的键！"
-						+ "\n调用时不要有空格！" + e.getMessage());
+						+ "\n调用时不要有空格！" + (Log.DEBUG ? e.getMessage() : ""));
 			}
 			if (e instanceof InvocationTargetException) {
 				Throwable te = ((InvocationTargetException) e).getTargetException();
 				if (StringUtil.isEmpty(te.getMessage(), true) == false) { //到处把函数声明throws Exception改成throws Throwable挺麻烦
 					throw te instanceof Exception ? (Exception) te : new Exception(te.getMessage());
 				}
 				throw new IllegalArgumentException("字符 " + function + " 对应的远程函数传参类型错误！"
-						+ "\n请检查 key:value 中value的类型是否满足已定义的函数 " + getFunction(fb.getMethod(), fb.getKeys()) + " 的要求！" + e.getMessage());
+						+ "\n请检查 key:value 中value的类型是否满足已定义的函数 " + getFunction(fb.getMethod(), fb.getKeys()) + " 的要求！"
+						+ (Log.DEBUG ? e.getMessage() : ""));
 			}
 			throw e;
 		}
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -438,17 +438,17 @@ public void verifyUseRole(SQLConfig config, String table, RequestMethod method,
 	public void verifyLogin() throws Exception {
 		//未登录没有权限操作
 		if (visitorId == null) {
-			throw new NotLoggedInException("未登录或登录超时，请登录后再操作！");
+			throw new NotLoggedInException("未登录或登录过期，请登录后再操作！");
 		}
 
 		if (visitorId instanceof Number) {
 			if (((Number) visitorId).longValue() <= 0) {
-				throw new NotLoggedInException("未登录或登录超时，请登录后再操作！");
+				throw new NotLoggedInException("未登录或登录过期，请登录后再操作！");
 			}
 		} 
 		else if (visitorId instanceof String) {
 			if (StringUtil.isEmpty(visitorId, true)) {
-				throw new NotLoggedInException("未登录或登录超时，请登录后再操作！");
+				throw new NotLoggedInException("未登录或登录过期，请登录后再操作！");
 			}
 		}
 		else {

Original file line number	Diff line number	Diff line change
`@@ -438,17 +438,17 @@ public void verifyUseRole(SQLConfig config, String table, RequestMethod method,`
`438`	`438`	`public void verifyLogin() throws Exception {`
`439`	`439`	`//未登录没有权限操作`
`440`	`440`	`if (visitorId == null) {`
`441`		`- throw new NotLoggedInException("未登录或登录超时，请登录后再操作！");`
	`441`	`+ throw new NotLoggedInException("未登录或登录过期，请登录后再操作！");`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`if (visitorId instanceof Number) {`
`445`	`445`	`if (((Number) visitorId).longValue() <= 0) {`
`446`		`- throw new NotLoggedInException("未登录或登录超时，请登录后再操作！");`
	`446`	`+ throw new NotLoggedInException("未登录或登录过期，请登录后再操作！");`
`447`	`447`	`}`
`448`	`448`	`}`
`449`	`449`	`else if (visitorId instanceof String) {`
`450`	`450`	`if (StringUtil.isEmpty(visitorId, true)) {`
`451`		`- throw new NotLoggedInException("未登录或登录超时，请登录后再操作！");`
	`451`	`+ throw new NotLoggedInException("未登录或登录过期，请登录后再操作！");`
`452`	`452`	`}`
`453`	`453`	`}`
`454`	`454`	`else {`