前端传 SQL 关键词 OVER 和 AGAINST 去掉多余的空格

TommyLemon · TommyLemon · commit bbf0fc33a938 · 2021-09-28T02:14:26.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -1562,10 +1562,10 @@ public String getColumnPrase(String expression, boolean containRaw) {
 			// 全文索引 math(name,tag) AGAINST ('a b +c -d' IN NATURALE LANGUAGE MODE)  // IN BOOLEAN MODE
 
 			//有函数,但不是窗口函数
-			int overIndex = expression.indexOf(") OVER (");
-			int againstIndex = expression.indexOf(") AGAINST (");
-			boolean containOver = overIndex > 0 && overIndex < expression.length() - ") OVER (".length();
-			boolean containAgainst = againstIndex > 0 && againstIndex < expression.length() - ") AGAINST (".length();
+			int overIndex = expression.indexOf(")OVER(");  // 传参不传空格，拼接带空格  ") OVER (");
+			int againstIndex = expression.indexOf(")AGAINST(");  // 传参不传空格，拼接带空格  ") AGAINST (");
+			boolean containOver = overIndex > 0 && overIndex < expression.length() - ")OVER(".length();
+			boolean containAgainst = againstIndex > 0 && againstIndex < expression.length() - ")AGAINST(".length();
 
 			if (containOver && containAgainst) {
 				throw new IllegalArgumentException("字符 " + expression + " 不合法！"
@@ -1658,8 +1658,9 @@ public String getColumnPrase(String expression, boolean containRaw) {
 				// 别名
 				String alias = s2.lastIndexOf(":") < s2.lastIndexOf(")") ? null : s2.substring(s2.lastIndexOf(":") + 1);
 				// 获取后半部分的参数解析 (agr0 agr1 ...)
-				String argsString2[] = parseArgsSplitWithComma(argString2, false, containRaw);
-				expression = fun + "(" + StringUtil.getString(agrsString1) + (containOver ? ") OVER (" : ") AGAINST (") + StringUtil.getString(argsString2) + ")" + (StringUtil.isEmpty(alias, true) ? "" : " AS " + quote + alias + quote);			}
+				String argsString2[] = parseArgsSplitWithComma(argString2, false, containRaw); 
+				expression = fun + "(" + StringUtil.getString(agrsString1) + (containOver ? ") OVER (" : ") AGAINST (") // 传参不传空格，拼接带空格
+						+ StringUtil.getString(argsString2) + ")" + (StringUtil.isEmpty(alias, true) ? "" : " AS " + quote + alias + quote);			}
 		}
 
 		return expression;
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -961,7 +961,7 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
 			//不在target内的 key:{}
 			if (rk.startsWith("@") == false && objKeySet.contains(rk) == false) {
 				if (rv instanceof JSONObject) {
-					throw new UnsupportedOperationException(method + " 请求，" +name + " 里面不允许传 " + rk + ":{} ！");
+					throw new UnsupportedOperationException(method + " 请求，" + name + " 里面不允许传 " + rk + ":{} ！");
 				}
 				if ((method == RequestMethod.POST || method == RequestMethod.PUT) && rv instanceof JSONArray && JSONRequest.isArrayKey(rk)) {
 					throw new UnsupportedOperationException(method + " 请求，" + name + " 里面不允许 " + rk + ":[] 等未定义的 Table[]:[{}] 批量操作键值对！");

Original file line number	Diff line number	Diff line change
`@@ -961,7 +961,7 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,`
`961`	`961`	`//不在target内的 key:{}`
`962`	`962`	`if (rk.startsWith("@") == false && objKeySet.contains(rk) == false) {`
`963`	`963`	`if (rv instanceof JSONObject) {`
`964`		`- throw new UnsupportedOperationException(method + " 请求，" +name + " 里面不允许传 " + rk + ":{} ！");`
	`964`	`+ throw new UnsupportedOperationException(method + " 请求，" + name + " 里面不允许传 " + rk + ":{} ！");`
`965`	`965`	`}`
`966`	`966`	`if ((method == RequestMethod.POST \|\| method == RequestMethod.PUT) && rv instanceof JSONArray && JSONRequest.isArrayKey(rk)) {`
`967`	`967`	`throw new UnsupportedOperationException(method + " 请求，" + name + " 里面不允许 " + rk + ":[] 等未定义的 Table[]:[{}] 批量操作键值对！");`