diff --git a/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/curl/CurlFormatter.kt b/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/curl/CurlFormatter.kt index 71a9cce8a..e2ced8895 100644 --- a/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/curl/CurlFormatter.kt +++ b/idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/curl/CurlFormatter.kt @@ -99,7 +99,7 @@ class CurlFormatter { .append("?") request.querys!!.forEach { param -> if (query.lastOrNull() != '?') { - query.append("&") + query.append("\\&") } query.append(param.name).append("=") param.value?.let { query.append(it) } @@ -110,6 +110,6 @@ class CurlFormatter { } private fun String.escape(): String { - return this.replace("'", "\\'") + return this.replace("\\", "\\\\").replace("'", "\\'") } } \ No newline at end of file diff --git a/idea-plugin/src/test/resources/result/com.itangcent.idea.plugin.api.export.curl.CurlFormatterTest.txt b/idea-plugin/src/test/resources/result/com.itangcent.idea.plugin.api.export.curl.CurlFormatterTest.txt index ec2011cb1..d9aace315 100644 --- a/idea-plugin/src/test/resources/result/com.itangcent.idea.plugin.api.export.curl.CurlFormatterTest.txt +++ b/idea-plugin/src/test/resources/result/com.itangcent.idea.plugin.api.export.curl.CurlFormatterTest.txt @@ -43,7 +43,7 @@ curl -X GET -H 'x-token: ' -H 'token: ' http://localhost:8080/test/header ## test query with array parameters ```bash -curl -X GET -H 'token: ' http://localhost:8080/test/arrays?string=&int=1 +curl -X GET -H 'token: ' http://localhost:8080/test/arrays?string=\&int=1 ``` --- @@ -99,7 +99,7 @@ curl -X POST -H 'Content-Type: multipart/form-data' -H 'token: ' -F 'id=' -F 'co ## return root with nested nodes ```bash -curl -X GET -H 'token: ' http://localhost:8080/test/return/root?id=&children[0].id=&children[0].code=&children[0].parent.id=&children[0].parent.code=&children[0].parent.parent={}&children[0].parent.sub[0]={}&children[0].parent.siblings[0]={}&children[0].sub[0].id=&children[0].sub[0].code=&children[0].sub[0].parent.id=&children[0].sub[0].parent.code=&children[0].sub[0].parent.parent={}&children[0].sub[0].parent.sub[0]={}&children[0].sub[0].parent.siblings[0]={}&children[0].sub[0].sub[0]={}&children[0].sub[0].siblings[0]={}&children[0].siblings[0].id=&children[0].siblings[0].code=&children[0].siblings[0].parent.id=&children[0].siblings[0].parent.code=&children[0].siblings[0].parent.parent.id=&children[0].siblings[0].parent.parent.code=&children[0].siblings[0].parent.parent.parent={}&children[0].siblings[0].parent.parent.sub[0]={}&children[0].siblings[0].parent.parent.siblings[0]={}&children[0].siblings[0].parent.sub[0]={}&children[0].siblings[0].parent.siblings[0]={}&children[0].siblings[0].sub[0].id=&children[0].siblings[0].sub[0].code=&children[0].siblings[0].sub[0].parent.id=&children[0].siblings[0].sub[0].parent.code=&children[0].siblings[0].sub[0].parent.parent={}&children[0].siblings[0].sub[0].parent.sub[0]={}&children[0].siblings[0].sub[0].parent.siblings[0]={}&children[0].siblings[0].sub[0].sub[0]={}&children[0].siblings[0].sub[0].siblings[0]={}&children[0].siblings[0].siblings[0].id=&children[0].siblings[0].siblings[0].code=&children[0].siblings[0].siblings[0].parent.id=&children[0].siblings[0].siblings[0].parent.code=&children[0].siblings[0].siblings[0].parent.parent={}&children[0].siblings[0].siblings[0].parent.sub[0]={}&children[0].siblings[0].siblings[0].parent.siblings[0]={}&children[0].siblings[0].siblings[0].sub[0]={}&children[0].siblings[0].siblings[0].siblings[0]={} +curl -X GET -H 'token: ' http://localhost:8080/test/return/root?id=\&children[0].id=\&children[0].code=\&children[0].parent.id=\&children[0].parent.code=\&children[0].parent.parent={}\&children[0].parent.sub[0]={}\&children[0].parent.siblings[0]={}\&children[0].sub[0].id=\&children[0].sub[0].code=\&children[0].sub[0].parent.id=\&children[0].sub[0].parent.code=\&children[0].sub[0].parent.parent={}\&children[0].sub[0].parent.sub[0]={}\&children[0].sub[0].parent.siblings[0]={}\&children[0].sub[0].sub[0]={}\&children[0].sub[0].siblings[0]={}\&children[0].siblings[0].id=\&children[0].siblings[0].code=\&children[0].siblings[0].parent.id=\&children[0].siblings[0].parent.code=\&children[0].siblings[0].parent.parent.id=\&children[0].siblings[0].parent.parent.code=\&children[0].siblings[0].parent.parent.parent={}\&children[0].siblings[0].parent.parent.sub[0]={}\&children[0].siblings[0].parent.parent.siblings[0]={}\&children[0].siblings[0].parent.sub[0]={}\&children[0].siblings[0].parent.siblings[0]={}\&children[0].siblings[0].sub[0].id=\&children[0].siblings[0].sub[0].code=\&children[0].siblings[0].sub[0].parent.id=\&children[0].siblings[0].sub[0].parent.code=\&children[0].siblings[0].sub[0].parent.parent={}\&children[0].siblings[0].sub[0].parent.sub[0]={}\&children[0].siblings[0].sub[0].parent.siblings[0]={}\&children[0].siblings[0].sub[0].sub[0]={}\&children[0].siblings[0].sub[0].siblings[0]={}\&children[0].siblings[0].siblings[0].id=\&children[0].siblings[0].siblings[0].code=\&children[0].siblings[0].siblings[0].parent.id=\&children[0].siblings[0].siblings[0].parent.code=\&children[0].siblings[0].siblings[0].parent.parent={}\&children[0].siblings[0].siblings[0].parent.sub[0]={}\&children[0].siblings[0].siblings[0].parent.siblings[0]={}\&children[0].siblings[0].siblings[0].sub[0]={}\&children[0].siblings[0].siblings[0].siblings[0]={} ``` --- @@ -113,7 +113,7 @@ curl -X GET -H 'token: ' http://localhost:8080/test/return/customMap?key= ## user page query ```bash -curl -X GET -H 'token: ' http://localhost:8080/test/call/page/user?size=&user.id=0&user.type=0&user.name=&user.age=0&user.sex=0&user.birthDay=&user.regtime=&users[0].id=0&users[0].type=0&users[0].name=&users[0].age=0&users[0].sex=0&users[0].birthDay=&users[0].regtime=&t.id=0&t.type=0&t.name=&t.age=0&t.sex=0&t.birthDay=&t.regtime= +curl -X GET -H 'token: ' http://localhost:8080/test/call/page/user?size=\&user.id=0\&user.type=0\&user.name=\&user.age=0\&user.sex=0\&user.birthDay=\&user.regtime=\&users[0].id=0\&users[0].type=0\&users[0].name=\&users[0].age=0\&users[0].sex=0\&users[0].birthDay=\&users[0].regtime=\&t.id=0\&t.type=0\&t.name=\&t.age=0\&t.sex=0\&t.birthDay=\&t.regtime= ``` --- @@ -134,5 +134,5 @@ curl -X POST -H 'Content-Type: multipart/form-data' -H 'token: ' -F 'size=' -F ' ## user page query with array ```bash -curl -X GET -H 'token: ' http://localhost:8080/test/call/page/user/array?id=0&type=0&name=&age=0&sex=0&birthDay=®time= +curl -X GET -H 'token: ' http://localhost:8080/test/call/page/user/array?id=0\&type=0\&name=\&age=0\&sex=0\&birthDay=\®time= ``` \ No newline at end of file