Skip to content

Commit 1344073

Browse files
TommyLemonTommyLemon
committed
优化内置表 model 的权限，删除不再需要的 TestRecord
1 parent a7d0f0f commit 1344073

20 files changed

Lines changed: 94 additions & 130 deletions

‎APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ public abstract class AbstractSQLConfig<T, M extends Map<String, Object>, L exte
142142
CONFIG_TABLE_LIST.add(Request.class.getSimpleName());
143143
CONFIG_TABLE_LIST.add(Access.class.getSimpleName());
144144
CONFIG_TABLE_LIST.add(Document.class.getSimpleName());
145-
CONFIG_TABLE_LIST.add(TestRecord.class.getSimpleName());
146-
147145

148146
DATABASE_LIST = new ArrayList<>();
149147
DATABASE_LIST.add(DATABASE_MYSQL);

‎APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import apijson.orm.model.AllColumn;
4949
import apijson.orm.model.AllTableComment;
5050
import apijson.orm.model.AllColumnComment;
51-
import apijson.orm.model.TestRecord;
5251

5352
import javax.script.ScriptEngine;
5453
import javax.script.ScriptEngineManager;
@@ -174,7 +173,6 @@ public abstract class AbstractVerifier<T, M extends Map<String, Object>, L exten
174173
SYSTEM_ACCESS_MAP.put(ExtendedProperty.class.getSimpleName(), getAccessMap(ExtendedProperty.class.getAnnotation(MethodAccess.class)));
175174

176175
SYSTEM_ACCESS_MAP.put(Document.class.getSimpleName(), getAccessMap(Document.class.getAnnotation(MethodAccess.class)));
177-
SYSTEM_ACCESS_MAP.put(TestRecord.class.getSimpleName(), getAccessMap(TestRecord.class.getAnnotation(MethodAccess.class)));
178176
}
179177

180178
ACCESS_MAP = new HashMap<>(SYSTEM_ACCESS_MAP);

‎APIJSONORM/src/main/java/apijson/orm/ConfigMethodAccess.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*Copyright (C) 2020 Tencent. All rights reserved.
2+
3+
This source code is licensed under the Apache License Version 2.0.*/
4+
5+
6+
//package apijson.orm;
7+
//
8+
//import apijson.MethodAccess;
9+
//
10+
//import java.lang.annotation.Documented;
11+
//import java.lang.annotation.Inherited;
12+
//import java.lang.annotation.Retention;
13+
//import java.lang.annotation.Target;
14+
//
15+
//import static apijson.orm.AbstractVerifier.*;
16+
//import static java.lang.annotation.ElementType.TYPE;
17+
//import static java.lang.annotation.RetentionPolicy.RUNTIME;
18+
//
19+
///**配置表的请求方法权限，只允许某些角色通过对应方法访问
20+
// 不能直接查到 MethodAccess，需要往上递归查找
21+
// * @author Lemon
22+
// */
23+
//@Documented
24+
//@Retention(RUNTIME)
25+
//@Target(TYPE)
26+
//@Inherited
27+
//@MethodAccess(GET = {LOGIN, ADMIN}, HEAD = {LOGIN, ADMIN}, POST = {}, PUT = {}, DELETE = {})
28+
//public @interface ConfigMethodAccess {
29+
//}

‎APIJSONORM/src/main/java/apijson/orm/model/Access.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77

88
import apijson.MethodAccess;
99

10+
import static apijson.orm.AbstractVerifier.ADMIN;
11+
import static apijson.orm.AbstractVerifier.LOGIN;
12+
1013
/**访问权限
1114
* @author Lemon
1215
*/
13-
@MethodAccess(POST = {}, PUT = {}, DELETE = {})
16+
@MethodAccess(GET = {LOGIN, ADMIN}, HEAD = {LOGIN, ADMIN}, POST = {}, PUT = {}, DELETE = {})
17+
//@ConfigMethodAccess
1418
public class Access {
1519
}

‎APIJSONORM/src/main/java/apijson/orm/model/AllColumn.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77

88
import apijson.MethodAccess;
99

10+
import static apijson.orm.AbstractVerifier.ADMIN;
11+
import static apijson.orm.AbstractVerifier.LOGIN;
12+
1013
/**SQL Server 在 sys 下的字段(列名)
1114
* @author Lemon
1215
*/
13-
@MethodAccess(POST = {}, PUT = {}, DELETE = {})
16+
@MethodAccess(GET = {LOGIN, ADMIN}, HEAD = {LOGIN, ADMIN}, POST = {}, PUT = {}, DELETE = {})
1417
public class AllColumn {
1518
public static final String TAG = "AllColumn";
1619
public static final String TABLE_NAME = "ALL_TAB_COLUMNS";

‎APIJSONORM/src/main/java/apijson/orm/model/AllColumnComment.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77

88
import apijson.MethodAccess;
99

10+
import static apijson.orm.AbstractVerifier.ADMIN;
11+
import static apijson.orm.AbstractVerifier.LOGIN;
12+
1013
/**SQL Server 在 sys 下的字段(列名)
1114
* @author Lemon
1215
*/
13-
@MethodAccess(POST = {}, PUT = {}, DELETE = {})
16+
@MethodAccess(GET = {LOGIN, ADMIN}, HEAD = {LOGIN, ADMIN}, POST = {}, PUT = {}, DELETE = {})
1417
public class AllColumnComment {
1518
public static final String TAG = "AllColumnComment";
1619
public static final String TABLE_NAME = "ALL_COL_COMMENTS";

‎APIJSONORM/src/main/java/apijson/orm/model/AllTable.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77

88
import apijson.MethodAccess;
99

10+
import static apijson.orm.AbstractVerifier.ADMIN;
11+
import static apijson.orm.AbstractVerifier.LOGIN;
12+
1013
/**SQL Server 表属性
1114
* @author Lemon
1215
*/
13-
@MethodAccess(POST = {}, PUT = {}, DELETE = {})
16+
@MethodAccess(GET = {LOGIN, ADMIN}, HEAD = {LOGIN, ADMIN}, POST = {}, PUT = {}, DELETE = {})
1417
public class AllTable {
1518
public static final String TAG = "AllTable";
1619
public static final String TABLE_NAME = "ALL_TABLES";

‎APIJSONORM/src/main/java/apijson/orm/model/AllTableComment.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77

88
import apijson.MethodAccess;
99

10+
import static apijson.orm.AbstractVerifier.ADMIN;
11+
import static apijson.orm.AbstractVerifier.LOGIN;
12+
1013
/**SQL Server 表属性
1114
* @author Lemon
1215
*/
13-
@MethodAccess(POST = {}, PUT = {}, DELETE = {})
16+
@MethodAccess(GET = {LOGIN, ADMIN}, HEAD = {LOGIN, ADMIN}, POST = {}, PUT = {}, DELETE = {})
1417
public class AllTableComment {
1518
public static final String TAG = "AllTableComment";
1619
public static final String TABLE_NAME = "ALL_TAB_COMMENTS";

‎APIJSONORM/src/main/java/apijson/orm/model/Column.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77

88
import apijson.MethodAccess;
99

10+
import static apijson.orm.AbstractVerifier.ADMIN;
11+
import static apijson.orm.AbstractVerifier.LOGIN;
12+
1013
/**字段(列名)属性
1114
* @author Lemon
1215
*/
13-
@MethodAccess(POST = {}, PUT = {}, DELETE = {})
16+
@MethodAccess(GET = {LOGIN, ADMIN}, HEAD = {LOGIN, ADMIN}, POST = {}, PUT = {}, DELETE = {})
1417
public class Column {
1518
public static final String TAG = "Column";
1619
public static final String TABLE_NAME = "columns";

‎APIJSONORM/src/main/java/apijson/orm/model/Document.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* @author Lemon
1818
*/
1919
@MethodAccess(
20-
GET = { LOGIN, ADMIN },
21-
HEAD = { LOGIN, ADMIN },
22-
PUT = { LOGIN, ADMIN }
23-
)
20+
GET = { LOGIN, ADMIN },
21+
HEAD = { LOGIN, ADMIN },
22+
PUT = { LOGIN, ADMIN }
23+
)
2424
public class Document implements Serializable {
2525
private static final long serialVersionUID = 1L;
2626

0 commit comments

Comments
 (0)