Java：升级 APIJSON 和 apijson-framework 分别至 4.4.7 和 4.4.9

APIJSON · Dec 26, 2020 · 25f0bc2 · 25f0bc2
1 parent d0dcf08
commit 25f0bc2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/APIJSON-Java-Server/APIJSONBoot/pom.xml b/APIJSON-Java-Server/APIJSONBoot/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>apijson.boot</groupId>
 	<artifactId>apijson-boot</artifactId>
-	<version>4.4.6</version>
+	<version>4.4.9</version>
 	<packaging>jar</packaging>
 
 	<name>APIJSONBoot</name>
@@ -41,12 +41,12 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>4.3.1</version>
+			<version>4.4.7</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-framework</artifactId>
-			<version>4.4.6</version>
+			<version>4.4.9</version>
 		</dependency>
 		<!-- 可使用 libs 目录的 apijson-orm.jar 和 apijson-framework.jar 来替代，两种方式二选一 >>>>>>>>>> -->
 

diff --git a/APIJSON-Java-Server/APIJSONFinal/pom.xml b/APIJSON-Java-Server/APIJSONFinal/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>apijson.jfinal</groupId>
 	<artifactId>apijson-final</artifactId>
 	<packaging>jar</packaging>
-	<version>4.4.6</version>
+	<version>4.4.9</version>
 	<name>Demo project for APIJSON Server based on JFinal</name>
 	<url>http://maven.apache.org</url>
 	<dependencies>
@@ -24,12 +24,12 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>4.3.1</version>
+			<version>4.4.7</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-framework</artifactId>
-			<version>4.4.6</version>
+			<version>4.4.9</version>
 		</dependency>
 		<!-- 可使用 libs 目录的 apijson-orm.jar 和 apijson-framework.jar 来替代，两种方式二选一 >>>>>>>>>> -->
 

diff --git a/APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/demo/DemoFunctionParser.java b/APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/demo/DemoFunctionParser.java
@@ -52,6 +52,10 @@ public DemoFunctionParser(RequestMethod method, String tag, int version, JSONObj
 	 */
 	public Object verifyIdList(@NotNull JSONObject current, @NotNull String idList) throws Exception {
 		Object obj = current.get(idList);
+		if (obj == null) {
+			return null;
+		}
+
 		if (obj instanceof Collection == false) {
 			throw new IllegalArgumentException(idList + " 不符合 Array 类型! 结构必须是 [] ！");
 		}
@@ -74,6 +78,10 @@ public Object verifyIdList(@NotNull JSONObject current, @NotNull String idList)
 	 */
 	public Object verifyURLList(@NotNull JSONObject current, @NotNull String urlList) throws Exception {
 		Object obj = current.get(urlList);
+		if (obj == null) {
+			return null;
+		}
+
 		if (obj instanceof Collection == false) {
 			throw new IllegalArgumentException(urlList + " 不符合 Array 类型! 结构必须是 [] ！");
 		}