Skip to content

Commit bd3275a

Browse files
TommyLemonTommyLemon
committed
Java：JFinal Demo 升级 JDK 17，APIJSON 7.1.0, apijson-framework 及自身 7.1.5
1 parent 5e985f6 commit bd3275a

File tree

10 files changed

+42
-32
lines changed

10 files changed

+42
-32
lines changed

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,19 @@
44
<groupId>apijson.jfinal</groupId>
55
<artifactId>apijson-final</artifactId>
66
<packaging>jar</packaging>
7-
<version>7.0.3</version>
7+
<version>7.1.5</version>
88
<name>Demo project for APIJSON Server based on JFinal</name>
99
<url>http://maven.apache.org</url>
10+
11+
<properties>
12+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
14+
<java.version>17</java.version>
15+
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
16+
<maven.compiler.source>17</maven.compiler.source>
17+
<maven.compiler.target>17</maven.compiler.target>
18+
</properties>
19+
1020
<dependencies>
1121
<!-- APIJSON 需要用的依赖库，1.2.0 以上 -->
1222
<dependency>
@@ -26,12 +36,12 @@
2636
<dependency>
2737
<groupId>com.github.Tencent</groupId>
2838
<artifactId>APIJSON</artifactId>
29-
<version>7.0.3</version>
39+
<version>7.1.0</version>
3040
</dependency>
3141
<dependency>
3242
<groupId>com.github.APIJSON</groupId>
3343
<artifactId>apijson-framework</artifactId>
34-
<version>7.0.3</version>
44+
<version>7.1.5</version>
3545
</dependency>
3646
<!-- 可使用 libs 目录的 apijson-orm.jar 和 apijson-framework.jar 来替代，两种方式二选一 >>>>>>>>>> -->
3747

@@ -89,8 +99,8 @@
8999
<artifactId>maven-compiler-plugin</artifactId>
90100
<version>3.6.1</version>
91101
<configuration>
92-
<source>1.8</source>
93-
<target>1.8</target>
102+
<source>17</source>
103+
<target>17</target>
94104
<encoding>UTF-8</encoding>
95105
<!-- java8 保留参数名编译参数 -->
96106
<compilerArgument>-parameters</compilerArgument>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import apijson.NotNull;
2929
import apijson.RequestMethod;
3030
import apijson.StringUtil;
31-
import apijson.framework.APIJSONFunctionParser;
31+
import apijson.framework.javax.APIJSONFunctionParser;
3232
import apijson.orm.AbstractVerifier;
3333
import apijson.orm.JSONRequest;
3434
import apijson.orm.Visitor;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package apijson.demo;
1616

1717
import apijson.RequestMethod;
18-
import apijson.framework.APIJSONParser;
18+
import apijson.framework.javax.APIJSONParser;
1919

2020

2121
/**请求解析器

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
package apijson.demo;
1616

17-
import static apijson.framework.APIJSONConstant.ID;
18-
import static apijson.framework.APIJSONConstant.PRIVACY_;
19-
import static apijson.framework.APIJSONConstant.USER_;
20-
import static apijson.framework.APIJSONConstant.USER_ID;
17+
import static apijson.framework.javax.APIJSONConstant.ID;
18+
import static apijson.framework.javax.APIJSONConstant.PRIVACY_;
19+
import static apijson.framework.javax.APIJSONConstant.USER_;
20+
import static apijson.framework.javax.APIJSONConstant.USER_ID;
2121

2222
import java.text.SimpleDateFormat;
2323
import java.util.Arrays;
@@ -30,7 +30,7 @@
3030

3131
import apijson.RequestMethod;
3232
import apijson.StringUtil;
33-
import apijson.framework.APIJSONSQLConfig;
33+
import apijson.framework.javax.APIJSONSQLConfig;
3434
import apijson.orm.AbstractSQLConfig;
3535
import apijson.orm.Join;
3636
import apijson.orm.Join.On;
@@ -295,7 +295,7 @@ protected void onJoinNotRelation(String sql, String quote, Join j, String jt, Li
295295
// 开启 JOIN ON t1.c1 != t2.c2 等不等式关联 super.onJoinNotRelation(sql, quote, j, jt, onList, on);
296296
}
297297
@Override
298-
protected void onJoinComplextRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {
298+
protected void onJoinComplexRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {
299299
// 开启 JOIN ON t1.c1 LIKE concat('%', t2.c2, '%') 等复杂关联 super.onJoinComplextRelation(sql, quote, j, jt, onList, on);
300300
}
301301

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package apijson.demo;
1616

17-
import apijson.framework.APIJSONVerifier;
17+
import apijson.framework.javax.APIJSONVerifier;
1818

1919
/**安全校验器，校验请求参数、角色与权限等
2020
* 具体见 https://github.com/Tencent/APIJSON/issues/12

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.alibaba.fastjson.annotation.JSONField;
2222

2323
import apijson.MethodAccess;
24-
import apijson.framework.BaseModel;
24+
import apijson.framework.javax.BaseModel;
2525

2626
/**
2727
* TODO 漏洞：如果GETS允许CONTACT，则CONTACT能看到自己的余额，tag可以不是Privacy-circle。

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.List;
2121

2222
import apijson.MethodAccess;
23-
import apijson.framework.BaseModel;
23+
import apijson.framework.javax.BaseModel;
2424
import apijson.orm.Visitor;
2525

2626
/**用户开放信息

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import static apijson.orm.AbstractVerifier.UNKNOWN;
2323

2424
import apijson.MethodAccess;
25-
import apijson.framework.BaseModel;
25+
import apijson.framework.javax.BaseModel;
2626

2727
/**验证码
2828
* @author Lemon

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
import apijson.demo.DemoParser;
3939
import apijson.demo.DemoSQLConfig;
4040
import apijson.demo.DemoVerifier;
41-
import apijson.framework.APIJSONApplication;
42-
import apijson.framework.APIJSONCreator;
41+
import apijson.framework.javax.APIJSONApplication;
42+
import apijson.framework.javax.APIJSONCreator;
4343
import apijson.orm.AbstractVerifier;
4444
import apijson.orm.FunctionParser;
4545
import apijson.orm.Parser;

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
import static apijson.RequestMethod.HEADS;
2323
import static apijson.RequestMethod.POST;
2424
import static apijson.RequestMethod.PUT;
25-
import static apijson.framework.APIJSONConstant.ACCESS_;
26-
import static apijson.framework.APIJSONConstant.COUNT;
27-
import static apijson.framework.APIJSONConstant.FORMAT;
28-
import static apijson.framework.APIJSONConstant.FUNCTION_;
29-
import static apijson.framework.APIJSONConstant.ID;
30-
import static apijson.framework.APIJSONConstant.REQUEST_;
31-
import static apijson.framework.APIJSONConstant.USER_ID;
32-
import static apijson.framework.APIJSONConstant.VERSION;
33-
import static apijson.framework.APIJSONConstant.VISITOR_;
34-
import static apijson.framework.APIJSONConstant.VISITOR_ID;
25+
import static apijson.framework.javax.APIJSONConstant.ACCESS_;
26+
import static apijson.framework.javax.APIJSONConstant.COUNT;
27+
import static apijson.framework.javax.APIJSONConstant.FORMAT;
28+
import static apijson.framework.javax.APIJSONConstant.FUNCTION_;
29+
import static apijson.framework.javax.APIJSONConstant.ID;
30+
import static apijson.framework.javax.APIJSONConstant.REQUEST_;
31+
import static apijson.framework.javax.APIJSONConstant.USER_ID;
32+
import static apijson.framework.javax.APIJSONConstant.VERSION;
33+
import static apijson.framework.javax.APIJSONConstant.VISITOR_;
34+
import static apijson.framework.javax.APIJSONConstant.VISITOR_ID;
3535

3636
import java.net.URLDecoder;
3737
import java.rmi.ServerException;
@@ -62,9 +62,9 @@
6262
import apijson.demo.model.Privacy;
6363
import apijson.demo.model.User;
6464
import apijson.demo.model.Verify;
65-
import apijson.framework.APIJSONController;
66-
import apijson.framework.APIJSONParser;
67-
import apijson.framework.BaseModel;
65+
import apijson.framework.javax.APIJSONController;
66+
import apijson.framework.javax.APIJSONParser;
67+
import apijson.framework.javax.BaseModel;
6868
import apijson.orm.AbstractParser;
6969
import apijson.orm.JSONRequest;
7070
import apijson.orm.Parser;

0 commit comments

Comments
 (0)