fix RestClient toUrl bug

Author: xlorne

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

@@ -48,7 +48,8 @@ private String toUrl(String api) {
     }
 
     public String get(String api, HttpHeaders headers, MultiValueMap<String, String> requestParams) {
-        Request request = getGetRequest(toUrl(api), headers, requestParams);
+        String url = toUrl(api);
+        Request request = getGetRequest(url, headers, requestParams);
         for (int i = 0; i < retryCount; i++) {
             try {
                 return request.execute();
@@ -77,11 +78,11 @@ public String get(String api, HttpHeaders headers) {
     }
 
     public Request getGetRequest(String api, HttpHeaders headers, MultiValueMap<String, String> requestParams) {
-        return httpRequest.getGetRequest(toUrl(api), headers, requestParams);
+        return httpRequest.getGetRequest(api, headers, requestParams);
     }
 
     public Request getPostRequest(String api, HttpHeaders headers, JSON requestBody) {
-        return httpRequest.getPostRequest(toUrl(api), headers, requestBody);
+        return httpRequest.getPostRequest(api, headers, requestBody);
     }
 
     public String post(String api, JSON requestBody) {
@@ -93,7 +94,8 @@ public String post(String api, RestParamBuilder paramBuilder) {
     }
 
     public String post(String api, HttpHeaders headers, JSON requestBody) {
-        Request request =  getPostRequest(api, headers, requestBody);
+        String url = toUrl(api);
+        Request request =  getPostRequest(url, headers, requestBody);
         for (int i = 0; i < retryCount; i++) {
             try {
                 return request.execute();

springboot-starter/src/test/java/com/codingapi/springboot/framework/rest/RestClientTest.java

@@ -2,27 +2,33 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.codingapi.springboot.framework.rest.param.RestParamBuilder;
+import com.codingapi.springboot.framework.rest.properties.HttpProxyProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 
+import java.net.Proxy;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Slf4j
 class RestClientTest {
 
     @Test
-    void baikeTest() {
-        String baseUrl = "http://baike.baidu.com/";
-        RestClient restClient = new RestClient(baseUrl);
-        String response = restClient.get("/api/openapi/BaikeLemmaCardApi", RestParamBuilder.create()
-                .add("scope","103").add("format","json")
-                .add("appid","379020").add("bk_key","关键字")
+    void okxTest() {
+        String baseUrl = "https://www.okx.com/";
+        HttpProxyProperties proxyProperties = new HttpProxyProperties();
+        proxyProperties.setEnableProxy(true);
+        proxyProperties.setProxyType(Proxy.Type.HTTP);
+        proxyProperties.setProxyHost("127.0.0.1");
+        proxyProperties.setProxyPort(7890);
+        RestClient restClient = new RestClient(proxyProperties,baseUrl,5,"{}",null,null);
+        String response = restClient.get("api/v5/market/candles", RestParamBuilder.create()
+                .add("instId","BTC-USDT")
+                .add("bar","1m")
+                .add("limit","300")
         );
         log.info("response:{}",response);
         JSONObject jsonObject = JSONObject.parseObject(response);
-        log.info("desc:{}",jsonObject.getString("desc"));
-        assertEquals(jsonObject.getString("key"),"关键字");
-        assertTrue(response.contains("id"));
+        assertEquals(jsonObject.getJSONArray("data").size(),300);
     }
 }