#48

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.8.3</version>
+    <version>2.8.4</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>2.8.3</version>
+        <version>2.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.8.3</version>
+        <version>2.8.4</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.8.3</version>
+        <version>2.8.4</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/Filter.java

@@ -25,7 +25,7 @@ public Filter(String key, Object... value) {
     }
 
     public Filter(String key, Filter... value) {
-        this(key, null,  value);
+        this(key, null, value);
     }
 
     public static Filter as(String key, Relation relation, Object... value) {

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java

@@ -16,6 +16,7 @@
 import java.util.Base64;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * HttpServletRequest 请求参数解析成 PageRequest对象
@@ -211,15 +212,17 @@ public PageRequest toPageRequest(Class<?> clazz) {
                 for (String key : jsonObject.keySet()) {
                     JSONArray value = jsonObject.getJSONArray(key);
                     if (value != null && !value.isEmpty()) {
-                        List<String> values = value.stream().map(Object::toString).toList();
+                        List<String> values = value.stream().map(Object::toString).collect(Collectors.toList());
                         content.addFilter(key, values);
                     }
                 }
             }
         }
 
+        Enumeration<String> enumeration = request.getParameterNames();
 
-        request.getParameterNames().asIterator().forEachRemaining(key -> {
+        while (enumeration.hasMoreElements()){
+            String key = enumeration.nextElement();
             if (!removeKeys.contains(key)) {
                 String value = request.getParameter(key);
                 if (StringUtils.hasLength(value)) {
@@ -238,8 +241,7 @@ public PageRequest toPageRequest(Class<?> clazz) {
                     }
                 }
             }
-        });
-
+        }
         return pageRequest;
     }
 

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

@@ -5,6 +5,7 @@
 import com.codingapi.springboot.framework.rest.properties.HttpProxyProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpHeaders;
 
 import java.net.Proxy;
 
@@ -21,14 +22,21 @@ void okxTest() {
         proxyProperties.setProxyType(Proxy.Type.HTTP);
         proxyProperties.setProxyHost("127.0.0.1");
         proxyProperties.setProxyPort(7890);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("x-simulated-trading","1");
+        headers.set("User-Agent", "Application");
         RestClient restClient = new RestClient(proxyProperties,baseUrl,5,"{}",null,null);
-        String response = restClient.get("api/v5/market/candles", RestParam.create()
-                .add("instId","BTC-USDT")
-                .add("bar","1m")
-                .add("limit","300")
+        String response = restClient.get(
+                "api/v5/market/candles",
+                headers,
+                RestParam.create()
+                    .add("instId","BTC-USDT")
+                    .add("bar","1m")
+                    .add("limit","300")
         );
         log.info("response:{}",response);
         JSONObject jsonObject = JSONObject.parseObject(response);
         assertEquals(jsonObject.getJSONArray("data").size(),300);
     }
-}
+}