From a61be77c417f7cf370d6d3293a15a050a532b27d Mon Sep 17 00:00:00 2001 From: Kimi Liu <839536@qq.com> Date: Sun, 3 Jul 2022 08:00:40 +0800 Subject: [PATCH] bug fix and add method --- pom.xml | 22 +++++++++--------- src/main/java/org/aoju/lancia/Browser.java | 2 +- src/main/java/org/aoju/lancia/Page.java | 2 +- src/main/java/org/aoju/lancia/Variables.java | 3 ++- .../aoju/lancia/kernel/browser/Runner.java | 2 +- .../org/aoju/lancia/kernel/page/DOMWorld.java | 2 +- .../aoju/lancia/kernel/page/FrameManager.java | 2 +- .../lancia/kernel/page/LifecycleWatcher.java | 2 +- .../org/aoju/lancia/kernel/page/Request.java | 23 +++++++++++++++++-- .../org/aoju/lancia/kernel/page/Worker.java | 2 +- .../aoju/lancia/launch/ChromeLauncher.java | 2 +- .../org/aoju/lancia/worker/CDPSession.java | 2 +- .../org/aoju/lancia/worker/Connection.java | 2 +- .../aoju/lancia/worker/SocketTransport.java | 2 +- .../aoju/lancia/worker/TransportFactory.java | 2 +- 15 files changed, 46 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 139c56d..5f2a515 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.aoju lancia - 1.3.0 + 1.3.1 jar ${project.artifactId} @@ -41,11 +41,11 @@ UTF-8 UTF-8 - 1.8 - 6.3.1 - 5.9.0 - 1.2.3 - 1.2.76 + 17 + 6.5.2 + 5.12.1 + 1.2.11 + 1.2.83 @@ -86,7 +86,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 ${project.compiler.version} ${project.compiler.version} @@ -95,7 +95,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.4.0 attach-javadocs @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.0 + 3.2.1 attach-sources @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sonatype-nexus-staging @@ -156,7 +156,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 true sonatype-nexus-staging diff --git a/src/main/java/org/aoju/lancia/Browser.java b/src/main/java/org/aoju/lancia/Browser.java index 17095b0..9cb19bd 100644 --- a/src/main/java/org/aoju/lancia/Browser.java +++ b/src/main/java/org/aoju/lancia/Browser.java @@ -28,7 +28,7 @@ import com.alibaba.fastjson.JSONObject; import org.aoju.bus.core.lang.Assert; import org.aoju.bus.core.lang.Normal; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.core.toolkit.CollKit; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.lancia.kernel.browser.Context; diff --git a/src/main/java/org/aoju/lancia/Page.java b/src/main/java/org/aoju/lancia/Page.java index 7553518..0bd203e 100644 --- a/src/main/java/org/aoju/lancia/Page.java +++ b/src/main/java/org/aoju/lancia/Page.java @@ -31,7 +31,7 @@ import com.alibaba.fastjson.TypeReference; import org.aoju.bus.core.lang.Assert; import org.aoju.bus.core.lang.Normal; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.core.toolkit.CollKit; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.lancia.kernel.browser.Context; diff --git a/src/main/java/org/aoju/lancia/Variables.java b/src/main/java/org/aoju/lancia/Variables.java index a7eca06..e5c0b07 100644 --- a/src/main/java/org/aoju/lancia/Variables.java +++ b/src/main/java/org/aoju/lancia/Variables.java @@ -80,7 +80,8 @@ public class Variables { "/Applications/Chromium.app/Contents/MacOS/Chromium", "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome", "/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary", - "C:/Program Files (x86)/Google/Chrome/Application/chrome.exe" + "C:/Program Files (x86)/Google/Chrome/Application/chrome.exe", + "C:/Program Files/Google/Chrome/Application/chrome.exe" }; /** * 谷歌浏览器默认启动参数 diff --git a/src/main/java/org/aoju/lancia/kernel/browser/Runner.java b/src/main/java/org/aoju/lancia/kernel/browser/Runner.java index ca52876..4b7c6a7 100644 --- a/src/main/java/org/aoju/lancia/kernel/browser/Runner.java +++ b/src/main/java/org/aoju/lancia/kernel/browser/Runner.java @@ -26,7 +26,7 @@ package org.aoju.lancia.kernel.browser; import org.aoju.bus.core.lang.Normal; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.core.toolkit.IoKit; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.bus.health.Platform; diff --git a/src/main/java/org/aoju/lancia/kernel/page/DOMWorld.java b/src/main/java/org/aoju/lancia/kernel/page/DOMWorld.java index 8a42a3a..dc156fb 100644 --- a/src/main/java/org/aoju/lancia/kernel/page/DOMWorld.java +++ b/src/main/java/org/aoju/lancia/kernel/page/DOMWorld.java @@ -28,7 +28,7 @@ import org.aoju.bus.core.lang.Assert; import org.aoju.bus.core.lang.Charset; import org.aoju.bus.core.lang.Normal; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.core.toolkit.CollKit; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.lancia.Builder; diff --git a/src/main/java/org/aoju/lancia/kernel/page/FrameManager.java b/src/main/java/org/aoju/lancia/kernel/page/FrameManager.java index 0a57ba0..3b32567 100644 --- a/src/main/java/org/aoju/lancia/kernel/page/FrameManager.java +++ b/src/main/java/org/aoju/lancia/kernel/page/FrameManager.java @@ -29,7 +29,7 @@ import com.alibaba.fastjson.JSONObject; import org.aoju.bus.core.lang.Assert; import org.aoju.bus.core.lang.Normal; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.core.toolkit.CollKit; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.bus.logger.Logger; diff --git a/src/main/java/org/aoju/lancia/kernel/page/LifecycleWatcher.java b/src/main/java/org/aoju/lancia/kernel/page/LifecycleWatcher.java index 4835443..acca472 100644 --- a/src/main/java/org/aoju/lancia/kernel/page/LifecycleWatcher.java +++ b/src/main/java/org/aoju/lancia/kernel/page/LifecycleWatcher.java @@ -25,7 +25,7 @@ ********************************************************************************/ package org.aoju.lancia.kernel.page; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.core.toolkit.CollKit; import org.aoju.lancia.Builder; import org.aoju.lancia.Variables; diff --git a/src/main/java/org/aoju/lancia/kernel/page/Request.java b/src/main/java/org/aoju/lancia/kernel/page/Request.java index 98f44ca..b385e44 100644 --- a/src/main/java/org/aoju/lancia/kernel/page/Request.java +++ b/src/main/java/org/aoju/lancia/kernel/page/Request.java @@ -231,7 +231,7 @@ public void continueRequest() { } /** - * 自定义响应 + * 自定义响应, 默认对响应体做base64解码 * * @param status 响应状态 * @param headers 响应头 @@ -240,6 +240,20 @@ public void continueRequest() { * @return Future */ public JSONObject respond(int status, List headers, String contentType, String body) { + return respond(status, headers, contentType, body, true); + } + + /** + * 自定义响应 + * + * @param status 响应状态 + * @param headers 响应头 + * @param contentType contentType + * @param body 响应体 + * @param needBase64Decode 自定义响应体是否需要Base64解码 + * @return Future + */ + public JSONObject respond(int status, List headers, String contentType, String body, boolean needBase64Decode) { if (url().startsWith("data:")) { return null; } @@ -274,7 +288,12 @@ public JSONObject respond(int status, List headers, String contentT params.put("responsePhrase", STATUS_TEXTS.get(status)); params.put("responseHeaders", headersArray(responseHeaders)); if (responseBody != null) { - params.put("body", Base64.getDecoder().decode(responseBody)); + if (needBase64Decode) { + // 设置自定义响应体时，如果body时base64，使用兼容MIME的工具类处理 + params.put("body", Base64.getDecoder().decode(responseBody)); + } else { + params.put("body", responseBody); + } } return client.send("Fetch.fulfillRequest", params, true); } diff --git a/src/main/java/org/aoju/lancia/kernel/page/Worker.java b/src/main/java/org/aoju/lancia/kernel/page/Worker.java index 2136cb5..864cfff 100644 --- a/src/main/java/org/aoju/lancia/kernel/page/Worker.java +++ b/src/main/java/org/aoju/lancia/kernel/page/Worker.java @@ -27,7 +27,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.lancia.Variables; import org.aoju.lancia.nimble.runtime.ConsoleCalledPayload; import org.aoju.lancia.nimble.runtime.ExceptionDetails; diff --git a/src/main/java/org/aoju/lancia/launch/ChromeLauncher.java b/src/main/java/org/aoju/lancia/launch/ChromeLauncher.java index 1949ab2..b8c8f54 100644 --- a/src/main/java/org/aoju/lancia/launch/ChromeLauncher.java +++ b/src/main/java/org/aoju/lancia/launch/ChromeLauncher.java @@ -30,7 +30,7 @@ import com.alibaba.fastjson.TypeReference; import org.aoju.bus.core.lang.Http; import org.aoju.bus.core.lang.Normal; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.core.toolkit.CollKit; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.bus.logger.Logger; diff --git a/src/main/java/org/aoju/lancia/worker/CDPSession.java b/src/main/java/org/aoju/lancia/worker/CDPSession.java index c4b66ad..05b36aa 100644 --- a/src/main/java/org/aoju/lancia/worker/CDPSession.java +++ b/src/main/java/org/aoju/lancia/worker/CDPSession.java @@ -26,7 +26,7 @@ package org.aoju.lancia.worker; import com.alibaba.fastjson.JSONObject; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.lancia.Builder; import org.aoju.lancia.Variables; diff --git a/src/main/java/org/aoju/lancia/worker/Connection.java b/src/main/java/org/aoju/lancia/worker/Connection.java index dfc502d..a3d0874 100644 --- a/src/main/java/org/aoju/lancia/worker/Connection.java +++ b/src/main/java/org/aoju/lancia/worker/Connection.java @@ -27,7 +27,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.bus.logger.Logger; import org.aoju.lancia.Builder; diff --git a/src/main/java/org/aoju/lancia/worker/SocketTransport.java b/src/main/java/org/aoju/lancia/worker/SocketTransport.java index 45737d4..5d207af 100644 --- a/src/main/java/org/aoju/lancia/worker/SocketTransport.java +++ b/src/main/java/org/aoju/lancia/worker/SocketTransport.java @@ -30,7 +30,7 @@ import org.aoju.bus.core.lang.Header; import org.aoju.bus.core.lang.Normal; import org.aoju.bus.core.lang.Symbol; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.core.toolkit.BufferKit; import org.aoju.bus.core.toolkit.RandomKit; import org.aoju.bus.logger.Logger; diff --git a/src/main/java/org/aoju/lancia/worker/TransportFactory.java b/src/main/java/org/aoju/lancia/worker/TransportFactory.java index 657ab9c..853e189 100644 --- a/src/main/java/org/aoju/lancia/worker/TransportFactory.java +++ b/src/main/java/org/aoju/lancia/worker/TransportFactory.java @@ -25,7 +25,7 @@ ********************************************************************************/ package org.aoju.lancia.worker; -import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.exception.InstrumentException; import org.aoju.bus.logger.Logger; /**