Server:为Table,Column,Test添加访问权限

TommyLemon · TommyLemon · commit 1500cfe3d003 · 2017-07-24T00:58:30.000+08:00
diff --git a/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/apijson/demo/server/AccessVerifier.java b/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/apijson/demo/server/AccessVerifier.java
@@ -36,6 +36,9 @@
 import zuo.biao.apijson.MethodAccess;
 import zuo.biao.apijson.RequestMethod;
 import zuo.biao.apijson.RequestRole;
+import zuo.biao.apijson.model.Column;
+import zuo.biao.apijson.model.Table;
+import zuo.biao.apijson.model.Test;
 import zuo.biao.apijson.server.exception.NotLoggedInException;
 import zuo.biao.apijson.server.sql.SQLConfig;
 
@@ -57,6 +60,10 @@ public class AccessVerifier {
 	static {
 		ACCESS_MAP = new HashMap<String, Map<RequestMethod, RequestRole[]>>();
 
+		ACCESS_MAP.put(Table.class.getSimpleName(), getAccessMap(Table.class.getAnnotation(MethodAccess.class)));
+		ACCESS_MAP.put(Column.class.getSimpleName(), getAccessMap(Column.class.getAnnotation(MethodAccess.class)));
+		ACCESS_MAP.put(Test.class.getSimpleName(), getAccessMap(Test.class.getAnnotation(MethodAccess.class)));
+
 		ACCESS_MAP.put(User.class.getSimpleName(), getAccessMap(User.class.getAnnotation(MethodAccess.class)));
 		ACCESS_MAP.put(Privacy.class.getSimpleName(), getAccessMap(Privacy.class.getAnnotation(MethodAccess.class)));
 		ACCESS_MAP.put(Moment.class.getSimpleName(), getAccessMap(Moment.class.getAnnotation(MethodAccess.class)));
diff --git a/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/zuo/biao/apijson/server/sql/SQLConfig.java b/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/zuo/biao/apijson/server/sql/SQLConfig.java
@@ -48,14 +48,15 @@
 import com.alibaba.fastjson.annotation.JSONField;
 
 import apijson.demo.server.model.BaseModel;
-import apijson.demo.server.model.User;
 import apijson.demo.server.model.Privacy;
+import apijson.demo.server.model.User;
 import zuo.biao.apijson.Log;
 import zuo.biao.apijson.RequestMethod;
 import zuo.biao.apijson.RequestRole;
 import zuo.biao.apijson.SQL;
 import zuo.biao.apijson.StringUtil;
 import zuo.biao.apijson.model.Column;
+import zuo.biao.apijson.model.Table;
 import zuo.biao.apijson.server.JSONRequest;
 import zuo.biao.apijson.server.Logic;
 import zuo.biao.apijson.server.Pair;
@@ -109,6 +110,9 @@ public class SQLConfig {
 	public static final Map<String, String> TABLE_KEY_MAP;
 	static {
 		TABLE_KEY_MAP = new HashMap<String, String>();
+		TABLE_KEY_MAP.put(Table.class.getSimpleName(), Table.TAG);
+		TABLE_KEY_MAP.put(Column.class.getSimpleName(), Column.TAG);
+		
 		TABLE_KEY_MAP.put(User.class.getSimpleName(), "apijson_user");
 		TABLE_KEY_MAP.put(Privacy.class.getSimpleName(), "apijson_privacy");
 	}
@@ -1032,12 +1036,12 @@ public static synchronized SQLConfig newQueryConfig(RequestMethod method, String
 			Map<String, Object> tableWhere = new LinkedHashMap<String, Object>();//保证顺序好优化 WHERE id > 1 AND name LIKE...
 			if (about) {
 				if (RequestMethod.isQueryMethod(method) == false) {
-					throw new UnsupportedOperationException(config.getTable() + " 被 @info 标注，只能进行 GET,HEAD 等查询操作！");
+					throw new UnsupportedOperationException(config.getTable() + " 被" + KEY_ABOUT + "标注，只能进行 GET,HEAD 等查询操作！");
 				}
 
 				tableWhere.put(TABLE_SCHEMA, SQLConfig.getSchema(schema));
 				tableWhere.put(TABLE_NAME, config.getSQLTable());
-				config.setTable(Column.TAG);
+				config.setTable(Column.class.getSimpleName());
 
 				schema = SCHEMA_INFORMATION;
 				column += (
