diff --git a/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java index 329ccff92..a0f2b7ebe 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java @@ -115,7 +115,8 @@ public class Spider extends com.github.catvod.crawler.Spider { @Override public Object[] proxy(Map params) throws Exception { - return "catvod".equals(params.get("from")) ? proxy2(params) : proxy1(params); + if ("catvod".equals(params.get("from"))) return proxy2(params); + else return submit(() -> proxy1(params)).get(); } @Override @@ -204,8 +205,8 @@ public class Spider extends com.github.catvod.crawler.Spider { } private Object[] proxy1(Map params) throws Exception { - JSObject obj = submit(() -> JSUtil.toObject(ctx, params)).get(); - JSONArray array = submit(() -> new JSONArray(((JSArray) (jsObject.getJSFunction("proxy").call(obj))).stringify())).get(); + JSObject obj = JSUtil.toObject(ctx, params); + JSONArray array = new JSONArray(((JSArray) jsObject.getJSFunction("proxy").call(obj)).stringify()); Map headers = array.length() > 3 ? Json.toMap(array.optString(3)) : null; boolean base64 = array.length() > 4 && array.optInt(4) == 1; Object[] result = new Object[4];