diff --git a/example/example-app/example-app-cmd-domain/pom.xml b/example/example-app/example-app-cmd-domain/pom.xml index f9f12483..8f8e3907 100644 --- a/example/example-app/example-app-cmd-domain/pom.xml +++ b/example/example-app/example-app-cmd-domain/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-app - 3.4.19 + 3.4.20 ../pom.xml diff --git a/example/example-app/example-app-cmd-meta/pom.xml b/example/example-app/example-app-cmd-meta/pom.xml index 685e82dd..e45976bd 100644 --- a/example/example-app/example-app-cmd-meta/pom.xml +++ b/example/example-app/example-app-cmd-meta/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-app - 3.4.19 + 3.4.20 ../pom.xml diff --git a/example/example-app/example-app-query/pom.xml b/example/example-app/example-app-query/pom.xml index 0e9a3851..2ef5e9c6 100644 --- a/example/example-app/example-app-query/pom.xml +++ b/example/example-app/example-app-query/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-app - 3.4.19 + 3.4.20 ../pom.xml diff --git a/example/example-app/pom.xml b/example/example-app/pom.xml index e2625528..2ecec0d3 100644 --- a/example/example-app/pom.xml +++ b/example/example-app/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-example - 3.4.19 + 3.4.20 ../pom.xml pom diff --git a/example/example-domain/example-domain-leave/pom.xml b/example/example-domain/example-domain-leave/pom.xml index 4876a6a4..9c5efe8a 100644 --- a/example/example-domain/example-domain-leave/pom.xml +++ b/example/example-domain/example-domain-leave/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-domain - 3.4.19 + 3.4.20 ../pom.xml diff --git a/example/example-domain/example-domain-user/pom.xml b/example/example-domain/example-domain-user/pom.xml index 645fde85..dabbc0ce 100644 --- a/example/example-domain/example-domain-user/pom.xml +++ b/example/example-domain/example-domain-user/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-domain - 3.4.19 + 3.4.20 ../pom.xml diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml index 2de1ad46..0f1edc12 100644 --- a/example/example-domain/pom.xml +++ b/example/example-domain/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot springboot-example - 3.4.19 + 3.4.20 ../pom.xml 4.0.0 diff --git a/example/example-infra/example-infra-flow/pom.xml b/example/example-infra/example-infra-flow/pom.xml index bc125448..6613d337 100644 --- a/example/example-infra/example-infra-flow/pom.xml +++ b/example/example-infra/example-infra-flow/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot example-infra - 3.4.19 + 3.4.20 ../pom.xml diff --git a/example/example-infra/example-infra-jpa/pom.xml b/example/example-infra/example-infra-jpa/pom.xml index 02bee0bf..f0be2c54 100644 --- a/example/example-infra/example-infra-jpa/pom.xml +++ b/example/example-infra/example-infra-jpa/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot example-infra - 3.4.19 + 3.4.20 ../pom.xml diff --git a/example/example-infra/example-infra-security/pom.xml b/example/example-infra/example-infra-security/pom.xml index 76e81571..54ff3771 100644 --- a/example/example-infra/example-infra-security/pom.xml +++ b/example/example-infra/example-infra-security/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-infra - 3.4.19 + 3.4.20 ../pom.xml diff --git a/example/example-infra/pom.xml b/example/example-infra/pom.xml index 393b46bb..290856e8 100644 --- a/example/example-infra/pom.xml +++ b/example/example-infra/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-example - 3.4.19 + 3.4.20 ../pom.xml pom diff --git a/example/example-interface/pom.xml b/example/example-interface/pom.xml index 4c15b78f..3270d106 100644 --- a/example/example-interface/pom.xml +++ b/example/example-interface/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-example - 3.4.19 + 3.4.20 example-interface diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml index fe194286..78714d92 100644 --- a/example/example-server/pom.xml +++ b/example/example-server/pom.xml @@ -5,7 +5,7 @@ springboot-example com.codingapi.springboot - 3.4.19 + 3.4.20 4.0.0 diff --git a/example/pom.xml b/example/pom.xml index 7b788eff..010a397d 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -19,7 +19,7 @@ springboot-example - 3.4.19 + 3.4.20 springboot-example springboot-example project for Spring Boot diff --git a/pom.xml b/pom.xml index a0bf38eb..3523a56e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ com.codingapi.springboot springboot-parent - 3.4.19 + 3.4.20 https://github.com/codingapi/springboot-framewrok springboot-parent diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml index 22e5952c..3431426b 100644 --- a/springboot-starter-data-authorization/pom.xml +++ b/springboot-starter-data-authorization/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-parent - 3.4.19 + 3.4.20 springboot-starter-data-authorization diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml index 7f8b67c6..c98127a8 100644 --- a/springboot-starter-data-fast/pom.xml +++ b/springboot-starter-data-fast/pom.xml @@ -5,7 +5,7 @@ springboot-parent com.codingapi.springboot - 3.4.19 + 3.4.20 4.0.0 diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml index f64c8a30..8e977bd5 100644 --- a/springboot-starter-flow/pom.xml +++ b/springboot-starter-flow/pom.xml @@ -6,7 +6,7 @@ springboot-parent com.codingapi.springboot - 3.4.19 + 3.4.20 springboot-starter-flow diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml index 71896343..3d341dd7 100644 --- a/springboot-starter-security/pom.xml +++ b/springboot-starter-security/pom.xml @@ -6,7 +6,7 @@ springboot-parent com.codingapi.springboot - 3.4.19 + 3.4.20 springboot-starter-security diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml index 88baa57b..d9d98d98 100644 --- a/springboot-starter/pom.xml +++ b/springboot-starter/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot springboot-parent - 3.4.19 + 3.4.20 springboot-starter diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/HttpClient.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/HttpClient.java index 4484b032..b91377b2 100644 --- a/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/HttpClient.java +++ b/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/HttpClient.java @@ -31,7 +31,7 @@ public String post(String url, HttpHeaders headers, JSON jsonObject) { return httpRequest.getPostRequest(url, headers, jsonObject).execute(); } - public String post(String url, HttpHeaders headers, MultiValueMap formData) { + public String post(String url, HttpHeaders headers, MultiValueMap formData) { return httpRequest.getPostRequest(url, headers, formData).execute(); } diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/HttpRequest.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/HttpRequest.java index f9ea8a71..025571dc 100644 --- a/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/HttpRequest.java +++ b/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/HttpRequest.java @@ -129,8 +129,8 @@ public Request getPostRequest(String url, HttpHeaders headers, JSON jsonObject) }; } - public Request getPostRequest(String url, HttpHeaders headers, MultiValueMap formData) { - HttpEntity> httpEntity = new HttpEntity<>(formData, headers); + public Request getPostRequest(String url, HttpHeaders headers, MultiValueMap formData) { + HttpEntity> httpEntity = new HttpEntity<>(formData, headers); String requestUrl = requestHandler.handler(this,url ,HttpMethod.POST,headers,httpEntity); return () -> { ResponseEntity httpResponse = restTemplate.exchange(requestUrl, HttpMethod.POST, httpEntity, String.class); diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/RestClient.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/RestClient.java index 7aa14d62..61621744 100644 --- a/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/RestClient.java +++ b/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/RestClient.java @@ -62,7 +62,7 @@ public String get(String api, HttpHeaders headers, MultiValueMap } public String get(String api, HttpHeaders headers, RestParam paramBuilder) { - return get(api, headers,paramBuilder!=null?paramBuilder.toFormRequest():null); + return get(api, headers,paramBuilder!=null?paramBuilder.toGetRequest():null); } public String get(String api, RestParam paramBuilder) { diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/SessionClient.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/SessionClient.java index ac4dc72a..24eab5f7 100644 --- a/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/SessionClient.java +++ b/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/SessionClient.java @@ -92,11 +92,11 @@ public String getHtml(String url){ public String getHtml(String url, RestParam restParam){ httpHeaders.setContentType(MediaType.APPLICATION_FORM_URLENCODED); - return httpClient.get(url,httpHeaders,restParam!=null?restParam.toFormRequest():null); + return httpClient.get(url,httpHeaders,restParam!=null?restParam.toGetRequest():null); } public String getJson(String url, RestParam restParam){ httpHeaders.setContentType(MediaType.APPLICATION_JSON); - return httpClient.get(url,httpHeaders,restParam!=null?restParam.toFormRequest():null); + return httpClient.get(url,httpHeaders,restParam!=null?restParam.toGetRequest():null); } } diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/param/RestParam.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/param/RestParam.java index 926e9d69..40b43c91 100644 --- a/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/param/RestParam.java +++ b/springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/param/RestParam.java @@ -6,11 +6,13 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; public class RestParam { private final JSONObject jsonBody; - private final MultiValueMap mapBody; + private final MultiValueMap mapBody; private RestParam() { this.jsonBody = new JSONObject(); @@ -42,10 +44,24 @@ public JSONObject toJsonRequest() { return jsonBody; } - public MultiValueMap toFormRequest() { + public MultiValueMap toFormRequest() { return mapBody; } + public MultiValueMap toGetRequest(){ + MultiValueMap request = new LinkedMultiValueMap<>(); + for(String key: mapBody.keySet()){ + List objectList = mapBody.get(key); + List stringList = new ArrayList<>(); + for (Object object:objectList){ + stringList.add(object.toString()); + } + request.put(key,stringList); + } + return request; + } + + public RestParam add(String key, Object value) { return add(key, value, true); } diff --git a/springboot-starter/src/main/resources/banner.txt b/springboot-starter/src/main/resources/banner.txt index 8de2acda..4cbc0603 100644 --- a/springboot-starter/src/main/resources/banner.txt +++ b/springboot-starter/src/main/resources/banner.txt @@ -1,4 +1,4 @@ ------------------------------------------------------ -CodingApi SpringBoot-Starter 3.4.19 +CodingApi SpringBoot-Starter 3.4.20 springboot version (${spring-boot.version}) ------------------------------------------------------