Merge pull request Tencent#307 from chenyanlann/master

TommyLemon · web-flow · commit 421d30d4e9f5 · 2021-09-09T15:29:54.000+08:00
Mod:修复put请求key的bug
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -261,8 +261,8 @@ else if ((method == POST || method == PUT) && value instanceof JSONArray
 									&& JSONRequest.isTableArray(key)) {  // JSONArray，批量新增或修改，往下一级提取
 								onTableArrayParse(key, (JSONArray) value);
 							}
-							else if (method == PUT && value instanceof JSONArray
-									&& (whereList == null || whereList.contains(key) == false)) {  // PUT JSONArray
+							else if (method == PUT && value instanceof JSONArray && (whereList == null || whereList.contains(key) == false) && StringUtil.isName(key.replaceFirst("[+-]$", "")))
+							{  // PUT JSONArray
 								onPUTArrayParse(key, (JSONArray) value);
 							}
 							else {  // JSONArray或其它Object，直接填充
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -3127,7 +3127,7 @@ else if (w.startsWith("!")) {
 					}
 
 					//解决AccessVerifier新增userId没有作为条件，而是作为内容，导致PUT，DELETE出错
-					if (isWhere) {
+					if (isWhere || (StringUtil.isName(key) == false)) {
 						tableWhere.put(key, value);
 						if (whereList == null || whereList.contains(key) == false) {
 							andList.add(key);

Original file line number	Diff line number	Diff line change
`@@ -261,8 +261,8 @@ else if ((method == POST \|\| method == PUT) && value instanceof JSONArray`
`261`	`261`	`&& JSONRequest.isTableArray(key)) { // JSONArray，批量新增或修改，往下一级提取`
`262`	`262`	`onTableArrayParse(key, (JSONArray) value);`
`263`	`263`	`}`
`264`		`- else if (method == PUT && value instanceof JSONArray`
`265`		`- && (whereList == null \|\| whereList.contains(key) == false)) { // PUT JSONArray`
	`264`	`+ else if (method == PUT && value instanceof JSONArray && (whereList == null \|\| whereList.contains(key) == false) && StringUtil.isName(key.replaceFirst("[+-]$", "")))`
	`265`	`+ { // PUT JSONArray`
`266`	`266`	`onPUTArrayParse(key, (JSONArray) value);`
`267`	`267`	`}`
`268`	`268`	`else { // JSONArray或其它Object，直接填充`
Original file line number	Diff line number	Diff line change
`@@ -3127,7 +3127,7 @@ else if (w.startsWith("!")) {`
`3127`	`3127`	`}`
`3128`	`3128`
`3129`	`3129`	`//解决AccessVerifier新增userId没有作为条件，而是作为内容，导致PUT，DELETE出错`
`3130`		`- if (isWhere) {`
	`3130`	`+ if (isWhere \|\| (StringUtil.isName(key) == false)) {`
`3131`	`3131`	`tableWhere.put(key, value);`
`3132`	`3132`	`if (whereList == null \|\| whereList.contains(key) == false) {`
`3133`	`3133`	`andList.add(key);`