Merge branch 'APIJSON:master' into master

Author: csx-bill

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>apijson.framework</groupId>
 	<artifactId>apijson-framework</artifactId>
-	<version>6.0.0</version>
+	<version>6.1.0</version>
 	<packaging>jar</packaging>
 
 	<name>APIJSONFramework</name>
@@ -35,19 +35,19 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>6.0.0</version>
+			<version>6.1.0</version>
 		</dependency>
 
 		<!-- 数据库 JDBC 驱动 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.29</version>
+			<version>8.0.33</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.3.4</version>
+			<version>42.3.8</version>
 		</dependency>
 		<!-- 数据库 JDBC 驱动 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
 
@@ -56,12 +56,12 @@
 		<dependency>
 			<groupId>com.github.TommyLemon</groupId>
 			<artifactId>unitauto-java</artifactId>
-			<version>2.7.2</version>
+			<version>2.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.TommyLemon</groupId>
 			<artifactId>unitauto-jar</artifactId>
-			<version>2.7.2</version>
+			<version>2.9.0</version>
 		</dependency>
 		<!-- 单元测试：可使用 libs 目录的 unitauto-java.jar 和 unitauto-jar.jar 来替代，两种方式二选一 >>>>>>>>> -->
 
@@ -72,6 +72,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>

src/main/java/apijson/framework/APIJSONFunctionParser.java

@@ -713,8 +713,7 @@ public String getMethodArguments(@NotNull JSONObject curObj, String methodArgsKe
 	/**改用 getMethodDefinition
 	 */
     @Deprecated
-	public String getMethodDefination(@NotNull JSONObject curObj)
-			throws IllegalArgumentException, ClassNotFoundException, IOException {
+	public String getMethodDefination(@NotNull JSONObject curObj) throws IllegalArgumentException {
 		//		curObj.put("arguments", removeComment(curObj.getString("methodArgs")));
 		return getMethodDefination(curObj, "method", "arguments", "genericType", "genericExceptions", "Java");
 	}
@@ -726,8 +725,7 @@ public String getMethodDefination(@NotNull JSONObject curObj)
 	 * @throws ClassNotFoundException
 	 * @throws IllegalArgumentException
 	 */
-	public String getMethodDefinition(@NotNull JSONObject curObj)
-			throws IllegalArgumentException, ClassNotFoundException, IOException {
+	public String getMethodDefinition(@NotNull JSONObject curObj) throws IllegalArgumentException {
 		//		curObj.put("arguments", removeComment(curObj.getString("methodArgs")));
 		return getMethodDefinition(curObj, "method", "arguments", "genericType", "genericExceptions", "Java");
 	}