pull/402/head
FongMi 2 years ago
parent 1564523fcd
commit b02c9087fe
  1. 4
      quickjs/src/main/java/com/fongmi/quickjs/method/Global.java
  2. 7
      quickjs/src/main/java/com/fongmi/quickjs/utils/Connect.java
  3. 4
      quickjs/src/main/java/com/fongmi/quickjs/utils/Crypto.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;
}

@ -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("", null);
}
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<String, List<String>> entry : res.headers().toMultimap().entrySet()) {
if (entry.getValue().size() == 1) object.setProperty(entry.getKey(), entry.getValue().get(0));

@ -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();

Loading…
Cancel
Save