解决 "toId%": "0,10" 等连续范围报错 value 类型不合法；解决 "id{}@": "[]/Moment/praiseUserIdList" 等引用赋值的值有时类型为 List 时报错 ArrayList cannot be cast to JSONArray；

TommyLemon · TommyLemon · commit cf1cca0254a4 · 2021-01-31T02:24:37.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -1920,7 +1920,10 @@ public String getRegExpString(String key, String value, boolean ignoreCase) {
 	 * @throws IllegalArgumentException 
 	 */
 	@JSONField(serialize = false)
-	public String getBetweenString(String key, Object value) throws IllegalArgumentException {
+	public String getBetweenString(String key, Object value, String rawSQL) throws IllegalArgumentException {
+		if (rawSQL != null) {
+			throw new UnsupportedOperationException("@raw:value 中 " + key + " 不合法！@raw 不支持 key% 这种功能符 ！只支持 key, key!, key<, key{} 等比较运算 和 @column, @having ！");
+		}
 		if (value == null) {
 			return "";
 		}
@@ -1960,7 +1963,7 @@ public String getBetweenString(String key, Object[] values, int type) throws Ill
 				throw new IllegalArgumentException(key + "%:value 中 value 不合法！类型为 String 时必须包括1个逗号 , 且左右两侧都有值！类型为 String[] 里面每个元素要符合前面类型为 String 的规则 ！");
 			}
 
-			condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR)) + "(" + getBetweenString(key, vs[0], vs[1]) + ")";
+			condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR)) + "(" + getBetweenString(key, (Object) vs[0], (Object) vs[1]) + ")";
 		}
 
 		return getCondition(Logic.isNot(type), condition);
@@ -2149,6 +2152,9 @@ public String getExistsString(String key, Object value, String rawSQL) throws Ex
 	 */
 	@JSONField(serialize = false)
 	public String getContainString(String key, Object value, String rawSQL) throws IllegalArgumentException {
+		if (rawSQL != null) {
+			throw new UnsupportedOperationException("@raw:value 中 " + key + " 不合法！@raw 不支持 key<> 这种功能符 ！只支持 key, key!, key<, key{} 等比较运算 和 @column, @having ！");
+		}
 		if (value == null) {
 			return "";
 		}
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -262,7 +262,8 @@ public boolean verifyAccess(SQLConfig config) throws Exception {
 
 			//key!{}:[] 或 其它没有明确id的条件 等 可以和key{}:list组合。类型错误就报错
 			requestId = (Number) config.getWhere(visitorIdkey, true);//JSON里数值不能保证是Long，可能是Integer
-			JSONArray requestIdArray = (JSONArray) config.getWhere(visitorIdkey + "{}", true);//不能是 &{}， |{} 不要传，直接{}
+			@SuppressWarnings("unchecked") 
+			Collection<Object> requestIdArray = (Collection<Object>) config.getWhere(visitorIdkey + "{}", true);//不能是 &{}， |{} 不要传，直接{}
 			if (requestId != null) {
 				if (requestIdArray == null) {
 					requestIdArray = new JSONArray();
