重构 enum RequestRole 为 String 方便用户自定义扩展；删除部分已废弃的方法

Author: TommyLemon

src/main/java/apijson/framework/APIJSONController.java

@@ -42,7 +42,6 @@
 import com.alibaba.fastjson.JSONObject;
 
 import apijson.JSON;
-import apijson.JSONRequest;
 import apijson.Log;
 import apijson.NotNull;
 import apijson.RequestMethod;

src/main/java/apijson/framework/APIJSONFunctionParser.java

@@ -32,7 +32,7 @@
 import apijson.Log;
 import apijson.NotNull;
 import apijson.RequestMethod;
-import apijson.RequestRole;
+import apijson.orm.AbstractVerifier;
 import apijson.StringUtil;
 import apijson.orm.AbstractFunctionParser;
 import apijson.orm.JSONRequest;
@@ -315,8 +315,8 @@ public JSONArray getIdList(@NotNull JSONObject request) {
 	 */
 	public Object verifyAccess(@NotNull JSONObject request) throws Exception {
 		long userId = request.getLongValue(apijson.JSONObject.KEY_USER_ID);
-		RequestRole role = RequestRole.get(request.getString(apijson.JSONObject.KEY_ROLE));
-		if (role == RequestRole.OWNER && userId != APIJSONVerifier.getVisitorId(session)) {
+		String role = request.getString(apijson.JSONObject.KEY_ROLE);
+		if (AbstractVerifier.OWNER.equals(role) && userId != APIJSONVerifier.getVisitorId(session)) {
 			throw new IllegalAccessException("登录用户与角色OWNER不匹配！");
 		}
 		return null;

src/main/java/apijson/framework/APIJSONSQLConfig.java

@@ -63,20 +63,20 @@ public SQLConfig getSQLConfig(RequestMethod method, String database, String sche
 
 			//取消注释来实现自定义各个表的主键名
 			//			@Override
-			//			public String getIdKey(String database, String schema, String table) {
+			//			public String getIdKey(String database, String schema, String datasource, String table) {
 			//				return StringUtil.firstCase(table + "Id");  // userId, comemntId ...
 			//				//		return StringUtil.toLowerCase(t) + "_id";  // user_id, comemnt_id ...
 			//				//		return StringUtil.toUpperCase(t) + "_ID";  // USER_ID, COMMENT_ID ...
 			//			}
 
 			@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
 			}
 
 			//取消注释来实现数据库自增 id
 			//			@Override
-			//			public Object newId(RequestMethod method, String database, String schema, String table) {
+			//			public Object newId(RequestMethod method, String database, String schema, String datasource, String table) {
 			//				return null; // return null 则不生成 id，一般用于数据库自增 id
 			//			}
 		};
@@ -213,12 +213,12 @@ public String getSQLSchema() {
 
 	@Override
 	public String getIdKey() {
-		return SIMPLE_CALLBACK.getIdKey(getDatabase(), getSchema(), getTable());
+		return SIMPLE_CALLBACK.getIdKey(getDatabase(), getSchema(), getDatasource(), getTable());
 	}
 
 	@Override
 	public String getUserIdKey() {
-		return SIMPLE_CALLBACK.getUserIdKey(getDatabase(), getSchema(), getTable());
+		return SIMPLE_CALLBACK.getUserIdKey(getDatabase(), getSchema(), getDatasource(), getTable());
 	}
 
 

src/main/java/apijson/framework/APIJSONVerifier.java

@@ -36,7 +36,6 @@
 import apijson.Log;
 import apijson.NotNull;
 import apijson.RequestMethod;
-import apijson.RequestRole;
 import apijson.StringUtil;
 import apijson.orm.AbstractVerifier;
 import apijson.orm.JSONRequest;
@@ -187,14 +186,14 @@ public static JSONObject initAccess(boolean shutdownWhenServerError, APIJSONCrea
 				continue;
 			}
 
-			Map<RequestMethod, RequestRole[]> map = new HashMap<>();
-			map.put(RequestMethod.GET, JSON.parseObject(item.getString("get"), RequestRole[].class));
-			map.put(RequestMethod.HEAD, JSON.parseObject(item.getString("head"), RequestRole[].class));
-			map.put(RequestMethod.GETS, JSON.parseObject(item.getString("gets"), RequestRole[].class));
-			map.put(RequestMethod.HEADS, JSON.parseObject(item.getString("heads"), RequestRole[].class));
-			map.put(RequestMethod.POST, JSON.parseObject(item.getString("post"), RequestRole[].class));
-			map.put(RequestMethod.PUT, JSON.parseObject(item.getString("put"), RequestRole[].class));
-			map.put(RequestMethod.DELETE, JSON.parseObject(item.getString("delete"), RequestRole[].class));
+			Map<RequestMethod, String[]> map = new HashMap<>();
+			map.put(RequestMethod.GET, JSON.parseObject(item.getString("get"), String[].class));
+			map.put(RequestMethod.HEAD, JSON.parseObject(item.getString("head"), String[].class));
+			map.put(RequestMethod.GETS, JSON.parseObject(item.getString("gets"), String[].class));
+			map.put(RequestMethod.HEADS, JSON.parseObject(item.getString("heads"), String[].class));
+			map.put(RequestMethod.POST, JSON.parseObject(item.getString("post"), String[].class));
+			map.put(RequestMethod.PUT, JSON.parseObject(item.getString("put"), String[].class));
+			map.put(RequestMethod.DELETE, JSON.parseObject(item.getString("delete"), String[].class));
 
 			String name = item.getString("name");
 			String alias = item.getString("alias");
@@ -521,19 +520,12 @@ public static long value(Long v) {
 		return v == null ? 0 : v;
 	}
 
-	@Override
-	public String getIdKey(String database, String schema, String table) {
-		return APIJSONSQLConfig.SIMPLE_CALLBACK.getIdKey(database, schema, table);
-	}
+
 	@Override
 	public String getIdKey(String database, String schema, String datasource, String table) {
 		return APIJSONSQLConfig.SIMPLE_CALLBACK.getIdKey(database, schema, datasource, table);
 	}
 	@Override
-	public String getUserIdKey(String database, String schema, String table) {
-		return APIJSONSQLConfig.SIMPLE_CALLBACK.getUserIdKey(database, schema, table);
-	}
-	@Override
 	public String getUserIdKey(String database, String schema, String datasource, String table) {
 		return APIJSONSQLConfig.SIMPLE_CALLBACK.getUserIdKey(database, schema, datasource, table);
 	}