包含选项范围新增支持传路径，例如 key<>:{ path: "$", value:82001 }

TommyLemon · TommyLemon · commit a3d9c90a8dc2 · 2022-03-21T00:26:22.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -255,7 +255,7 @@ public AbstractObjectParser parse(String name, boolean isReuse) throws Exception
 						key = entry.getKey();
 
 						try {
-							if (key.startsWith("@") || key.endsWith("@")) {
+							if (key.startsWith("@") || key.endsWith("@") || (key.endsWith("<>") && value instanceof JSONObject)) {
 								if (onParse(key, value) == false) {
 									invalidate();
 								}
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -4487,8 +4487,8 @@ else if (w.startsWith("!")) {
 				for (String key : set) {
 					value = request.get(key);
 
-					if (value instanceof Map) {//只允许常规Object
-						throw new IllegalArgumentException("不允许 " + key + " 等任何key的value类型为 {JSONObject} !");
+					if (key.endsWith("<>") == false && value instanceof Map) {//只允许常规Object
+						throw new IllegalArgumentException(table + ":{ " + key + ":value } 中 value 类型错误！除了 key<>:{} 外，不允许 " + key + " 等其它任何 key 对应 value 的类型为 JSONObject {} !");
 					}
 
 					//解决AccessVerifier新增userId没有作为条件，而是作为内容，导致PUT，DELETE出错

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ public AbstractObjectParser parse(String name, boolean isReuse) throws Exception`
`255`	`255`	`key = entry.getKey();`
`256`	`256`
`257`	`257`	`try {`
`258`		`- if (key.startsWith("@") \|\| key.endsWith("@")) {`
	`258`	`+ if (key.startsWith("@") \|\| key.endsWith("@") \|\| (key.endsWith("<>") && value instanceof JSONObject)) {`
`259`	`259`	`if (onParse(key, value) == false) {`
`260`	`260`	`invalidate();`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4487,8 +4487,8 @@ else if (w.startsWith("!")) {`
`4487`	`4487`	`for (String key : set) {`
`4488`	`4488`	`value = request.get(key);`
`4489`	`4489`
`4490`		`- if (value instanceof Map) {//只允许常规Object`
`4491`		`- throw new IllegalArgumentException("不允许 " + key + " 等任何key的value类型为 {JSONObject} !");`
	`4490`	`+ if (key.endsWith("<>") == false && value instanceof Map) {//只允许常规Object`
	`4491`	`+ throw new IllegalArgumentException(table + ":{ " + key + ":value } 中 value 类型错误！除了 key<>:{} 外，不允许 " + key + " 等其它任何 key 对应 value 的类型为 JSONObject {} !");`
`4492`	`4492`	`}`
`4493`	`4493`
`4494`	`4494`	`//解决AccessVerifier新增userId没有作为条件，而是作为内容，导致PUT，DELETE出错`