Commit 2f97c8c

authored

Merge pull request APIJSON#28 from cloudAndMonkey/master

清理代码,补充readme

2 parents 576eb7b + 9b28004 commit 2f97c8cCopy full SHA for 2f97c8c

File tree

4 files changed

+10

-272

lines changed

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch
- README.md
- src/main/java/apijson/demo

4 files changed

+10

-272

lines changed

`‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/README.md‎`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# APIJSONDemo`
`2`	`2`
`3`		`-## 1、支持多数据源`
	`3`	`+## 支持多数据源`
`4`	`4`
`5`	`5`	`数据源解析顺序:`
`6`	`6`
`@@ -48,21 +48,25 @@`
`48`	`48`
`49`	`49`	`![image](https://user-images.githubusercontent.com/12228225/207245545-277ba9a6-e87f-42b3-af55-9d6a37384a1e.png)`
`50`	`50`
`51`		`-## 2、集成elasticsearch-sql`
	`51`	`+## 集成elasticsearch-sql`
`52`	`52`
`53`	`53`	`换成xpack, 也一样`
`54`	`54`
`55`	`55`	`应用导入: elasticsearch-sql-7.17.5.0.jar`
`56`	`56`
`57`		`-## 3、apijson支持elasticsearch功能点`
	`57`	`+## apijson elasticsearch type支持`
	`58`	`+`
	`59`	`+APIJSONSQLConfig.TABLE_KEY_MAP.put("ES_blog", "es_blog/doc");`
	`60`	`+`
	`61`	`+## apijson支持elasticsearch功能点`
`58`	`62`
`59`	`63`	`新增、修改、删除、查询`
`60`	`64`
`61`		`-## 4、elasticsearch-sql不支持RLIKE`
	`65`	`+## elasticsearch-sql不支持RLIKE`
`62`	`66`
`63`	`67`	`![image](https://user-images.githubusercontent.com/12228225/207245701-ea2560a9-2389-4953-a568-9e85adfb15ad.png)`
`64`	`68`
`65`		`-## 5、apijson支持字段 .keyword`
	`69`	`+## apijson支持字段 .keyword`
`66`	`70`
`67`	`71`	```
`68`	`72`	`{`
`@@ -81,7 +85,7 @@`
`81`	`85`
`82`	`86`
`83`	`87`
`84`		`-## 4、示例`
	`88`	`+## 示例`
`85`	`89`
`86`	`90`	`### 单条插入`
`87`	`91`

`‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/src/main/java/apijson/demo/DemoFunctionParser.java‎`

Lines changed: 0 additions & 32 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,43 +77,11 @@ public void pwdEncrypt(@NotNull JSONObject current, @NotNull String id, @NotNull`
`77`	`77`	`current.put(password, c_password + "_" + System.currentTimeMillis());`
`78`	`78`	`}`
`79`	`79`
`80`		`- /***`
`81`		`- * 业务表-插入不同表1:n <br/>`
`82`		`- * 业务表-批量修改不同表1:n <br/>`
`83`		`- * 测试子表前置函数调用,修改值是否成果 <br/>`
`84`		`- * user_address 表 addr字段`
`85`		`- *`
`86`		`- * @param current`
`87`		`- * @param password`
`88`		`- * @return`
`89`		`- * @throws Exception`
`90`		`- */`
`91`	`80`	`public void childFunTest(@NotNull JSONObject current, @NotNull String addr) throws Exception {`
`92`	`81`	`String c_addr = current.getString(addr);`
`93`	`82`	`current.put(addr, c_addr + "_" + System.currentTimeMillis());`
`94`	`83`	`}`
`95`	`84`
`96`		`- /***`
`97`		`- * 没有在外层事物里面`
`98`		`- *`
`99`		`- * @throws Exception`
`100`		`- */`
`101`		`-// private void insertTest() throws Exception {`
`102`		`-// String json = "{\n" + " \"User\":{\n" + " \"username\":\"test\",\n"`
`103`		`-// + " \"password\": \"233223\",\n" + " \"state\": 1\n" + " },\n" + " \"tag\": \"User\"\n"`
`104`		`-// + "}";`
`105`		`-// com.alibaba.fastjson.JSONObject requestObject = AbstractParser.parseRequest(json);`
`106`		`-// JSONResponse response = new JSONResponse(new FormParser(POST, false).parseResponse(requestObject));`
`107`		`-// log.info(response.toJSONString());`
`108`		`-// }`
`109`		`-//`
`110`		`-// private void selectTest() throws Exception {`
`111`		`-// String json = "{\n" + " \"User\": {\n" + " \"id\": \"4732209c-5785-4827-b532-5092f154fd94\"\n"`
`112`		`-// + " },\n" + " \"tag\": \"User\"\n" + "}";`
`113`		`-// com.alibaba.fastjson.JSONObject requestObject = AbstractParser.parseRequest(json);`
`114`		`-// JSONResponse response = new JSONResponse(new FormParser(GET, false).parseResponse(requestObject));`
`115`		`-// log.info(response.toJSONString());`
`116`		`-// }`
`117`	`85`
`118`	`86`	`public void removeKeys(@NotNull JSONObject current, String keys) {`
`119`	`87`	`String[] ks = StringUtil.split(keys, ";"); // 用分号 ; 分割`

`‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/src/main/java/apijson/demo/DynamicJdbcDataSource.java‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@`
`40`	`40`	`* 1、应用启动添加数据源`
`41`	`41`	`* 2、页面动态添加数据源(数据库存储数据源信息)`
`42`	`42`	`*`
`43`		`- * @author xy`
`44`	`43`	`*`
`45`	`44`	`*/`
`46`	`45`	`@Data`

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 2f97c8c

File tree

4 files changed

4 files changed

`‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/README.md‎`

`‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/src/main/java/apijson/demo/DemoFunctionParser.java‎`

`‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/src/main/java/apijson/demo/DynamicJdbcDataSource.java‎`

`‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/src/main/java/apijson/demo/ElasticSearchSqlTest.java‎`

0 commit comments