Java：Solon Demo 升级 APIJSON 及自身 7.1.0

Author: TommyLemon

Diff for: APIJSON-Java-Server/APIJSONDemo-Solon/pom.xml

@@ -12,7 +12,7 @@
 	<artifactId>apijson-demo</artifactId>
 	<name>apijson-demo</name>
 	<description>Demo project for Solon</description>
-	<version>7.0.3</version>
+	<version>7.1.0</version>
 	<properties>
 		<java.version>17</java.version>
 	</properties>
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>7.0.3</version>
+			<version>7.1.0</version>
 		</dependency>
 
 		<!-- 数据库 JDBC 驱动 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->

Diff for: APIJSON-Java-Server/APIJSONDemo-Solon/src/main/java/apijson/demo/DemoFunctionParser.java

@@ -24,7 +24,7 @@
  * 具体见 https://github.com/Tencent/APIJSON/issues/101
  * @author Lemon
  */
-public class DemoFunctionParser extends AbstractFunctionParser {
+public class DemoFunctionParser extends AbstractFunctionParser<Long> {
 	public static final String TAG = "DemoFunctionParser";
 
 

Diff for: APIJSON-Java-Server/APIJSONDemo-Solon/src/main/java/apijson/demo/DemoObjectParser.java

@@ -30,15 +30,17 @@
 /**对象解析器，用来简化 Parser
  * @author Lemon
  */
-public class DemoObjectParser extends AbstractObjectParser {
+public class DemoObjectParser extends AbstractObjectParser<Long> {
 
     public DemoObjectParser(SessionState session, @NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
             , boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
         super(request, parentPath, arrayConfig, isSubquery, isTable, isArrayMainTable);
     }
 
+
     @Override
     public SQLConfig newSQLConfig(RequestMethod method, String table, String alias, JSONObject request, List<Join> joinList, boolean isProcedure) throws Exception {
         return DemoSQLConfig.newSQLConfig(method, table, alias, request, joinList, isProcedure);
     }
+
 }

Diff for: APIJSON-Java-Server/APIJSONDemo-Solon/src/main/java/apijson/demo/DemoSQLConfig.java

@@ -109,7 +109,7 @@ protected void onJoinNotRelation(String sql, String quote, Join j, String jt, Li
 		// 开启 JOIN	ON t1.c1 != t2.c2 等不等式关联 	super.onJoinNotRelation(sql, quote, j, jt, onList, on);
 	}
 	@Override
-	protected void onJoinComplextRelation(String sql, String quote, Join j, String jt, List<On> onList, On 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.onJoinComplextRelation(sql, quote, j, jt, onList, on);
 	}