Merge branch 'release/0.3.15'

pom.xml

@@ -6,9 +6,9 @@
 
     <groupId>com.tsl3060.open.extend</groupId>
     <artifactId>tsl-open-sdk-java-wanshun</artifactId>
-    <version>0.3.14</version>
+    <version>0.3.15</version>
 
-    <properties>
+    <properties> 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <hutool.version>5.8.19</hutool.version>
         <!--        日志-->
-        <logback.version>1.4.7</logback.version>
+        <logback.version>1.4.14</logback.version>
     </properties>
 
 
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15to18</artifactId>
-            <version>1.69</version>
+            <version>1.74</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.10.0</version>
+            <version>4.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>

src/main/java/com/tsl3060/open/extend/core/ApiClient.java

@@ -6,7 +6,7 @@ import cn.hutool.core.util.XmlUtil;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSONWriter;
 import com.tsl3060.open.extend.core.constant.BuildInfo;
 import com.tsl3060.open.extend.core.exception.ApiException;
 import com.tsl3060.open.extend.core.exception.BadResourceException;
@@ -132,7 +132,7 @@ public class ApiClient {
         ISecure iSecure = getSecureTool().getSecure(apiRequest.getSignType());
         String signStr = iSecure.requestSign(apiRequest);
         apiRequest.setSign(signStr);
-        String fBody = JSON.toJSONString(apiRequest);
+        String fBody = JSON.toJSONString(apiRequest, JSONWriter.Feature.WriteNullStringAsEmpty, JSONWriter.Feature.WriteNullListAsEmpty);
         log.debug(">>> {}", fBody);
         RequestBody requestBody = RequestBody.create(fBody, contentType);
         /**

src/main/java/com/tsl3060/open/extend/core/payload/UserRelationPayload.java

@@ -0,0 +1,41 @@
+package com.tsl3060.open.extend.core.payload;
+
+import com.tsl3060.open.extend.core.IApiRequest;
+
+import java.util.List;
+
+public class UserRelationPayload extends RequestPayload implements IApiRequest {
+    @Override
+    public String path() {
+        return "/v1/wanshun/user/relation";
+    }
+
+    private String openid;
+    private String parentId;
+    private List<String> children;
+
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public List<String> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<String> children) {
+        this.children = children;
+    }
+}

src/main/java/com/tsl3060/open/extend/core/response/UserRelationResponse.java

@@ -0,0 +1,13 @@
+package com.tsl3060.open.extend.core.response;
+
+public class UserRelationResponse {
+    private boolean result;
+
+    public boolean isResult() {
+        return result;
+    }
+
+    public void setResult(boolean result) {
+        this.result = result;
+    }
+}

src/main/java/com/tsl3060/open/extend/core/secure/RSASecure.java

@@ -1,14 +1,13 @@
 package com.tsl3060.open.extend.core.secure;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 import com.alibaba.fastjson2.JSONObject;
 import com.tsl3060.open.extend.core.*;
 
 import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.security.*;
 import java.security.spec.InvalidKeySpecException;
@@ -36,33 +35,53 @@ public class RSASecure implements ISecure {
     }
 
     private String object2LinkStr(Object ob) {
-        List<String> payloadStr = new ArrayList<>();
-        if (ob != null) {
-            JSONObject j = JSONObject.from(ob);
-            //排序
-            Set<String> _keys = j.keySet();
-            List<String> keys = _keys.stream().sorted(Comparator.naturalOrder()).collect(Collectors.toList());
-
-            for (String key : keys) {
-                if (j.get(key) != null) {
-                    Object v = j.get(key);
-                    String vx;
-                    if (v instanceof Double) {
-                        vx = String.format("%s", v);
-                    } else if (v instanceof Float) {
-                        vx = String.format("%s", v);
-                    } else if (v instanceof Boolean) {
-                        vx = String.format("%s", v);
-                    } else if (v instanceof BigDecimal) {
-                        vx = String.format("%s", v);
-                    } else {
-                        vx = String.valueOf(v);
+        if (ob == null) {
+            return "";
+        }
+        if (ob instanceof String) {
+            if (StrUtil.isEmpty(ob.toString())) {
+                return "";
+            }
+        }
+
+        JSONObject root = JSONObject.from(ob);
+        Set<String> _keys = root.keySet();
+        List<String> keys = new ArrayList<>(_keys);
+
+        List<String> keyValuePairs = new ArrayList<>();
+
+        keys.forEach(key -> {
+            Object valueNode = root.get(key);
+
+            String valueStr;
+            if (valueNode instanceof Number) {
+                valueStr = String.format("%s", valueNode);
+            } else if (valueNode instanceof Boolean) {
+                valueStr = String.format("%s", valueNode);
+            } else if (valueNode instanceof List) {
+                List<String> arrayValues = new ArrayList<>();
+                List<?> values = (List<?>) valueNode;
+                values.forEach(value -> {
+                    if (value instanceof String) {
+                        arrayValues.add(String.format("%s", value));
+                    }else{
+                        arrayValues.add(object2LinkStr(value));
                     }
-                    payloadStr.add(String.format("%s=%s", key, vx));
+                });
+
+                valueStr = String.join(",", arrayValues);
+            } else {
+                if(valueNode==null){
+                    valueNode="";
                 }
+                valueStr = String.format("%s", valueNode);
             }
-        }
-        return CollectionUtil.join(payloadStr, "&");
+            keyValuePairs.add(String.format("%s=%s",key,valueStr));
+        });
+        return keyValuePairs.stream()
+                .sorted()
+                .collect(Collectors.joining("&"));
+
     }
 
     public String sign(String content, String charset) {
@@ -110,7 +129,6 @@ public class RSASecure implements ISecure {
                 request.getTime(),
                 waitStr
         );
-        log.debug("req: {}", content);
 
         return this.sign(content, request.getCharset());