fix post sign

src/main/java/com/common/toolbox/app_utils/HeadersUtil.java

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import okhttp3.FormBody;
 import okhttp3.Request;
 
 /**
@@ -43,19 +44,28 @@ public class HeadersUtil {
                 }
                 params = getParameter(paramsKey, paramsMap);
             } else if (TextUtils.equals(request.method(), "POST")) {
-                List<String> paramsKey = new ArrayList<>(request.headers().names());
-                HashMap<String, String> paramsMap = new HashMap<>();
-                for (String key : paramsKey) {
-                    paramsMap.put(key, request.headers().get(key));
+                if (request.body() instanceof FormBody) {
+                    FormBody body = (FormBody) request.body();
+                    List<String> paramsKey = new ArrayList();
+                    HashMap<String, String> paramsMap = new HashMap<>();
+                    for (int i = 0; i < body.size(); i++) {
+                        paramsKey.add(body.encodedName(i));
+                        paramsMap.put(body.encodedName(i), body.encodedValue(i));
+                    }
+                    params = getParameter(paramsKey, paramsMap);
                 }
-                params = getParameter(paramsKey, paramsMap);
             }
             String sdDeviceSign = "";
             if (!TextUtils.isEmpty(deviceSign) && !TextUtils.isEmpty(sdSign)) {
-                sdDeviceSign = "deviceSign=" + deviceSign + "&sdSign=" + sdSign + "&";
+                sdDeviceSign = "deviceSign=" + deviceSign + "&sdSign=" + sdSign;
+            }
+            if (!TextUtils.isEmpty(sdDeviceSign) && !TextUtils.isEmpty(params)) {
+                params = "&" + params;
             }
             sign = sdDeviceSign + params + signKey + random;
+//            System.out.println("http sign:" + sign);
             builder.addHeader("X-APP-SIGN", MD5Helper.md5Hex(sign));
+//            System.out.println("http sign md5Hex:" + MD5Helper.md5Hex(sign));
             builder.addHeader("X-APP-RANDOM", random);
             builder.addHeader("X-DEVICE-SIGN", deviceSign);
             builder.addHeader("X-SD-SIGN", sdSign);