Skip to content

Commit ecbb70d

Browse files
kxlv2000kxlv2000
committed
Merge branch 'APIJSON:master' into master
2 parents 99e0da8 + 63ff830 commit ecbb70d

21 files changed

+9681
-55
lines changed

‎APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/DemoSQLConfig.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,13 @@ public String getDBPassword() {
262262

263263

264264
// 取消注释支持 !key 反选字段 和 字段名映射，需要先依赖插件 https://github.com/APIJSON/apijson-column
265-
@Override
266-
public AbstractSQLConfig setColumn(List<String> column) {
267-
return super.setColumn(ColumnUtil.compatInputColumn(column, getTable(), getMethod()));
268-
}
269-
@Override
270-
public String getKey(String key) {
271-
return ColumnUtil.compatInputKey(super.getKey(key), getTable(), getMethod());
272-
}
265+
// @Override
266+
// public AbstractSQLConfig setColumn(List<String> column) {
267+
// return super.setColumn(ColumnUtil.compatInputColumn(column, getTable(), getMethod()));
268+
// }
269+
// @Override
270+
// public String getKey(String key) {
271+
// return super.getKey(ColumnUtil.compatInputKey(key, getTable(), getMethod()));
272+
// }
273+
273274
}

‎APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/DemoSQLExecutor.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ public Connection getConnection(SQLConfig config) throws Exception {
7070
// 如果这里是 return c，则会导致 增删改 多个对象时只有第一个会 commit，即只有第一个对象成功插入数据库表
7171
return super.getConnection(config);
7272
}
73-
74-
73+
74+
7575
// 取消注释支持 !key 反选字段 和 字段名映射，需要先依赖插件 https://github.com/APIJSON/apijson-column
76-
@Override
77-
protected String getKey(SQLConfig config, ResultSet rs, ResultSetMetaData rsmd, int tablePosition, JSONObject table,
78-
int columnIndex, Map<String, JSONObject> childMap) throws Exception {
79-
return ColumnUtil.compatOutputKey(super.getKey(config, rs, rsmd, tablePosition, table, columnIndex, childMap), config.getTable(), config.getMethod());
80-
}
76+
// @Override
77+
// protected String getKey(SQLConfig config, ResultSet rs, ResultSetMetaData rsmd, int tablePosition, JSONObject table,
78+
// int columnIndex, Map<String, JSONObject> childMap) throws Exception {
79+
// return ColumnUtil.compatOutputKey(super.getKey(config, rs, rsmd, tablePosition, table, columnIndex, childMap), config.getTable(), config.getMethod());
80+
// }
8181

8282
}

‎MySQL/single/sys_Access.sql‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎MySQL/single/sys_Comment.sql‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎MySQL/single/sys_Document.sql‎

Lines changed: 3 additions & 2 deletions
Large diffs are not rendered by default.

‎MySQL/single/sys_Function.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ UNLOCK TABLES;
5858
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
5959
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
6060

61-
-- Dump completed on 2021-03-22 23:17:13
61+
-- Dump completed on 2021-05-08 23:07:22

‎MySQL/single/sys_Login.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ UNLOCK TABLES;
5050
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
5151
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
5252

53-
-- Dump completed on 2021-03-22 23:17:53
53+
-- Dump completed on 2021-05-08 23:07:53

‎MySQL/single/sys_Method.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ UNLOCK TABLES;
6464
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
6565
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
6666

67-
-- Dump completed on 2021-03-22 23:17:12
67+
-- Dump completed on 2021-05-08 23:07:21

‎MySQL/single/sys_Moment.sql‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎MySQL/single/sys_Praise.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ UNLOCK TABLES;
5050
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
5151
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
5252

53-
-- Dump completed on 2021-03-22 23:17:49
53+
-- Dump completed on 2021-05-08 23:07:52

0 commit comments

Comments
 (0)