diff --git a/quickjs/src/main/java/com/fongmi/quickjs/method/Global.java b/quickjs/src/main/java/com/fongmi/quickjs/method/Global.java index 3be1acfed..2b4760a7c 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/method/Global.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/method/Global.java @@ -150,8 +150,8 @@ public class Global { @Keep @JSMethod public String md5X(String text) { - String result = Crypto.md5(text); - Logger.t("md5X").d("text:%s\nresult:\n%s" , text, result); + String result = Crypto.md5(text); + Logger.t("md5X").d("text:%s\nresult:\n%s", text, result); return result; } diff --git a/quickjs/src/main/java/com/fongmi/quickjs/utils/Connect.java b/quickjs/src/main/java/com/fongmi/quickjs/utils/Connect.java index 797260369..9c13b477c 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/utils/Connect.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/utils/Connect.java @@ -68,16 +68,11 @@ public class Connect { if (req.getData() != null && "json".equals(req.getPostType())) return getJsonBody(req); if (req.getData() != null && "form".equals(req.getPostType())) return getFormBody(req); if (req.getData() != null && "form-data".equals(req.getPostType())) return getFormDataBody(req); - if (req.getData() != null && "raw".equals(req.getPostType())) return getRawBody(req); if (req.getBody() != null && contentType != null) return RequestBody.create(req.getBody(), MediaType.get(contentType)); return RequestBody.create(new byte[0]); } private static RequestBody getJsonBody(Req req) { - return RequestBody.create(req.getData().toString(), MediaType.get("application/json")); - } - - private static RequestBody getRawBody(Req req) { return RequestBody.create(req.getData().toString(), MediaType.get("application/json; charset=utf-8")); } @@ -96,8 +91,6 @@ public class Connect { return builder.build(); } - - private static void setHeader(QuickJSContext ctx, Response res, JSObject object) { for (Map.Entry> entry : res.headers().toMultimap().entrySet()) { if (entry.getValue().size() == 1) object.setProperty(entry.getKey(), entry.getValue().get(0)); diff --git a/quickjs/src/main/java/com/fongmi/quickjs/utils/Crypto.java b/quickjs/src/main/java/com/fongmi/quickjs/utils/Crypto.java index 1ef28f03f..44357c97d 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/utils/Crypto.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/utils/Crypto.java @@ -2,6 +2,8 @@ package com.fongmi.quickjs.utils; import android.util.Base64; +import com.github.catvod.utils.Util; + import java.security.Key; import java.security.KeyFactory; import java.security.PublicKey; @@ -14,7 +16,6 @@ import java.util.Arrays; import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import com.github.catvod.utils.Util; public class Crypto { @@ -27,7 +28,6 @@ public class Crypto { } } - public static String aes(String mode, boolean encrypt, String input, boolean inBase64, String key, String iv, boolean outBase64) { try { byte[] keyBuf = key.getBytes();