Java：BigData 升级 JDK 17，APIJSON 7.1.0, apijson-framework 及自身 7.1.5, apijson-column 2.1.0, UnitAuto 3.0.5

Author: TommyLemon

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

@@ -5,7 +5,7 @@
 
 	<groupId>apijson.boot</groupId>
 	<artifactId>apijson-boot</artifactId>
-	<version>7.0.3</version>
+	<version>7.1.5</version>
 	<packaging>jar</packaging>
 
 	<name>APIJSONBoot-BigData</name>
@@ -14,7 +14,10 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
+		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<dependencies>
@@ -36,12 +39,12 @@
  		<dependency>
 			<groupId>com.github.TommyLemon</groupId>
 			<artifactId>unitauto-java</artifactId>
-			<version>2.9.0</version>
+			<version>3.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.TommyLemon</groupId>
 			<artifactId>unitauto-jar</artifactId>
-			<version>2.9.0</version>
+			<version>3.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>io.github.classgraph</groupId>
@@ -55,17 +58,17 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>7.0.3</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-framework</artifactId>
-			<version>7.0.3</version>
+			<version>7.1.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-column</artifactId>
-			<version>2.0.3</version>
+			<version>2.1.0</version>
 		</dependency>
 		<!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 >>>>>>>>>> -->
 
@@ -110,6 +113,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>3.2.5</version>
 				<executions>
 				          <execution>
 				          	<goals>
@@ -121,9 +125,10 @@
 			<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>
+					<source>17</source>
+					<target>17</target>
 				</configuration>
 			</plugin>
 		</plugins>

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

@@ -43,9 +43,9 @@
 import apijson.demo.DemoSQLConfig;
 import apijson.demo.DemoSQLExecutor;
 import apijson.demo.DemoVerifier;
-import apijson.framework.APIJSONApplication;
-import apijson.framework.APIJSONCreator;
-import apijson.framework.APIJSONParser;
+import apijson.framework.javax.APIJSONApplication;
+import apijson.framework.javax.APIJSONCreator;
+import apijson.framework.javax.APIJSONParser;
 import apijson.orm.AbstractVerifier;
 import apijson.orm.FunctionParser;
 import apijson.orm.Parser;
@@ -188,7 +188,7 @@ public Parser<Long> createParser() {
             }
 
             @Override
-            public FunctionParser createFunctionParser() {
+            public FunctionParser<Long> createFunctionParser() {
                 return new DemoFunctionParser();
             }
 
@@ -198,12 +198,12 @@ public Verifier<Long> createVerifier() {
             }
 
             @Override
-            public SQLConfig createSQLConfig() {
+            public SQLConfig<Long> createSQLConfig() {
                 return new DemoSQLConfig();
             }
 
             @Override
-            public SQLExecutor createSQLExecutor() {
+            public SQLExecutor<Long> createSQLExecutor() {
                 return new DemoSQLExecutor();
             }
 

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

@@ -21,14 +21,14 @@
 import static apijson.RequestMethod.HEADS;
 import static apijson.RequestMethod.POST;
 import static apijson.RequestMethod.PUT;
-import static apijson.framework.APIJSONConstant.ACCESS_;
-import static apijson.framework.APIJSONConstant.COUNT;
-import static apijson.framework.APIJSONConstant.FORMAT;
-import static apijson.framework.APIJSONConstant.FUNCTION_;
-import static apijson.framework.APIJSONConstant.ID;
-import static apijson.framework.APIJSONConstant.REQUEST_;
-import static apijson.framework.APIJSONConstant.USER_ID;
-import static apijson.framework.APIJSONConstant.VERSION;
+import static apijson.framework.javax.APIJSONConstant.ACCESS_;
+import static apijson.framework.javax.APIJSONConstant.COUNT;
+import static apijson.framework.javax.APIJSONConstant.FORMAT;
+import static apijson.framework.javax.APIJSONConstant.FUNCTION_;
+import static apijson.framework.javax.APIJSONConstant.ID;
+import static apijson.framework.javax.APIJSONConstant.REQUEST_;
+import static apijson.framework.javax.APIJSONConstant.USER_ID;
+import static apijson.framework.javax.APIJSONConstant.VERSION;
 import static org.springframework.http.HttpHeaders.COOKIE;
 import static org.springframework.http.HttpHeaders.SET_COOKIE;
 
@@ -49,6 +49,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import apijson.orm.Parser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -78,8 +79,8 @@
 import apijson.demo.model.Privacy;
 import apijson.demo.model.User;
 import apijson.demo.model.Verify;
-import apijson.framework.APIJSONController;
-import apijson.framework.BaseModel;
+import apijson.framework.javax.APIJSONController;
+import apijson.framework.javax.BaseModel;
 import apijson.orm.JSONRequest;
 import apijson.orm.exception.ConditionErrorException;
 import apijson.orm.exception.ConflictException;
@@ -110,13 +111,15 @@ public String getRequestURL() {
 		return httpServletRequest.getRequestURL().toString();
 	}
 
-	
+	@Override
+	public Parser<Long> newParser(HttpSession session, RequestMethod method) {
+		return super.newParser(session, method).setNeedVerify(false);
+	}
+
 	// 通用接口，非事务型操作 和 简单事务型操作 都可通过这些接口自动化实现 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 	/**增删改查统一入口，这个一个方法可替代以下 7 个方法，牺牲一些路由解析性能来提升一点开发效率
 	 * @param method
-	 * @param tag
-	 * @param params
 	 * @param request
 	 * @param session
 	 * @return

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

@@ -28,7 +28,7 @@
 import apijson.NotNull;
 import apijson.RequestMethod;
 import apijson.StringUtil;
-import apijson.framework.APIJSONFunctionParser;
+import apijson.framework.javax.APIJSONFunctionParser;
 import apijson.orm.AbstractVerifier;
 import apijson.orm.JSONRequest;
 import apijson.orm.Visitor;
@@ -38,7 +38,7 @@
  * 具体见 https://github.com/Tencent/APIJSON/issues/101
  * @author Lemon
  */
-public class DemoFunctionParser extends APIJSONFunctionParser {
+public class DemoFunctionParser extends APIJSONFunctionParser<Long> {
 	public static final String TAG = "DemoFunctionParser";
 
 	public DemoFunctionParser() {

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

@@ -22,15 +22,15 @@
 
 import apijson.NotNull;
 import apijson.RequestMethod;
-import apijson.framework.APIJSONObjectParser;
+import apijson.framework.javax.APIJSONObjectParser;
 import apijson.orm.Join;
 import apijson.orm.SQLConfig;
 
 
 /**对象解析器，用来简化 Parser
  * @author Lemon
  */
-public class DemoObjectParser extends APIJSONObjectParser {
+public class DemoObjectParser extends APIJSONObjectParser<Long> {
 
     public DemoObjectParser(HttpSession session, @NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
             , boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {

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

@@ -17,8 +17,8 @@
 import com.alibaba.fastjson.JSONObject;
 
 import apijson.RequestMethod;
-import apijson.framework.APIJSONObjectParser;
-import apijson.framework.APIJSONParser;
+import apijson.framework.javax.APIJSONObjectParser;
+import apijson.framework.javax.APIJSONParser;
 import apijson.orm.SQLConfig;
 
 
@@ -46,7 +46,7 @@ public DemoParser(RequestMethod method, boolean needVerify) {
 
 
     @Override
-    public APIJSONObjectParser createObjectParser(JSONObject request, String parentPath, SQLConfig arrayConfig
+    public APIJSONObjectParser<Long> createObjectParser(JSONObject request, String parentPath, SQLConfig arrayConfig
             , boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
         return new DemoObjectParser(getSession(), request, parentPath, arrayConfig
                 , isSubquery, isTable, isArrayMainTable).setMethod(getMethod()).setParser(this);

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

@@ -14,10 +14,10 @@
 
 package apijson.demo;
 
-import static apijson.framework.APIJSONConstant.ID;
-import static apijson.framework.APIJSONConstant.PRIVACY_;
-import static apijson.framework.APIJSONConstant.USER_;
-import static apijson.framework.APIJSONConstant.USER_ID;
+import static apijson.framework.javax.APIJSONConstant.ID;
+import static apijson.framework.javax.APIJSONConstant.PRIVACY_;
+import static apijson.framework.javax.APIJSONConstant.USER_;
+import static apijson.framework.javax.APIJSONConstant.USER_ID;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -31,7 +31,7 @@
 import apijson.RequestMethod;
 import apijson.StringUtil;
 import apijson.column.ColumnUtil;
-import apijson.framework.APIJSONSQLConfig;
+import apijson.framework.javax.APIJSONSQLConfig;
 import apijson.orm.AbstractSQLConfig;
 import apijson.orm.Join;
 import apijson.orm.Join.On;
@@ -309,8 +309,8 @@ protected void onJoinNotRelation(String sql, String quote, Join join, String tab
     }
 
     @Override
-    protected void onJoinComplextRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {
-        // 开启 JOIN	ON t1.c1 LIKE concat('%', t2.c2, '%') 等复杂关联		super.onJoinComplextRelation(sql, quote, j, jt, onList, on);
+    protected void onJoinComplexRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {
+        // 开启 JOIN	ON t1.c1 LIKE concat('%', t2.c2, '%') 等复杂关联		super.onJoinComplexRelation(sql, quote, j, jt, onList, on);
     }
 
 }

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

@@ -20,7 +20,7 @@
 
 import apijson.Log;
 import apijson.boot.DemoApplication;
-import apijson.framework.APIJSONSQLExecutor;
+import apijson.framework.javax.APIJSONSQLExecutor;
 import apijson.orm.SQLConfig;
 
 

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

@@ -14,7 +14,7 @@
 
 package apijson.demo;
 
-import apijson.framework.APIJSONVerifier;
+import apijson.framework.javax.APIJSONVerifier;
 
 
 /**安全校验器，校验请求参数、角色与权限等

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

@@ -21,7 +21,7 @@
 import com.alibaba.fastjson.annotation.JSONField;
 
 import apijson.MethodAccess;
-import apijson.framework.BaseModel;
+import apijson.framework.javax.BaseModel;
 
 /**
  * TODO 漏洞：如果GETS允许CONTACT，则CONTACT能看到自己的余额，tag可以不是Privacy-circle。

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

@@ -20,7 +20,7 @@
 import java.util.List;
 
 import apijson.MethodAccess;
-import apijson.framework.BaseModel;
+import apijson.framework.javax.BaseModel;
 import apijson.orm.Visitor;
 
 /**用户开放信息

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

@@ -22,7 +22,7 @@
 import static apijson.orm.AbstractVerifier.UNKNOWN;
 
 import apijson.MethodAccess;
-import apijson.framework.BaseModel;
+import apijson.framework.javax.BaseModel;
 
 /**验证码
  * @author Lemon