todo

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.1.5</version>
+    <version>2.1.6</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.1.5</version>
+        <version>2.1.6</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>2.1.5</version>
+        <version>2.1.6</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>2.1.5</version>
+        <version>2.1.6</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>2.1.5</version>
+        <version>2.1.6</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

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

@@ -2,7 +2,7 @@
 
 public interface RestParam {
 
-    default RestParamBuilder getParameters() {
+    default RestParamBuilder toParameters() {
         return RestParamBuilder.parser(this);
     }
 

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

@@ -2,11 +2,9 @@
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.SneakyThrows;
-import org.springframework.beans.BeanUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-import java.beans.PropertyDescriptor;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
@@ -26,13 +24,17 @@ public static RestParamBuilder create() {
 
     @SneakyThrows
     public static RestParamBuilder parser(Object obj) {
-        PropertyDescriptor[] descriptors =  BeanUtils.getPropertyDescriptors(obj.getClass());
         RestParamBuilder builder = create();
-        for (PropertyDescriptor descriptor : descriptors) {
-            String name = descriptor.getName();
-            Object value = BeanUtils.getPropertyDescriptor(obj.getClass(), name);
-            if (value != null) {
-                builder.add(name, value);
+        JSONObject object = (JSONObject) JSONObject.toJSON(obj);
+        for (String key : object.keySet()) {
+            Object value = object.getJSONObject(key);
+            if(value!=null){
+                builder.add(key, value);
+            }else {
+                value = object.getJSONArray(key);
+                if (value != null) {
+                    builder.add(key, value);
+                }
             }
         }
         return builder;
@@ -42,17 +44,17 @@ public JSONObject toJsonRequest() {
         return jsonBody;
     }
 
-    public MultiValueMap<String, String>  toFormRequest() {
+    public MultiValueMap<String, String> toFormRequest() {
         return mapBody;
     }
 
     public RestParamBuilder add(String key, Object value) {
-        return add(key, value,true);
+        return add(key, value, true);
     }
 
-    public RestParamBuilder add(String key, Object value,boolean encode) {
+    public RestParamBuilder add(String key, Object value, boolean encode) {
         String stringValue = value.toString();
-        String encodeValue = encode? URLEncoder.encode(stringValue, StandardCharsets.UTF_8):value.toString();
+        String encodeValue = encode ? URLEncoder.encode(stringValue, StandardCharsets.UTF_8) : value.toString();
         jsonBody.put(key, value);
         mapBody.add(key, encodeValue);
         return this;