Skip to content

Commit 4471b90

Browse files
TommyLemonTommyLemon
committed
Java: APIJSONDemo, MultiDataSource, JFinal Demo, Solon Demo 都升级 APIJSON 8.0.0.1, apijson-framework 7.2.0.1
1 parent 2713ed9 commit 4471b90

8 files changed

Lines changed: 31 additions & 36 deletions

File tree

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml‎

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,23 @@
5656

5757

5858
<!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 <<<<<<<<<< -->
59-
<!-- <dependency>-->
60-
<!-- <groupId>com.github.Tencent</groupId>-->
61-
<!-- <artifactId>APIJSON</artifactId>-->
62-
<!-- <version>8.0.0.0.0</version>-->
63-
<!-- </dependency>-->
64-
<!-- <dependency>-->
65-
<!-- <groupId>com.github.APIJSON</groupId>-->
66-
<!-- <artifactId>apijson-framework</artifactId>-->
67-
<!-- <version>7.2.0.0</version>-->
68-
<!--&lt;!&ndash; <exclusions>&ndash;&gt;-->
69-
<!--&lt;!&ndash; <exclusion>&ndash;&gt;-->
70-
<!--&lt;!&ndash; <groupId>com.github.Tencent</groupId>&ndash;&gt;-->
71-
<!--&lt;!&ndash; <artifactId>APIJSON</artifactId>&ndash;&gt;-->
72-
<!--&lt;!&ndash; </exclusion>&ndash;&gt;-->
73-
<!--&lt;!&ndash; </exclusions>&ndash;&gt;-->
74-
<!-- </dependency>-->
59+
<dependency>
60+
<groupId>com.github.Tencent</groupId>
61+
<artifactId>APIJSON</artifactId>
62+
<version>8.0.0.1</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.github.APIJSON</groupId>
66+
<artifactId>apijson-framework</artifactId>
67+
<version>7.2.0.1</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>com.github.APIJSON</groupId>
71+
<artifactId>apijson-router</artifactId>
72+
<version>2.2.0.1</version>
73+
</dependency>
74+
75+
<!-- 7.9.0 及以下需要依赖 apijson-column -->
7576
<!-- <dependency>-->
7677
<!-- <groupId>com.github.APIJSON</groupId>-->
7778
<!-- <artifactId>apijson-column</artifactId>-->
@@ -84,17 +85,6 @@
8485
<!-- </exclusions>-->
8586
<!-- </dependency>-->
8687
<!-- <dependency>-->
87-
<!-- <groupId>com.github.APIJSON</groupId>-->
88-
<!-- <artifactId>apijson-router</artifactId>-->
89-
<!-- <version>2.1.7</version>-->
90-
<!-- <exclusions>-->
91-
<!-- <exclusion>-->
92-
<!-- <groupId>com.github.Tencent</groupId>-->
93-
<!-- <artifactId>APIJSON</artifactId>-->
94-
<!-- </exclusion>-->
95-
<!-- </exclusions>-->
96-
<!-- </dependency>-->
97-
<!-- <dependency>-->
9888
<!-- <groupId>com.surrealdb</groupId>-->
9989
<!-- <artifactId>surrealdb</artifactId>-->
10090
<!-- <version>0.2.0</version>-->

‎APIJSON-Java-Server/APIJSONDemo-Solon/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>com.github.Tencent</groupId>
3030
<artifactId>APIJSON</artifactId>
31-
<version>8.0.0.0.0</version>
31+
<version>8.0.0.1</version>
3232
</dependency>
3333

3434
<!-- 数据库 JDBC 驱动 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->

‎APIJSON-Java-Server/APIJSONDemo-Solon/src/main/java/apijson/demo/DemoApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public JSONArray createJSONArray() {
6363
}
6464

6565
@Override
66-
public String toJSONString(Object obj) {
66+
public String toJSONString(Object obj, boolean format) {
6767
return obj == null || obj instanceof String ? (String) obj : JSON.toJSONString(obj);
6868
}
6969

‎APIJSON-Java-Server/APIJSONDemo/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
<dependency>
3232
<groupId>com.github.Tencent</groupId>
3333
<artifactId>APIJSON</artifactId>
34-
<version>8.0.0.0.0</version>
34+
<version>8.0.0.1</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.github.APIJSON</groupId>
3838
<artifactId>apijson-framework</artifactId>
39-
<version>7.2.0.0</version>
39+
<version>7.2.0.1</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>jakarta.servlet</groupId>

‎APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/DemoApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public JSONArray createJSONArray() {
9595
}
9696

9797
@Override
98-
public String toJSONString(Object obj) {
98+
public String toJSONString(Object obj, boolean format) {
9999
return obj == null || obj instanceof String ? (String) obj : JSON.toJSONString(obj);
100100
}
101101

‎APIJSON-Java-Server/APIJSONFinal/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
<dependency>
3737
<groupId>com.github.Tencent</groupId>
3838
<artifactId>APIJSON</artifactId>
39-
<version>8.0.0.0.0</version>
39+
<version>8.0.0.1</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>com.github.APIJSON</groupId>
4343
<artifactId>apijson-framework</artifactId>
44-
<version>7.2.0.0</version>
44+
<version>7.2.0.1</version>
4545
</dependency>
4646
<!-- 可使用 libs 目录的 apijson-orm.jar 和 apijson-framework.jar 来替代，两种方式二选一 >>>>>>>>>> -->
4747

‎APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/demo/DemoFunctionParser.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@
2525
import apijson.NotNull;
2626
import apijson.RequestMethod;
2727
import apijson.StringUtil;
28+
import apijson.framework.javax.BaseModel;
2829
import com.alibaba.fastjson.JSONArray;
2930
import com.alibaba.fastjson.JSONObject;
3031

3132
import apijson.framework.javax.APIJSONFunctionParser;
3233
import apijson.orm.AbstractVerifier;
3334
import apijson.orm.Visitor;
3435

36+
import static apijson.JSON.getJSONArray;
3537
import static apijson.JSONObject.KEY_COLUMN;
3638
import static apijson.JSONRequest.KEY_COUNT;
3739

@@ -68,7 +70,10 @@ public List<Long> getCurrentContactIdList(@NotNull JSONObject curObj) {
6870
Visitor<Long> user = getCurrentUser(curObj);
6971
return user == null ? null : user.getContactIdList();
7072
}
71-
73+
74+
//public int countArray(@NotNull JSONObject curObj, String array) {
75+
// return super.countArray(curObj, array);
76+
//}
7277

7378
/**
7479
* @param curObj

‎APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/jfinal/DemoAppConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public JSONArray createJSONArray() {
125125
}
126126

127127
@Override
128-
public String toJSONString(Object obj) {
128+
public String toJSONString(Object obj, boolean format) {
129129
return obj == null || obj instanceof String ? (String) obj : JSON.toJSONString(obj);
130130
}
131131

0 commit comments

Comments
 (0)