重构 (#39)

scx567888 · Sep 16, 2024 · fd9cf1f · fd9cf1f
1 parent d8c2448
commit fd9cf1f
Show file tree

Hide file tree

Showing 239 changed files with 4,372 additions and 3,576 deletions.
diff --git a/pom.xml b/pom.xml
@@ -55,6 +55,8 @@
         <module>scx-web</module>
         <module>scx-ext</module>
         <module>scx-socket</module>
+        <module>scx-http</module>
+        <module>scx-http-helidon</module>
     </modules>
 
     <build>
@@ -86,11 +88,39 @@
     <dependencyManagement>
         <dependencies>
 
-            <!-- vert.x 网络拓展包 -->
+            <!-- helidon webserver -->
             <dependency>
-                <groupId>io.vertx</groupId>
-                <artifactId>vertx-web</artifactId>
-                <version>${vertx.version}</version>
+                <groupId>io.helidon.webserver</groupId>
+                <artifactId>helidon-webserver</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
+
+            <!-- helidon webserver http2 -->
+            <dependency>
+                <groupId>io.helidon.webserver</groupId>
+                <artifactId>helidon-webserver-http2</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
+
+            <!-- helidon multipart -->
+            <dependency>
+                <groupId>io.helidon.http.media</groupId>
+                <artifactId>helidon-http-media-multipart</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
+
+            <!-- helidon websocket -->
+            <dependency>
+                <groupId>io.helidon.webserver</groupId>
+                <artifactId>helidon-webserver-websocket</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
+
+            <!-- helidon webclient -->
+            <dependency>
+                <groupId>io.helidon.webclient</groupId>
+                <artifactId>helidon-webclient</artifactId>
+                <version>${helidon.version}</version>
             </dependency>
 
             <!-- vert.x 核心包 -->
@@ -204,6 +234,7 @@
     <properties>
 
         <!-- *********************** 以下为依赖包版本 *********************** -->
+        <helidon.version>4.1.1</helidon.version>
         <vertx.version>4.5.10</vertx.version>
         <jackson.version>2.17.2</jackson.version>
         <spring-framework.version>6.1.12</spring-framework.version>

diff --git a/scx-common/pom.xml b/scx-common/pom.xml
@@ -20,12 +20,6 @@
 
     <dependencies>
 
-        <!-- vert.x 核心包 -->
-        <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-core</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>

diff --git a/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClient.java b/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClient.java
diff --git a/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientHelper.java b/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientHelper.java
diff --git a/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientOptions.java b/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientOptions.java
diff --git a/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientRequest.java b/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientRequest.java
diff --git a/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientRequestBody.java b/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientRequestBody.java
diff --git a/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientResponse.java b/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientResponse.java
diff --git a/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientResponseBody.java b/scx-common/src/main/java/cool/scx/common/http_client/ScxHttpClientResponseBody.java