Merge branch 'openGemini:main' into main

Author: castlighting

.typos.toml

@@ -0,0 +1,17 @@
+# Copyright 2024 openGemini Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+[default.extend-words]
+# abbr
+"vertx" = "vertx"

opengemini-client-api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-client-parent</artifactId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
     </parent>
 
     <artifactId>opengemini-client-api</artifactId>

opengemini-client-common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-client-parent</artifactId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
     </parent>
 
     <artifactId>opengemini-client-common</artifactId>

opengemini-client-reactor/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-client-parent</artifactId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
     </parent>
 
     <artifactId>opengemini-client-reactor</artifactId>

opengemini-client/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-client-parent</artifactId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
     </parent>
 
     <artifactId>opengemini-client</artifactId>
@@ -54,6 +54,23 @@
             <version>${okhttp.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-grpc</artifactId>
+            <version>${vertx.version}</version>
+        </dependency>
     </dependencies>
 
 </project>

pom.xml

@@ -21,7 +21,7 @@
 
     <groupId>io.opengemini</groupId>
     <artifactId>opengemini-client-parent</artifactId>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
     <packaging>pom</packaging>
     <modules>
         <module>opengemini-client</module>
@@ -42,6 +42,7 @@
         <annotations.version>13.0</annotations.version>
         <async-http-client.version>3.0.0.Beta3</async-http-client.version>
         <commons-lang3.version>3.17.0</commons-lang3.version>
+        <grpc.version>1.61.1</grpc.version>
         <http-facade.version>0.2.1</http-facade.version>
         <jackson.version>2.17.2</jackson.version>
         <junit.version>5.11.1</junit.version>
@@ -52,11 +53,14 @@
         <mockito.version>5.13.0</mockito.version>
         <okhttp.version>4.12.0</okhttp.version>
         <puppycrawl.version>10.18.1</puppycrawl.version>
+        <protobuf.version>3.25.1</protobuf.version>
+        <protoc.version>3.25.1</protoc.version>
         <reactor-netty.version>1.1.21</reactor-netty.version>
         <scala.version>3.4.0</scala.version>
         <slf4j.version>2.0.7</slf4j.version>
-        <spring.version>6.0.19</spring.version>
-        <spring-boot.version>3.1.11</spring-boot.version>
+        <spring.version>6.1.12</spring.version>
+        <spring-boot.version>3.2.9</spring-boot.version>
+        <vertx.version>4.5.10</vertx.version>
         <!-- plugin -->
         <central-publishing-maven-plugin.version>0.6.0</central-publishing-maven-plugin.version>
         <lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
@@ -70,6 +74,8 @@
         <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
+        <maven-os-maven-plugin.version>1.7.1</maven-os-maven-plugin.version>
+        <maven-protobuf-maven-plugin>0.6.1</maven-protobuf-maven-plugin>
         <nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version>
         <scala-maven-plugin.version>4.9.2</scala-maven-plugin.version>
         <spotbugs-maven-plugin.version>4.8.6.4</spotbugs-maven-plugin.version>
@@ -95,6 +101,13 @@
                 <artifactId>jackson-databind</artifactId>
                 <version>${jackson.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-bom</artifactId>
+                <version>${grpc.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -146,6 +159,13 @@
     </dependencies>
 
     <build>
+        <extensions>
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>${maven-os-maven-plugin.version}</version>
+            </extension>
+        </extensions>
         <sourceDirectory>${src.dir}</sourceDirectory>
         <plugins>
             <plugin>

spring/opengemini-spring-boot-starter-reactive/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-spring-parent</artifactId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

spring/opengemini-spring-boot-starter/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-spring-parent</artifactId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

spring/opengemini-spring/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-spring-parent</artifactId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

spring/opengemini-spring/src/main/java/io/opengemini/client/spring/data/core/OpenGeminiPropertiesConverter.java

@@ -83,7 +83,7 @@ public HttpClientConfig toHttpClientConfig(OpenGeminiProperties.Http http) {
         HttpClientConfig.Builder builder = new HttpClientConfig.Builder();
         builder.engine(http.getEngine());
         builder.timeout(http.getTimeout());
-        builder.timeout(http.getTimeout());
+        builder.connectTimeout(http.getConnectTimeout());
         Optional.ofNullable(http.getSsl()).map(this::toTlsConfig).ifPresent(builder::tlsConfig);
         Optional.ofNullable(http.getOkHttp()).map(this::toOkHttpConfig).ifPresent(builder::okHttpConfig);
         return builder.build();