Commit ecbb70d

kxlv2000 kxlv2000

committed

Merge branch 'APIJSON:master' into master

2 parents 99e0da8 + 63ff830 commit ecbb70dCopy full SHA for ecbb70d

File tree

21 files changed

+9681

-55

lines changed

APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo
- DemoSQLConfig.java
- DemoSQLExecutor.java
MySQL
- single
- sys.sql
Oracle
- 初始化.sql

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 number	Diff line number	Diff line change
`@@ -262,12 +262,13 @@ public String getDBPassword() {`
`262`	`262`
`263`	`263`
`264`	`264`	`// 取消注释支持 !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`	`+`
`273`	`274`	`}`

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

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,13 @@ public Connection getConnection(SQLConfig config) throws Exception {`
`70`	`70`	`// 如果这里是 return c,则会导致增删改多个对象时只有第一个会 commit,即只有第一个对象成功插入数据库表`
`71`	`71`	`return super.getConnection(config);`
`72`	`72`	`}`
`73`		`-`
`74`		`-`
	`73`	`+`
	`74`	`+`
`75`	`75`	`// 取消注释支持 !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`	`+ // }`
`81`	`81`
`82`	`82`	`}`

`‎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 number	Diff line number	Diff line change
`@@ -58,4 +58,4 @@ UNLOCK TABLES;`
`58`	`58`	`/!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION /;`
`59`	`59`	`/!40111 SET SQL_NOTES=@OLD_SQL_NOTES /;`
`60`	`60`
`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 number	Diff line number	Diff line change
`@@ -50,4 +50,4 @@ UNLOCK TABLES;`
`50`	`50`	`/!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION /;`
`51`	`51`	`/!40111 SET SQL_NOTES=@OLD_SQL_NOTES /;`
`52`	`52`
`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 number	Diff line number	Diff line change
`@@ -64,4 +64,4 @@ UNLOCK TABLES;`
`64`	`64`	`/!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION /;`
`65`	`65`	`/!40111 SET SQL_NOTES=@OLD_SQL_NOTES /;`
`66`	`66`
`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 number	Diff line number	Diff line change
`@@ -50,4 +50,4 @@ UNLOCK TABLES;`
`50`	`50`	`/!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION /;`
`51`	`51`	`/!40111 SET SQL_NOTES=@OLD_SQL_NOTES /;`
`52`	`52`
`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)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ecbb70d

File tree

21 files changed

21 files changed

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

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

`‎MySQL/single/sys_Access.sql‎`

`‎MySQL/single/sys_Comment.sql‎`

`‎MySQL/single/sys_Document.sql‎`

`‎MySQL/single/sys_Function.sql‎`

`‎MySQL/single/sys_Login.sql‎`

`‎MySQL/single/sys_Method.sql‎`

`‎MySQL/single/sys_Moment.sql‎`

`‎MySQL/single/sys_Praise.sql‎`

0 commit comments