Skip to content

Commit df9692c

Browse files
TommyLemonTommyLemon
committed
Server:删除@about，查看表和字段属性文档可用APIJSONAuto接口管理工具(查Table和Column字段)，图形化界面更方便
1 parent 621d261 commit df9692c

4 files changed

Lines changed: 4 additions & 52 deletions

File tree

‎APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONObject.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ public JSONObject setUserIdIn(List<Object> list) {
127127
public static final String KEY_CORRECT = "@correct"; //字段校正
128128

129129
public static final String KEY_SCHEMA = "@schema"; //数据库，Table在非默认schema内时需要声明
130-
public static final String KEY_ABOUT = "@about"; //关于，返回数据库表的信息，包括表说明和字段说明
131130
public static final String KEY_COLUMN = "@column"; //查询的Table字段或SQL函数
132131
public static final String KEY_COMBINE = "@combine"; //条件组合，每个条件key前面可以放&,|,!逻辑关系 "id!{},&sex,!name&$"
133132
public static final String KEY_GROUP = "@group"; //分组方式
@@ -139,7 +138,6 @@ public JSONObject setUserIdIn(List<Object> list) {
139138
TABLE_KEY_LIST = new ArrayList<String>();
140139
TABLE_KEY_LIST.add(KEY_ROLE);
141140
TABLE_KEY_LIST.add(KEY_SCHEMA);
142-
TABLE_KEY_LIST.add(KEY_ABOUT);
143141
TABLE_KEY_LIST.add(KEY_COLUMN);
144142
TABLE_KEY_LIST.add(KEY_COMBINE);
145143
TABLE_KEY_LIST.add(KEY_GROUP);
@@ -192,14 +190,6 @@ public JSONObject setSchema(String schema) {
192190
return puts(KEY_SCHEMA, schema);
193191
}
194192

195-
/**set about
196-
* @param about
197-
* @return this
198-
*/
199-
public JSONObject setAbout(boolean about) {
200-
return puts(KEY_ABOUT, about);
201-
}
202-
203193
/**set keys need to be returned
204194
* @param keys key0, key1, key2 ...
205195
* @return {@link #setColumn(String)}
@@ -216,14 +206,14 @@ public JSONObject setColumn(String keys) {
216206
}
217207

218208
/**set combination of keys for conditions
219-
* @param keys key0, key1, key2 ...
209+
* @param keys key0,&key1,|key2,!kye3 ...
220210
* @return {@link #setColumn(String)}
221211
*/
222212
public JSONObject setCombine(String... keys) {
223213
return setCombine(StringUtil.getString(keys, true));
224214
}
225215
/**set combination of keys for conditions
226-
* @param keys "key0,key1,key2..."
216+
* @param keys key0,&key1,|key2,!kye3 ...
227217
* @return
228218
*/
229219
public JSONObject setCombine(String keys) {

‎APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package zuo.biao.apijson.server;
1616

17-
import static zuo.biao.apijson.JSONObject.KEY_ABOUT;
1817
import static zuo.biao.apijson.JSONObject.KEY_COLUMN;
1918
import static zuo.biao.apijson.JSONObject.KEY_COMBINE;
2019
import static zuo.biao.apijson.JSONObject.KEY_GROUP;
@@ -86,7 +85,6 @@ public abstract class AbstractSQLConfig implements SQLConfig {
8685
private RequestRole role; //发送请求的用户的角色
8786
private String schema; //Table所在的数据库
8887
private String table; //Table名
89-
private boolean about; //关于，返回数据库表的信息，包括表说明和字段说明
9088
private String group; //分组方式的字符串数组，','分隔
9189
private String having; //聚合函数的字符串数组，','分隔
9290
private String order; //排序方式的字符串数组，','分隔
@@ -215,16 +213,6 @@ public AbstractSQLConfig setTable(String table) { //Table已经在Parser中校
215213
return this;
216214
}
217215

218-
@Override
219-
public boolean isAbout() {
220-
return about;
221-
}
222-
@Override
223-
public AbstractSQLConfig setAbout(boolean about) {
224-
this.about = about;
225-
return this;
226-
}
227-
228216
@Override
229217
public String getGroup() {
230218
return group;
@@ -1290,7 +1278,6 @@ public static AbstractSQLConfig newSQLConfig(RequestMethod method, String table,
12901278

12911279
String role = request.getString(KEY_ROLE);
12921280
String schema = request.getString(KEY_SCHEMA);
1293-
boolean about = request.getBooleanValue(KEY_ABOUT);
12941281
String combine = request.getString(KEY_COMBINE);
12951282
String column = request.getString(KEY_COLUMN);
12961283
String group = request.getString(KEY_GROUP);
@@ -1303,7 +1290,6 @@ public static AbstractSQLConfig newSQLConfig(RequestMethod method, String table,
13031290
//关键词
13041291
request.remove(KEY_ROLE);
13051292
request.remove(KEY_SCHEMA);
1306-
request.remove(KEY_ABOUT);
13071293
request.remove(KEY_COMBINE);
13081294
request.remove(KEY_COLUMN);
13091295
request.remove(KEY_GROUP);
@@ -1312,24 +1298,6 @@ public static AbstractSQLConfig newSQLConfig(RequestMethod method, String table,
13121298

13131299

13141300
Map<String, Object> tableWhere = new LinkedHashMap<String, Object>();//保证顺序好优化 WHERE id > 1 AND name LIKE...
1315-
if (about) { //查询字段属性
1316-
if (RequestMethod.isQueryMethod(method) == false) {
1317-
throw new UnsupportedOperationException(config.getTable()
1318-
+ " 被 " + KEY_ABOUT + " 标注，只能进行 GET,HEAD 等查询操作！");
1319-
}
1320-
1321-
tableWhere.put(TABLE_SCHEMA, schema);
1322-
tableWhere.put(TABLE_NAME, config.getSQLTable());
1323-
config.setTable(Column.class.getSimpleName());
1324-
1325-
schema = SCHEMA_INFORMATION;
1326-
1327-
column = StringUtil.getString(column);
1328-
if (column.isEmpty() && RequestMethod.isHeadMethod(method, true) == false) {
1329-
column = "column_name,column_type,is_nullable,column_default,column_comment";
1330-
}
1331-
}
1332-
13331301

13341302
//已经remove了id和id{}，以及@key
13351303
Set<String> set = request.keySet(); //前面已经判断request是否为空
@@ -1478,9 +1446,7 @@ else if (whereList != null && whereList.contains(key)) {
14781446
//在 tableWhere 第0个 config.setIdIn(idIn);
14791447

14801448
config.setRole(role);
1481-
//TODO condition组合，优先 | config.setCondition(where);
14821449
config.setSchema(schema);
1483-
config.setAbout(about);
14841450
config.setColumn(column);
14851451
config.setGroup(group);
14861452
config.setHaving(having);
@@ -1493,7 +1459,6 @@ else if (whereList != null && whereList.contains(key)) {
14931459
//关键词
14941460
request.put(KEY_ROLE, role);
14951461
request.put(KEY_SCHEMA, schema);
1496-
request.put(KEY_ABOUT, about);
14971462
request.put(KEY_COMBINE, combine);
14981463
request.put(KEY_COLUMN, column);
14991464
request.put(KEY_GROUP, group);

‎APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractVerifier.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,13 @@ public boolean verify(SQLConfig config) throws Exception {
182182
}
183183
}
184184
break;
185-
case OWNER:
185+
case OWNER: //TODO POST请求应该取values里的值！
186186
requestId = (Number) config.getWhere(visitorIdkey, true);//JSON里数值不能保证是Long，可能是Integer
187187
if (requestId != null && requestId.longValue() != visitorId) {
188188
throw new IllegalAccessException(visitorIdkey + " = " + requestId + " 的 " + table
189189
+ " 不允许 " + role.name() + " 用户的 " + method.name() + " 请求！");
190190
}
191-
//TODO POST请求时应该 putContent
191+
//TODO POST请求时应该 setValues
192192
config.putWhere(visitorIdkey, visitorId);
193193
break;
194194
case ADMIN://这里不好做，在特定接口内部判断？ TODO /get/admin + 固定秘钥 Parser#noVerify，之后全局跳过验证

‎APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/SQLConfig.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ public interface SQLConfig {
108108

109109
SQLConfig setTable(String table);
110110

111-
boolean isAbout();
112-
SQLConfig setAbout(boolean about);
113-
114111
String getGroup();
115112
SQLConfig setGroup(String group);
116113

0 commit comments

Comments
 (0)