Java: APIJSONDemo, MultiDataSource, JFinal Demo, Solon Demo 都升级 APIJSON 8.0.0.1, apijson-framework 7.2.0.1

TommyLemon · TommyLemon · commit 4471b90c271c · 2025-04-13T02:13:42.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml
@@ -56,22 +56,23 @@
 
 
         <!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 <<<<<<<<<< -->
-<!--        <dependency>-->
-<!--            <groupId>com.github.Tencent</groupId>-->
-<!--            <artifactId>APIJSON</artifactId>-->
-<!--            <version>8.0.0.0.0</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.github.APIJSON</groupId>-->
-<!--            <artifactId>apijson-framework</artifactId>-->
-<!--            <version>7.2.0.0</version>-->
-<!--&lt;!&ndash;            <exclusions>&ndash;&gt;-->
-<!--&lt;!&ndash;                <exclusion>&ndash;&gt;-->
-<!--&lt;!&ndash;                    <groupId>com.github.Tencent</groupId>&ndash;&gt;-->
-<!--&lt;!&ndash;                    <artifactId>APIJSON</artifactId>&ndash;&gt;-->
-<!--&lt;!&ndash;                </exclusion>&ndash;&gt;-->
-<!--&lt;!&ndash;            </exclusions>&ndash;&gt;-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.github.Tencent</groupId>
+            <artifactId>APIJSON</artifactId>
+            <version>8.0.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.APIJSON</groupId>
+            <artifactId>apijson-framework</artifactId>
+            <version>7.2.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.APIJSON</groupId>
+            <artifactId>apijson-router</artifactId>
+            <version>2.2.0.1</version>
+        </dependency>
+
+<!--        7.9.0 及以下需要依赖 apijson-column -->
 <!--        <dependency>-->
 <!--            <groupId>com.github.APIJSON</groupId>-->
 <!--            <artifactId>apijson-column</artifactId>-->
@@ -84,17 +85,6 @@
 <!--            </exclusions>-->
 <!--        </dependency>-->
 <!--        <dependency>-->
-<!--            <groupId>com.github.APIJSON</groupId>-->
-<!--            <artifactId>apijson-router</artifactId>-->
-<!--            <version>2.1.7</version>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>com.github.Tencent</groupId>-->
-<!--                    <artifactId>APIJSON</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
 <!--            <groupId>com.surrealdb</groupId>-->
 <!--            <artifactId>surrealdb</artifactId>-->
 <!--            <version>0.2.0</version>-->
diff --git a/APIJSON-Java-Server/APIJSONDemo-Solon/pom.xml b/APIJSON-Java-Server/APIJSONDemo-Solon/pom.xml
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>8.0.0.0.0</version>
+			<version>8.0.0.1</version>
 		</dependency>
 
 		<!-- 数据库 JDBC 驱动 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
diff --git a/APIJSON-Java-Server/APIJSONDemo-Solon/src/main/java/apijson/demo/DemoApplication.java b/APIJSON-Java-Server/APIJSONDemo-Solon/src/main/java/apijson/demo/DemoApplication.java
@@ -63,7 +63,7 @@ public JSONArray createJSONArray() {
       }
 
       @Override
-      public String toJSONString(Object obj) {
+      public String toJSONString(Object obj, boolean format) {
         return obj == null || obj instanceof String ? (String) obj : JSON.toJSONString(obj);
       }
 
diff --git a/APIJSON-Java-Server/APIJSONDemo/pom.xml b/APIJSON-Java-Server/APIJSONDemo/pom.xml
@@ -31,12 +31,12 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>8.0.0.0.0</version>
+			<version>8.0.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-framework</artifactId>
-			<version>7.2.0.0</version>
+			<version>7.2.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
diff --git a/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/DemoApplication.java b/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/DemoApplication.java
@@ -95,7 +95,7 @@ public JSONArray createJSONArray() {
       }
 
       @Override
-      public String toJSONString(Object obj) {
+      public String toJSONString(Object obj, boolean format) {
         return obj == null || obj instanceof String ? (String) obj : JSON.toJSONString(obj);
       }
 
diff --git a/APIJSON-Java-Server/APIJSONFinal/pom.xml b/APIJSON-Java-Server/APIJSONFinal/pom.xml
@@ -36,12 +36,12 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>8.0.0.0.0</version>
+			<version>8.0.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-framework</artifactId>
-			<version>7.2.0.0</version>
+			<version>7.2.0.1</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
@@ -25,13 +25,15 @@
 import apijson.NotNull;
 import apijson.RequestMethod;
 import apijson.StringUtil;
+import apijson.framework.javax.BaseModel;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 import apijson.framework.javax.APIJSONFunctionParser;
 import apijson.orm.AbstractVerifier;
 import apijson.orm.Visitor;
 
+import static apijson.JSON.getJSONArray;
 import static apijson.JSONObject.KEY_COLUMN;
 import static apijson.JSONRequest.KEY_COUNT;
 
@@ -68,7 +70,10 @@ public List<Long> getCurrentContactIdList(@NotNull JSONObject curObj) {
 		Visitor<Long> user = getCurrentUser(curObj);
 		return user == null ? null : user.getContactIdList();
 	}
-	
+
+	//public int countArray(@NotNull JSONObject curObj, String array) {
+	//	return super.countArray(curObj, array);
+	//}
 
 	/**
 	 * @param curObj
diff --git a/APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/jfinal/DemoAppConfig.java b/APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/jfinal/DemoAppConfig.java
@@ -125,7 +125,7 @@ public JSONArray createJSONArray() {
       }
 
       @Override
-      public String toJSONString(Object obj) {
+      public String toJSONString(Object obj, boolean format) {
         return obj == null || obj instanceof String ? (String) obj : JSON.toJSONString(obj);
       }
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public JSONArray createJSONArray() {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public String toJSONString(Object obj) {`
	`66`	`+ public String toJSONString(Object obj, boolean format) {`
`67`	`67`	`return obj == null \|\| obj instanceof String ? (String) obj : JSON.toJSONString(obj);`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public JSONArray createJSONArray() {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`@Override`
`98`		`- public String toJSONString(Object obj) {`
	`98`	`+ public String toJSONString(Object obj, boolean format) {`
`99`	`99`	`return obj == null \|\| obj instanceof String ? (String) obj : JSON.toJSONString(obj);`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public JSONArray createJSONArray() {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`@Override`
`128`		`- public String toJSONString(Object obj) {`
	`128`	`+ public String toJSONString(Object obj, boolean format) {`
`129`	`129`	`return obj == null \|\| obj instanceof String ? (String) obj : JSON.toJSONString(obj);`
`130`	`130`	`}`
`131`	`131`