Java：APIJSONFinal 升级 APIJSON, apijson-framework, apijson-column 的 jar 版本为 4.8.0

Author: TommyLemon

APIJSON-Java-Server/APIJSONFinal/libs/apijson-framework-4.7.2.jar

@@ -23,7 +23,7 @@
 		</dependency>
 
 		<!-- 可使用 libs 目录的 apijson-orm.jar 和 apijson-framework.jar 来替代，两种方式二选一 <<<<<<<<<< -->
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
 			<version>4.7.2</version>
@@ -32,7 +32,7 @@
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-framework</artifactId>
 			<version>4.7.2</version>
-		</dependency>
+		</dependency> -->
 		<!-- 可使用 libs 目录的 apijson-orm.jar 和 apijson-framework.jar 来替代，两种方式二选一 >>>>>>>>>> -->
 
 		<!-- 需要用的数据库 JDBC 驱动 -->

APIJSON-Java-Server/APIJSONFinal/libs/apijson-framework-4.8.0.jar

@@ -14,19 +14,18 @@
 
 package apijson.demo;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
 import javax.servlet.http.HttpSession;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
 import apijson.JSONResponse;
 import apijson.NotNull;
 import apijson.RequestMethod;
-import apijson.RequestRole;
 import apijson.StringUtil;
 import apijson.framework.APIJSONFunctionParser;
 import apijson.orm.JSONRequest;
@@ -212,8 +211,8 @@ public JSONArray getIdList(@NotNull JSONObject current) {
 	 */
 	public Object verifyAccess(@NotNull JSONObject current) throws Exception {
 		long userId = current.getLongValue(JSONRequest.KEY_USER_ID);
-		RequestRole role = RequestRole.get(current.getString(JSONRequest.KEY_ROLE));
-		if (role == RequestRole.OWNER && userId != DemoVerifier.getVisitorId(getSession())) {
+		String role = current.getString(JSONRequest.KEY_ROLE);
+		if (role == apijson.orm.AbstractVerifier.OWNER && userId != DemoVerifier.getVisitorId(getSession())) {
 			throw new IllegalAccessException("登录用户与角色OWNER不匹配！");
 		}
 		return null;

APIJSON-Java-Server/APIJSONFinal/libs/apijson-orm-4.7.2.jar

@@ -70,7 +70,7 @@ public AbstractSQLConfig getSQLConfig(RequestMethod method, String database, Str
 			//			}
 
 			@Override
-			public String getUserIdKey(String database, String schema, String table) {
+			public String getUserIdKey(String database, String schema, String datasource, String table) {
 				return USER_.equals(table) || PRIVACY_.equals(table) ? ID : USER_ID; // id / userId
 			}
 

APIJSON-Java-Server/APIJSONFinal/libs/apijson-orm-4.8.0.jar

@@ -14,9 +14,9 @@
 
 package apijson.demo.model;
 
-import static apijson.RequestRole.ADMIN;
-import static apijson.RequestRole.OWNER;
-import static apijson.RequestRole.UNKNOWN;
+import static apijson.orm.AbstractVerifier.ADMIN;
+import static apijson.orm.AbstractVerifier.OWNER;
+import static apijson.orm.AbstractVerifier.UNKNOWN;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

APIJSON-Java-Server/APIJSONFinal/pom.xml

@@ -14,8 +14,8 @@
 
 package apijson.demo.model;
 
-import static apijson.RequestRole.ADMIN;
-import static apijson.RequestRole.UNKNOWN;
+import static apijson.orm.AbstractVerifier.ADMIN;
+import static apijson.orm.AbstractVerifier.UNKNOWN;
 
 import java.util.List;
 

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

@@ -14,12 +14,12 @@
 
 package apijson.demo.model;
 
-import static apijson.RequestRole.ADMIN;
-import static apijson.RequestRole.CIRCLE;
-import static apijson.RequestRole.CONTACT;
-import static apijson.RequestRole.LOGIN;
-import static apijson.RequestRole.OWNER;
-import static apijson.RequestRole.UNKNOWN;
+import static apijson.orm.AbstractVerifier.ADMIN;
+import static apijson.orm.AbstractVerifier.CIRCLE;
+import static apijson.orm.AbstractVerifier.CONTACT;
+import static apijson.orm.AbstractVerifier.LOGIN;
+import static apijson.orm.AbstractVerifier.OWNER;
+import static apijson.orm.AbstractVerifier.UNKNOWN;
 
 import apijson.MethodAccess;
 import apijson.framework.BaseModel;