Skip to content

Commit d06d793

Browse files
TommyLemonTommyLemon
committedFeb 3, 2025
Java：BigData 升级 JDK 17，APIJSON 7.1.0, apijson-framework 及自身 7.1.5, apijson-column 2.1.0, UnitAuto 3.0.5
·
7.1.57.1.0
1 parent 27c704e commit d06d793

File tree

12 files changed

+55
-47
lines changed

12 files changed

+55
-47
lines changed
 

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

+14-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.boot</groupId>
77
<artifactId>apijson-boot</artifactId>
8-
<version>7.0.3</version>
8+
<version>7.1.5</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONBoot-BigData</name>
@@ -14,7 +14,10 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
17-
<java.version>1.8</java.version>
17+
<java.version>17</java.version>
18+
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
19+
<maven.compiler.source>17</maven.compiler.source>
20+
<maven.compiler.target>17</maven.compiler.target>
1821
</properties>
1922

2023
<dependencies>
@@ -36,12 +39,12 @@
3639
<dependency>
3740
<groupId>com.github.TommyLemon</groupId>
3841
<artifactId>unitauto-java</artifactId>
39-
<version>2.9.0</version>
42+
<version>3.0.5</version>
4043
</dependency>
4144
<dependency>
4245
<groupId>com.github.TommyLemon</groupId>
4346
<artifactId>unitauto-jar</artifactId>
44-
<version>2.9.0</version>
47+
<version>3.0.5</version>
4548
</dependency>
4649
<dependency>
4750
<groupId>io.github.classgraph</groupId>
@@ -55,17 +58,17 @@
5558
<dependency>
5659
<groupId>com.github.Tencent</groupId>
5760
<artifactId>APIJSON</artifactId>
58-
<version>7.0.3</version>
61+
<version>7.1.0</version>
5962
</dependency>
6063
<dependency>
6164
<groupId>com.github.APIJSON</groupId>
6265
<artifactId>apijson-framework</artifactId>
63-
<version>7.0.3</version>
66+
<version>7.1.5</version>
6467
</dependency>
6568
<dependency>
6669
<groupId>com.github.APIJSON</groupId>
6770
<artifactId>apijson-column</artifactId>
68-
<version>2.0.3</version>
71+
<version>2.1.0</version>
6972
</dependency>
7073
<!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 >>>>>>>>>> -->
7174

@@ -110,6 +113,7 @@
110113
<plugin>
111114
<groupId>org.springframework.boot</groupId>
112115
<artifactId>spring-boot-maven-plugin</artifactId>
116+
<version>3.2.5</version>
113117
<executions>
114118
<execution>
115119
<goals>
@@ -121,9 +125,10 @@
121125
<plugin>
122126
<groupId>org.apache.maven.plugins</groupId>
123127
<artifactId>maven-compiler-plugin</artifactId>
128+
<version>3.8.1</version>
124129
<configuration>
125-
<source>1.8</source>
126-
<target>1.8</target>
130+
<source>17</source>
131+
<target>17</target>
127132
</configuration>
128133
</plugin>
129134
</plugins>

‎APIJSON-Java-Server/APIJSONBoot-BigData/src/main/java/apijson/boot/DemoApplication.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
import apijson.demo.DemoSQLConfig;
4444
import apijson.demo.DemoSQLExecutor;
4545
import apijson.demo.DemoVerifier;
46-
import apijson.framework.APIJSONApplication;
47-
import apijson.framework.APIJSONCreator;
48-
import apijson.framework.APIJSONParser;
46+
import apijson.framework.javax.APIJSONApplication;
47+
import apijson.framework.javax.APIJSONCreator;
48+
import apijson.framework.javax.APIJSONParser;
4949
import apijson.orm.AbstractVerifier;
5050
import apijson.orm.FunctionParser;
5151
import apijson.orm.Parser;
@@ -188,7 +188,7 @@ public Parser<Long> createParser() {
188188
}
189189

190190
@Override
191-
public FunctionParser createFunctionParser() {
191+
public FunctionParser<Long> createFunctionParser() {
192192
return new DemoFunctionParser();
193193
}
194194

@@ -198,12 +198,12 @@ public Verifier<Long> createVerifier() {
198198
}
199199

200200
@Override
201-
public SQLConfig createSQLConfig() {
201+
public SQLConfig<Long> createSQLConfig() {
202202
return new DemoSQLConfig();
203203
}
204204

205205
@Override
206-
public SQLExecutor createSQLExecutor() {
206+
public SQLExecutor<Long> createSQLExecutor() {
207207
return new DemoSQLExecutor();
208208
}
209209

‎APIJSON-Java-Server/APIJSONBoot-BigData/src/main/java/apijson/boot/DemoController.java

+16-13
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import static apijson.RequestMethod.HEADS;
2222
import static apijson.RequestMethod.POST;
2323
import static apijson.RequestMethod.PUT;
24-
import static apijson.framework.APIJSONConstant.ACCESS_;
25-
import static apijson.framework.APIJSONConstant.COUNT;
26-
import static apijson.framework.APIJSONConstant.FORMAT;
27-
import static apijson.framework.APIJSONConstant.FUNCTION_;
28-
import static apijson.framework.APIJSONConstant.ID;
29-
import static apijson.framework.APIJSONConstant.REQUEST_;
30-
import static apijson.framework.APIJSONConstant.USER_ID;
31-
import static apijson.framework.APIJSONConstant.VERSION;
24+
import static apijson.framework.javax.APIJSONConstant.ACCESS_;
25+
import static apijson.framework.javax.APIJSONConstant.COUNT;
26+
import static apijson.framework.javax.APIJSONConstant.FORMAT;
27+
import static apijson.framework.javax.APIJSONConstant.FUNCTION_;
28+
import static apijson.framework.javax.APIJSONConstant.ID;
29+
import static apijson.framework.javax.APIJSONConstant.REQUEST_;
30+
import static apijson.framework.javax.APIJSONConstant.USER_ID;
31+
import static apijson.framework.javax.APIJSONConstant.VERSION;
3232
import static org.springframework.http.HttpHeaders.COOKIE;
3333
import static org.springframework.http.HttpHeaders.SET_COOKIE;
3434

@@ -49,6 +49,7 @@
4949
import javax.servlet.http.HttpServletResponse;
5050
import javax.servlet.http.HttpSession;
5151

52+
import apijson.orm.Parser;
5253
import org.springframework.beans.factory.annotation.Autowired;
5354
import org.springframework.http.HttpEntity;
5455
import org.springframework.http.HttpHeaders;
@@ -78,8 +79,8 @@
7879
import apijson.demo.model.Privacy;
7980
import apijson.demo.model.User;
8081
import apijson.demo.model.Verify;
81-
import apijson.framework.APIJSONController;
82-
import apijson.framework.BaseModel;
82+
import apijson.framework.javax.APIJSONController;
83+
import apijson.framework.javax.BaseModel;
8384
import apijson.orm.JSONRequest;
8485
import apijson.orm.exception.ConditionErrorException;
8586
import apijson.orm.exception.ConflictException;
@@ -110,13 +111,15 @@ public String getRequestURL() {
110111
return httpServletRequest.getRequestURL().toString();
111112
}
112113

113-
114+
@Override
115+
public Parser<Long> newParser(HttpSession session, RequestMethod method) {
116+
return super.newParser(session, method).setNeedVerify(false);
117+
}
118+
114119
// 通用接口，非事务型操作 和 简单事务型操作 都可通过这些接口自动化实现 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
115120

116121
/**增删改查统一入口，这个一个方法可替代以下 7 个方法，牺牲一些路由解析性能来提升一点开发效率
117122
* @param method
118-
* @param tag
119-
* @param params
120123
* @param request
121124
* @param session
122125
* @return

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

+2-2
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;
@@ -38,7 +38,7 @@
3838
* 具体见 https://github.com/Tencent/APIJSON/issues/101
3939
* @author Lemon
4040
*/
41-
public class DemoFunctionParser extends APIJSONFunctionParser {
41+
public class DemoFunctionParser extends APIJSONFunctionParser<Long> {
4242
public static final String TAG = "DemoFunctionParser";
4343

4444
public DemoFunctionParser() {

‎APIJSON-Java-Server/APIJSONBoot-BigData/src/main/java/apijson/demo/DemoObjectParser.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222

2323
import apijson.NotNull;
2424
import apijson.RequestMethod;
25-
import apijson.framework.APIJSONObjectParser;
25+
import apijson.framework.javax.APIJSONObjectParser;
2626
import apijson.orm.Join;
2727
import apijson.orm.SQLConfig;
2828

2929

3030
/**对象解析器，用来简化 Parser
3131
* @author Lemon
3232
*/
33-
public class DemoObjectParser extends APIJSONObjectParser {
33+
public class DemoObjectParser extends APIJSONObjectParser<Long> {
3434

3535
public DemoObjectParser(HttpSession session, @NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
3636
, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import com.alibaba.fastjson.JSONObject;
1818

1919
import apijson.RequestMethod;
20-
import apijson.framework.APIJSONObjectParser;
21-
import apijson.framework.APIJSONParser;
20+
import apijson.framework.javax.APIJSONObjectParser;
21+
import apijson.framework.javax.APIJSONParser;
2222
import apijson.orm.SQLConfig;
2323

2424

@@ -46,7 +46,7 @@ public DemoParser(RequestMethod method, boolean needVerify) {
4646

4747

4848
@Override
49-
public APIJSONObjectParser createObjectParser(JSONObject request, String parentPath, SQLConfig arrayConfig
49+
public APIJSONObjectParser<Long> createObjectParser(JSONObject request, String parentPath, SQLConfig arrayConfig
5050
, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
5151
return new DemoObjectParser(getSession(), request, parentPath, arrayConfig
5252
, isSubquery, isTable, isArrayMainTable).setMethod(getMethod()).setParser(this);

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

+7-7
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;
@@ -31,7 +31,7 @@
3131
import apijson.RequestMethod;
3232
import apijson.StringUtil;
3333
import apijson.column.ColumnUtil;
34-
import apijson.framework.APIJSONSQLConfig;
34+
import apijson.framework.javax.APIJSONSQLConfig;
3535
import apijson.orm.AbstractSQLConfig;
3636
import apijson.orm.Join;
3737
import apijson.orm.Join.On;
@@ -309,8 +309,8 @@ protected void onJoinNotRelation(String sql, String quote, Join join, String tab
309309
}
310310

311311
@Override
312-
protected void onJoinComplextRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {
313-
// 开启 JOIN ON t1.c1 LIKE concat('%', t2.c2, '%') 等复杂关联 super.onJoinComplextRelation(sql, quote, j, jt, onList, on);
312+
protected void onJoinComplexRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {
313+
// 开启 JOIN ON t1.c1 LIKE concat('%', t2.c2, '%') 等复杂关联 super.onJoinComplexRelation(sql, quote, j, jt, onList, on);
314314
}
315315

316316
}

‎APIJSON-Java-Server/APIJSONBoot-BigData/src/main/java/apijson/demo/DemoSQLExecutor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import apijson.Log;
2222
import apijson.boot.DemoApplication;
23-
import apijson.framework.APIJSONSQLExecutor;
23+
import apijson.framework.javax.APIJSONSQLExecutor;
2424
import apijson.orm.SQLConfig;
2525

2626

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

+1-1
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
/**安全校验器，校验请求参数、角色与权限等

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

+1-1
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/APIJSONBoot-BigData/src/main/java/apijson/demo/model/User.java

+1-1
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/APIJSONBoot-BigData/src/main/java/apijson/demo/model/Verify.java

+1-1
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

0 commit comments

Comments
 (0)
Please sign in to comment.