bug fix and add method

aoju · Jul 3, 2022 · a61be77 · a61be77
1 parent 2ed554c
commit a61be77
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>lancia</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -41,11 +41,11 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <project.compiler.version>1.8</project.compiler.version>
-        <bus.version>6.3.1</bus.version>
-        <jna.version>5.9.0</jna.version>
-        <logback.version>1.2.3</logback.version>
-        <fastjson.version>1.2.76</fastjson.version>
+        <project.compiler.version>17</project.compiler.version>
+        <bus.version>6.5.2</bus.version>
+        <jna.version>5.12.1</jna.version>
+        <logback.version>1.2.11</logback.version>
+        <fastjson.version>1.2.83</fastjson.version>
     </properties>
 
     <dependencies>
@@ -86,7 +86,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
                 <configuration>
                     <source>${project.compiler.version}</source>
                     <target>${project.compiler.version}</target>
@@ -95,7 +95,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -129,7 +129,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.2.0</version>
+                        <version>3.2.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -142,7 +142,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <version>3.0.1</version>
                         <executions>
                             <execution>
                                 <id>sonatype-nexus-staging</id>
@@ -156,7 +156,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.8</version>
+                        <version>1.6.13</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>sonatype-nexus-staging</serverId>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<HeaderEntry> 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<HeaderEntry> headers, String contentType, String body, boolean needBase64Decode) {
         if (url().startsWith("data:")) {
             return null;
         }
@@ -274,7 +288,12 @@ public JSONObject respond(int status, List<HeaderEntry> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 
 /**