add 1.4.13.dev

1. add rest header

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.4.12</version>
+    <version>1.4.13.dev</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.4.12</version>
+        <version>1.4.13.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-id-generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.4.12</version>
+        <version>1.4.13.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-security-jwt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.4.12</version>
+        <version>1.4.13.dev</version>
     </parent>
 
     <artifactId>springboot-starter-security-jwt</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.4.12</version>
+        <version>1.4.13.dev</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/HttpClient.java

@@ -14,18 +14,22 @@
 import java.net.URI;
 
 @Slf4j
-class HttpClient {
+public class HttpClient {
 
     private final RestTemplate restTemplate;
 
     private final String baseUrl;
 
+    public HttpClient(String baseUrl) {
+        this(null,baseUrl);
+    }
+
     public HttpClient(RestApiProperties properties, String baseUrl) {
         this.baseUrl = baseUrl;
         this.restTemplate = RestTemplateContext.getInstance().getRestTemplate();
         SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
         requestFactory.setConnectTimeout(3000);
-        if(properties!=null) {
+        if (properties != null) {
             if (properties.isEnableProxy()) {
                 log.info("enable proxy {}//:{}:{}", properties.getProxyType(), properties.getProxyHost(), properties.getProxyPort());
                 requestFactory.setProxy(new Proxy(properties.getProxyType(),
@@ -37,30 +41,35 @@ public HttpClient(RestApiProperties properties, String baseUrl) {
 
 
     private String buildUrl(String api) {
-        return baseUrl+api;
+        return baseUrl + api;
     }
 
     public String post(String api, JSON jsonObject) {
-        HttpHeaders headers = new HttpHeaders();
+        return post(api, new HttpHeaders(), jsonObject);
+    }
+
+    public String post(String api, HttpHeaders headers, JSON jsonObject) {
         headers.setContentType(MediaType.APPLICATION_JSON);
         String url = buildUrl(api);
         HttpEntity<String> httpEntity = new HttpEntity<>(jsonObject.toString(), headers);
         ResponseEntity<String> httpResponse = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
         return httpResponse.getBody();
     }
 
-
-    public String get(String api, MultiValueMap<String, String> uriVariables) {
-        HttpHeaders headers = new HttpHeaders();
+    public String get(String api, HttpHeaders headers, MultiValueMap<String, String> uriVariables) {
         headers.setContentType(MediaType.APPLICATION_JSON);
         String url = buildUrl(api);
         UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromHttpUrl(url);
-        if(uriVariables!=null){
+        if (uriVariables != null) {
             uriComponentsBuilder = uriComponentsBuilder.queryParams(uriVariables);
         }
         URI uri = uriComponentsBuilder.build().toUri();
         HttpEntity<String> httpEntity = new HttpEntity<>(headers);
         ResponseEntity<String> httpResponse = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, String.class);
         return httpResponse.getBody();
     }
+
+    public String get(String api, MultiValueMap<String, String> uriVariables) {
+        return get(api, new HttpHeaders(), uriVariables);
+    }
 }

springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/RestClient.java

@@ -5,6 +5,7 @@
 import com.codingapi.springboot.framework.rest.param.ApiPostParamBuilder;
 import com.codingapi.springboot.framework.rest.properties.RestApiProperties;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
 
 @Slf4j
 public class RestClient {
@@ -24,52 +25,56 @@ public RestClient(String baseUrl) {
     }
 
     private String _get(String api, ApiGetParamBuilder paramBuilder) {
-        return httpClient.get(api, paramBuilder!=null?paramBuilder.build():null);
+        return _get(api,new HttpHeaders(),paramBuilder);
     }
 
-    public String get(String api, ApiGetParamBuilder paramBuilder) {
+    private String _get(String api,HttpHeaders headers, ApiGetParamBuilder paramBuilder) {
+        return httpClient.get(api, headers,paramBuilder!=null?paramBuilder.build():null);
+    }
+
+    public String get(String api,HttpHeaders headers, ApiGetParamBuilder paramBuilder) {
         for(int i=0; i< RETRY_COUNT; i++){
             try {
-                return _get(api, paramBuilder);
+                return _get(api,headers, paramBuilder);
             }catch (Exception e){
                 log.warn("api:{},error:{}",api,e.getMessage());
                 sleep();
             }
         }
         return EMPTY;
     }
+    public String get(String api, ApiGetParamBuilder paramBuilder) {
+        return get(api,new HttpHeaders(),paramBuilder);
+    }
 
     public String get(String api) {
-        return get(api,null);
+        return get(api,new HttpHeaders(),null);
     }
 
-    private String _post(String api, ApiPostParamBuilder paramBuilder) {
-        return _post(api, paramBuilder.build());
+    public String get(String api,HttpHeaders headers) {
+        return get(api,headers,null);
     }
 
-
     private String _post(String api, JSONObject requestBody) {
-        return httpClient.post(api, requestBody);
+        return _post(api,new HttpHeaders(),requestBody);
     }
 
+    private String _post(String api, HttpHeaders headers, JSONObject requestBody) {
+        return httpClient.post(api,headers, requestBody);
+    }
 
     public String post(String api, JSONObject requestBody) {
-        for (int i=0;i< RETRY_COUNT;i++){
-            try {
-                return _post(api, requestBody);
-            }catch (Exception e){
-                log.warn("api:{},error:{}",api,e.getMessage());
-                sleep();
-            }
-        }
-        return EMPTY;
+        return post(api,new HttpHeaders(),requestBody);
     }
 
-
     public String post(String api, ApiPostParamBuilder paramBuilder) {
+        return post(api,new HttpHeaders(),paramBuilder.build());
+    }
+
+    public String post(String api,HttpHeaders headers, JSONObject requestBody) {
         for (int i=0;i< RETRY_COUNT;i++){
             try {
-                return _post(api, paramBuilder);
+                return _post(api, headers, requestBody);
             }catch (Exception e){
                 log.warn("api:{},error:{}",api,e.getMessage());
                 sleep();
@@ -78,6 +83,10 @@ public String post(String api, ApiPostParamBuilder paramBuilder) {
         return EMPTY;
     }
 
+    public String post(String api,HttpHeaders headers, ApiPostParamBuilder paramBuilder) {
+       return post(api, headers, paramBuilder.build());
+    }
+
 
     private void sleep(){
         try {