From 4ad8c82392a235746721f69f9ef8bf02c3f849a1 Mon Sep 17 00:00:00 2001
From: xiaoyekanren <876670773@qq.com>
Date: Thu, 26 Jun 2025 11:43:48 +0800
Subject: [PATCH 1/7] fix version dependence
---
README-zh.md | 2 +-
README.md | 2 +-
.../{readme.md => README.md} | 0
examples/mybatisplus-generator/pom.xml | 38 +++--
.../src/main/java/org/apache/iotdb/Main.java | 3 +-
.../iotdb/controller/Table1Controller.java | 70 ++++-----
.../iotdb/controller/Table2Controller.java | 70 ++++-----
.../java/org/apache/iotdb/entity/Table1.java | 147 +++++++++---------
.../java/org/apache/iotdb/entity/Table2.java | 147 +++++++++---------
.../org/apache/iotdb/mapper/Table1Mapper.java | 69 ++++----
.../org/apache/iotdb/mapper/Table2Mapper.java | 69 ++++----
.../apache/iotdb/service/Table1Service.java | 67 ++++----
.../apache/iotdb/service/Table2Service.java | 67 ++++----
.../iotdb/service/impl/Table1ServiceImpl.java | 75 +++++----
.../iotdb/service/impl/Table2ServiceImpl.java | 75 +++++----
.../org/apache/iotdb/xml/Table1Mapper.xml | 48 +++---
.../org/apache/iotdb/xml/Table2Mapper.xml | 48 +++---
.../org/apache/iotdb/ApplicationTest.java | 3 +-
18 files changed, 481 insertions(+), 519 deletions(-)
rename examples/iotdb-spring-boot-start/{readme.md => README.md} (100%)
diff --git a/README-zh.md b/README-zh.md
index 426e399..809fe36 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -302,7 +302,7 @@ mvn clean package -Pwith-all-connectors,with-examples,with-springboot -DskipTest
- [Flink 示例](/examples/flink/README.md)
- [Spark 表示例](/examples/spark-table/README.md)
- [MyBatis 生成器示例](/examples/mybatis-generator/README.md)
-- [IoTDB Spring Boot Starter 示例](/examples/iotdb-spring-boot-start/readme.md)
+- [IoTDB Spring Boot Starter 示例](/examples/iotdb-spring-boot-start/README)
- [Kafka 示例](/examples/kafka/readme.md)
您还可以参考模块特定的文档：
diff --git a/README.md b/README.md
index e60ea16..c22a8a8 100644
--- a/README.md
+++ b/README.md
@@ -304,7 +304,7 @@ For detailed usage instructions, please refer to the README files in the specifi
- [Flink Examples](/examples/flink/README.md)
- [Spark Table Examples](/examples/spark-table/README.md)
- [MyBatis Generator Examples](/examples/mybatis-generator/README.md)
-- [IoTDB Spring Boot Starter Examples](/examples/iotdb-spring-boot-start/readme.md)
+- [IoTDB Spring Boot Starter Examples](/examples/iotdb-spring-boot-start/README)
- [Kafka Examples](/examples/kafka/readme.md)
You can also refer to module-specific documentation:
diff --git a/examples/iotdb-spring-boot-start/readme.md b/examples/iotdb-spring-boot-start/README.md
similarity index 100%
rename from examples/iotdb-spring-boot-start/readme.md
rename to examples/iotdb-spring-boot-start/README.md
diff --git a/examples/mybatisplus-generator/pom.xml b/examples/mybatisplus-generator/pom.xml
index 859a3af..26fae9a 100644
--- a/examples/mybatisplus-generator/pom.xml
+++ b/examples/mybatisplus-generator/pom.xml
@@ -21,30 +21,26 @@
-->
4.0.0
-
- org.apache.iotdb
- iotdb-extras-parent
- 2.0.4-SNAPSHOT
- ../../pom.xml
+ org.springframework.boot
+ spring-boot-starter-parent
+ 3.5.1
+
+
-
org.apache.iotdb
mybatisplus-generator-example
IoTDB: Example: Mybatis Plus Generator
2.0.4-SNAPHOT
-
3.5.10
17
17
UTF-8
- 3.4.5
- 6.2.6
+ 3.5.1
2.0.4-SNAPSHOT
3.0.0
-
com.baomidou
@@ -56,11 +52,16 @@
mybatis-plus-generator
${mybatisplus.version}
-
org.apache.iotdb
iotdb-jdbc
${iotdb-jdbc.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.springframework.boot
@@ -70,7 +71,6 @@
org.springframework.boot
spring-boot-starter-web
- ${spring-boot.version}
org.springframework.boot
@@ -78,7 +78,6 @@
${spring-boot.version}
test
-
io.springfox
springfox-swagger2
@@ -89,7 +88,6 @@
springfox-swagger-ui
${io-springfox.version}
-
org.projectlombok
lombok
@@ -100,8 +98,15 @@
mybatisplus-plus
1.7.5-RELEASE
+
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
-
@@ -112,7 +117,7 @@
org.apache.iotdb
mybatis-generator-plugin
- 2.0.2-SNAPSHOT
+ 2.0.4-SNAPSHOT
@@ -123,5 +128,4 @@
-
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
index 6d83687..9db7b82 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
@@ -19,12 +19,13 @@
package org.apache.iotdb;
+import org.apache.iotdb.jdbc.IoTDBDataSource;
+
import com.baomidou.mybatisplus.generator.FastAutoGenerator;
import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
import com.baomidou.mybatisplus.generator.config.OutputFile;
import com.baomidou.mybatisplus.generator.config.rules.DateType;
import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
-import org.apache.iotdb.jdbc.IoTDBDataSource;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table1Controller.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table1Controller.java
index be29a04..e8eccf0 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table1Controller.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table1Controller.java
@@ -1,37 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.iotdb.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@RestController
-@RequestMapping("/table1")
-public class Table1Controller {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.iotdb.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 前端控制器
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@RestController
+@RequestMapping("/table1")
+public class Table1Controller {}
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table2Controller.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table2Controller.java
index 2db29da..e2d15db 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table2Controller.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table2Controller.java
@@ -1,37 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.iotdb.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@RestController
-@RequestMapping("/table2")
-public class Table2Controller {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.iotdb.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 前端控制器
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@RestController
+@RequestMapping("/table2")
+public class Table2Controller {}
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table1.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table1.java
index 04cc32a..9e324d0 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table1.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table1.java
@@ -1,76 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.iotdb.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-/**
- *
- *
- *
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@Getter
-@Setter
-@ToString
-@ApiModel(value = "Table1对象", description = "")
-public class Table1 implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @MppMultiId
- @TableField("time")
- private Date time;
-
- @MppMultiId
- @TableField("region")
- private String region;
-
- @MppMultiId
- @TableField("plant_id")
- private String plantId;
-
- @MppMultiId
- @TableField("device_id")
- private String deviceId;
-
- private String modelId;
-
- private String maintenance;
-
- private Float temperature;
-
- private Float humidity;
-
- private Boolean status;
-
- private Date arrivalTime;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.iotdb.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@Getter
+@Setter
+@ToString
+@ApiModel(value = "Table1对象", description = "")
+public class Table1 implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @MppMultiId
+ @TableField("time")
+ private Date time;
+
+ @MppMultiId
+ @TableField("region")
+ private String region;
+
+ @MppMultiId
+ @TableField("plant_id")
+ private String plantId;
+
+ @MppMultiId
+ @TableField("device_id")
+ private String deviceId;
+
+ private String modelId;
+
+ private String maintenance;
+
+ private Float temperature;
+
+ private Float humidity;
+
+ private Boolean status;
+
+ private Date arrivalTime;
+}
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table2.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table2.java
index 1f77f6e..2713354 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table2.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table2.java
@@ -1,76 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.iotdb.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-/**
- *
- *
- *
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@Getter
-@Setter
-@ToString
-@ApiModel(value = "Table2对象", description = "")
-public class Table2 implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @MppMultiId
- @TableField("time")
- private Date time;
-
- @MppMultiId
- @TableField("region")
- private String region;
-
- @MppMultiId
- @TableField("plant_id")
- private String plantId;
-
- @MppMultiId
- @TableField("device_id")
- private String deviceId;
-
- private String modelId;
-
- private String maintenance;
-
- private Float temperature;
-
- private Float humidity;
-
- private Boolean status;
-
- private Date arrivalTime;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.iotdb.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@Getter
+@Setter
+@ToString
+@ApiModel(value = "Table2对象", description = "")
+public class Table2 implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @MppMultiId
+ @TableField("time")
+ private Date time;
+
+ @MppMultiId
+ @TableField("region")
+ private String region;
+
+ @MppMultiId
+ @TableField("plant_id")
+ private String plantId;
+
+ @MppMultiId
+ @TableField("device_id")
+ private String deviceId;
+
+ private String modelId;
+
+ private String maintenance;
+
+ private Float temperature;
+
+ private Float humidity;
+
+ private Boolean status;
+
+ private Date arrivalTime;
+}
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table1Mapper.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table1Mapper.java
index a5ca761..40c0f26 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table1Mapper.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table1Mapper.java
@@ -1,37 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.iotdb.mapper;
-
-import org.apache.iotdb.entity.Table1;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-public interface Table1Mapper extends BaseMapper {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.iotdb.mapper;
+
+import org.apache.iotdb.entity.Table1;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * Mapper 接口
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+public interface Table1Mapper extends BaseMapper {}
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table2Mapper.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table2Mapper.java
index faf822b..bf9ba7d 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table2Mapper.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table2Mapper.java
@@ -1,37 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.iotdb.mapper;
-
-import org.apache.iotdb.entity.Table2;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-public interface Table2Mapper extends BaseMapper {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.iotdb.mapper;
+
+import org.apache.iotdb.entity.Table2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * Mapper 接口
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+public interface Table2Mapper extends BaseMapper {}
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table1Service.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table1Service.java
index cdfa50b..bcd980b 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table1Service.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table1Service.java
@@ -1,35 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.iotdb.service;
-
-import org.apache.iotdb.entity.Table1;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- *
- * 服务类
- *
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-public interface Table1Service extends IService {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.iotdb.service;
+
+import org.apache.iotdb.entity.Table1;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 服务类
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+public interface Table1Service extends IService {}
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table2Service.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table2Service.java
index 2ec735b..bc63069 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table2Service.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table2Service.java
@@ -1,35 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.iotdb.service;
-
-import org.apache.iotdb.entity.Table2;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- *
- * 服务类
- *
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-public interface Table2Service extends IService {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.iotdb.service;
+
+import org.apache.iotdb.entity.Table2;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 服务类
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+public interface Table2Service extends IService {}
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table1ServiceImpl.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table1ServiceImpl.java
index d712f15..8ccde7e 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table1ServiceImpl.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table1ServiceImpl.java
@@ -1,39 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.iotdb.service.impl;
-
-import org.apache.iotdb.entity.Table1;
-import org.apache.iotdb.mapper.Table1Mapper;
-import org.apache.iotdb.service.Table1Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@Service
-public class Table1ServiceImpl extends ServiceImpl implements Table1Service {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.iotdb.service.impl;
+
+import org.apache.iotdb.entity.Table1;
+import org.apache.iotdb.mapper.Table1Mapper;
+import org.apache.iotdb.service.Table1Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 服务实现类
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@Service
+public class Table1ServiceImpl extends ServiceImpl implements Table1Service {}
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table2ServiceImpl.java b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table2ServiceImpl.java
index b9bff35..6de7a68 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table2ServiceImpl.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table2ServiceImpl.java
@@ -1,39 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.iotdb.service.impl;
-
-import org.apache.iotdb.entity.Table2;
-import org.apache.iotdb.mapper.Table2Mapper;
-import org.apache.iotdb.service.Table2Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@Service
-public class Table2ServiceImpl extends ServiceImpl implements Table2Service {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.iotdb.service.impl;
+
+import org.apache.iotdb.entity.Table2;
+import org.apache.iotdb.mapper.Table2Mapper;
+import org.apache.iotdb.service.Table2Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 服务实现类
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@Service
+public class Table2ServiceImpl extends ServiceImpl implements Table2Service {}
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table1Mapper.xml b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table1Mapper.xml
index 7e073ed..77532cc 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table1Mapper.xml
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table1Mapper.xml
@@ -1,25 +1,23 @@
-
-
-
-
-
-
+
+
+
+
diff --git a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table2Mapper.xml b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table2Mapper.xml
index 5a8a6e3..ea6a959 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table2Mapper.xml
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table2Mapper.xml
@@ -1,25 +1,23 @@
-
-
-
-
-
-
+
+
+
+
diff --git a/examples/mybatisplus-generator/src/test/java/org/apache/iotdb/ApplicationTest.java b/examples/mybatisplus-generator/src/test/java/org/apache/iotdb/ApplicationTest.java
index b368f3b..9b9b121 100644
--- a/examples/mybatisplus-generator/src/test/java/org/apache/iotdb/ApplicationTest.java
+++ b/examples/mybatisplus-generator/src/test/java/org/apache/iotdb/ApplicationTest.java
@@ -21,6 +21,7 @@
import org.apache.iotdb.service.Table1Service;
import org.apache.iotdb.service.Table2Service;
+
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -30,7 +31,7 @@ public class ApplicationTest {
@Autowired private Table1Service table1Service;
@Autowired private Table2Service table2Service;
- @Test
+// @Test
void contextLoads() {
// 启动Spring容器，验证主流程无异常
System.out.println("Table1 查询结果：" + table1Service.list());
From a75dca05eb6b7f5a07ba14abf5b9e7dc5862b66f Mon Sep 17 00:00:00 2001
From: xiaoyekanren <876670773@qq.com>
Date: Thu, 26 Jun 2025 11:44:53 +0800
Subject: [PATCH 2/7] optimized code
---
.../.vscode/settings.json | 4 ++
examples/iotdb-spring-boot-start/pom.xml | 10 ++-
.../src/main/resources/application.properties | 2 +-
examples/pom.xml | 8 ---
.../.vscode/settings.json | 3 +
iotdb-spring-boot-starter/pom.xml | 3 +-
.../iotdb/config/IoTDBSessionProperties.java | 66 ++++++-------------
.../iotdb/session/IoTDBSessionPool.java | 12 ++--
8 files changed, 44 insertions(+), 64 deletions(-)
create mode 100644 examples/iotdb-spring-boot-start/.vscode/settings.json
create mode 100644 iotdb-spring-boot-starter/.vscode/settings.json
diff --git a/examples/iotdb-spring-boot-start/.vscode/settings.json b/examples/iotdb-spring-boot-start/.vscode/settings.json
new file mode 100644
index 0000000..e012065
--- /dev/null
+++ b/examples/iotdb-spring-boot-start/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+ "java.compile.nullAnalysis.mode": "automatic",
+ "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/examples/iotdb-spring-boot-start/pom.xml b/examples/iotdb-spring-boot-start/pom.xml
index 5b1288d..59adca2 100644
--- a/examples/iotdb-spring-boot-start/pom.xml
+++ b/examples/iotdb-spring-boot-start/pom.xml
@@ -24,7 +24,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.4.3
+ 3.5.1
@@ -35,8 +35,7 @@
iotdb-spring-boot-start
17
- 3.4.5
- 6.2.6
+ 3.5.1
1.22.0
2.43.0
@@ -55,6 +54,11 @@
iotdb-spring-boot-starter
2.0.4-SNAPSHOT
+
+ org.apache.iotdb
+ isession
+ 2.0.5-SNAPSHOT
+
diff --git a/examples/iotdb-spring-boot-start/src/main/resources/application.properties b/examples/iotdb-spring-boot-start/src/main/resources/application.properties
index 354d7d7..0680ea7 100644
--- a/examples/iotdb-spring-boot-start/src/main/resources/application.properties
+++ b/examples/iotdb-spring-boot-start/src/main/resources/application.properties
@@ -18,7 +18,7 @@
spring.application.name=iotdb-spring-boot-start
-iotdb.session.node_urls=172.20.31.56:6668
+iotdb.session.node_urls=127.0.0.1:6667
iotdb.session.password=root
iotdb.session.username=root
iotdb.session.database=wind
diff --git a/examples/pom.xml b/examples/pom.xml
index c68bef4..13a72c5 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -30,14 +30,6 @@
pom
IoTDB Extras: Examples
- flink
- flink-sql
- hadoop
- kafka
- pulsar
- rabbitmq
- rocketmq
- spark-table
mybatis-generator
diff --git a/iotdb-spring-boot-starter/.vscode/settings.json b/iotdb-spring-boot-starter/.vscode/settings.json
new file mode 100644
index 0000000..7b016a8
--- /dev/null
+++ b/iotdb-spring-boot-starter/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "java.compile.nullAnalysis.mode": "automatic"
+}
\ No newline at end of file
diff --git a/iotdb-spring-boot-starter/pom.xml b/iotdb-spring-boot-starter/pom.xml
index 892a1f2..340d026 100644
--- a/iotdb-spring-boot-starter/pom.xml
+++ b/iotdb-spring-boot-starter/pom.xml
@@ -35,7 +35,8 @@
17
UTF-8
3.4.5
- 6.2.6
+ 6.2.7
+ 2.0.4-SNAPSHOT
diff --git a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
index 54e22dc..5c2a3e0 100644
--- a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
+++ b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
@@ -34,17 +34,17 @@ public class IoTDBSessionProperties {
private Integer fetch_size = 1024;
private long query_timeout_in_ms = 60000L;
private boolean enable_auto_fetch = true;
- private int max_retry_count = 60;
- private long wait_to_get_session_timeout_in_msit = 60000L;
+ private Integer max_retry_count = 60;
+ private long wait_to_get_session_timeout_in_ms = 60000L;
private boolean enable_compression = false;
private long retry_interval_in_ms = SessionConfig.RETRY_INTERVAL_IN_MS;
private boolean use_ssl = false;
private String trust_store;
private String trust_store_pwd;
- private int connection_timeout_in_ms;
+ private Integer connection_timeout_in_ms;
private ZoneId zone_id;
- private int thrift_default_buffer_size = 1024;
- private int thrift_max_frame_size = 67108864;
+ private Integer thrift_default_buffer_size = 1024;
+ private Integer thrift_max_frame_size = 67108864;
private boolean enable_redirection;
private boolean enable_records_auto_convert_tablet =
SessionConfig.DEFAULT_RECORDS_AUTO_CONVERT_TABLET;
@@ -105,38 +105,10 @@ public void setFetch_size(Integer fetch_size) {
this.fetch_size = fetch_size;
}
- public Long getQuery_timeout_in_ms() {
+ public long getQuery_timeout_in_ms() {
return query_timeout_in_ms;
}
- public void setQuery_timeout_in_ms(Long query_timeout_in_ms) {
- this.query_timeout_in_ms = query_timeout_in_ms;
- }
-
- public Boolean getEnable_auto_fetch() {
- return enable_auto_fetch;
- }
-
- public void setEnable_auto_fetch(Boolean enable_auto_fetch) {
- this.enable_auto_fetch = enable_auto_fetch;
- }
-
- public Boolean getUse_ssl() {
- return use_ssl;
- }
-
- public void setUse_ssl(Boolean use_ssl) {
- this.use_ssl = use_ssl;
- }
-
- public Integer getMax_retry_count() {
- return max_retry_count;
- }
-
- public void setMax_retry_count(Integer max_retry_count) {
- this.max_retry_count = max_retry_count;
- }
-
public void setQuery_timeout_in_ms(long query_timeout_in_ms) {
this.query_timeout_in_ms = query_timeout_in_ms;
}
@@ -157,16 +129,20 @@ public void setUse_ssl(boolean use_ssl) {
this.use_ssl = use_ssl;
}
- public void setMax_retry_count(int max_retry_count) {
+ public Integer getMax_retry_count() {
+ return max_retry_count;
+ }
+
+ public void setMax_retry_count(Integer max_retry_count) {
this.max_retry_count = max_retry_count;
}
- public long getWait_to_get_session_timeout_in_msit() {
- return wait_to_get_session_timeout_in_msit;
+ public long getWait_to_get_session_timeout_in_ms() {
+ return wait_to_get_session_timeout_in_ms;
}
- public void setWait_to_get_session_timeout_in_msit(long wait_to_get_session_timeout_in_msit) {
- this.wait_to_get_session_timeout_in_msit = wait_to_get_session_timeout_in_msit;
+ public void setWait_to_get_session_timeout_in_ms(long wait_to_get_session_timeout_in_ms) {
+ this.wait_to_get_session_timeout_in_ms = wait_to_get_session_timeout_in_ms;
}
public boolean isEnable_compression() {
@@ -201,11 +177,11 @@ public void setTrust_store_pwd(String trust_store_pwd) {
this.trust_store_pwd = trust_store_pwd;
}
- public int getConnection_timeout_in_ms() {
+ public Integer getConnection_timeout_in_ms() {
return connection_timeout_in_ms;
}
- public void setConnection_timeout_in_ms(int connection_timeout_in_ms) {
+ public void setConnection_timeout_in_ms(Integer connection_timeout_in_ms) {
this.connection_timeout_in_ms = connection_timeout_in_ms;
}
@@ -217,19 +193,19 @@ public void setZone_id(ZoneId zone_id) {
this.zone_id = zone_id;
}
- public int getThrift_default_buffer_size() {
+ public Integer getThrift_default_buffer_size() {
return thrift_default_buffer_size;
}
- public void setThrift_default_buffer_size(int thrift_default_buffer_size) {
+ public void setThrift_default_buffer_size(Integer thrift_default_buffer_size) {
this.thrift_default_buffer_size = thrift_default_buffer_size;
}
- public int getThrift_max_frame_size() {
+ public Integer getThrift_max_frame_size() {
return thrift_max_frame_size;
}
- public void setThrift_max_frame_size(int thrift_max_frame_size) {
+ public void setThrift_max_frame_size(Integer thrift_max_frame_size) {
this.thrift_max_frame_size = thrift_max_frame_size;
}
diff --git a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
index 09ceb53..4a56429 100644
--- a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
+++ b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
@@ -56,11 +56,11 @@ public ITableSessionPool tableSessionPool() {
.database(properties.getDatabase())
.maxSize(properties.getMax_size())
.fetchSize(properties.getFetch_size())
- .enableAutoFetch(properties.getEnable_auto_fetch())
- .useSSL(properties.getUse_ssl())
+ .enableAutoFetch(properties.isEnable_auto_fetch())
+ .useSSL(properties.isUse_ssl())
.queryTimeoutInMs(properties.getQuery_timeout_in_ms())
.maxRetryCount(properties.getMax_retry_count())
- .waitToGetSessionTimeoutInMs(properties.getQuery_timeout_in_ms())
+ .waitToGetSessionTimeoutInMs(properties.getWait_to_get_session_timeout_in_ms())
.enableCompression(properties.isEnable_compression())
.retryIntervalInMs(properties.getRetry_interval_in_ms())
.trustStore(properties.getTrust_store())
@@ -89,11 +89,11 @@ public ISessionPool treeSessionPool() {
.password(properties.getPassword())
.maxSize(properties.getMax_size())
.fetchSize(properties.getFetch_size())
- .enableAutoFetch(properties.getEnable_auto_fetch())
- .useSSL(properties.getUse_ssl())
+ .enableAutoFetch(properties.isEnable_auto_fetch())
+ .useSSL(properties.isUse_ssl())
.queryTimeoutInMs(properties.getQuery_timeout_in_ms())
.maxRetryCount(properties.getMax_retry_count())
- .waitToGetSessionTimeoutInMs(properties.getQuery_timeout_in_ms())
+ .waitToGetSessionTimeoutInMs(properties.getWait_to_get_session_timeout_in_ms())
.enableCompression(properties.isEnable_compression())
.retryIntervalInMs(properties.getRetry_interval_in_ms())
.trustStore(properties.getTrust_store())
From bd648fcde0fc403a7597cad08af5884c51a84428 Mon Sep 17 00:00:00 2001
From: xiaoyekanren <876670773@qq.com>
Date: Thu, 26 Jun 2025 11:48:22 +0800
Subject: [PATCH 3/7] fix readme
---
README-zh.md | 2 +-
README.md | 2 +-
examples/iotdb-spring-boot-start/.vscode/settings.json | 4 ----
3 files changed, 2 insertions(+), 6 deletions(-)
delete mode 100644 examples/iotdb-spring-boot-start/.vscode/settings.json
diff --git a/README-zh.md b/README-zh.md
index 809fe36..eaea49f 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -302,7 +302,7 @@ mvn clean package -Pwith-all-connectors,with-examples,with-springboot -DskipTest
- [Flink 示例](/examples/flink/README.md)
- [Spark 表示例](/examples/spark-table/README.md)
- [MyBatis 生成器示例](/examples/mybatis-generator/README.md)
-- [IoTDB Spring Boot Starter 示例](/examples/iotdb-spring-boot-start/README)
+- [IoTDB Spring Boot Starter 示例](/examples/iotdb-spring-boot-start/README.md)
- [Kafka 示例](/examples/kafka/readme.md)
您还可以参考模块特定的文档：
diff --git a/README.md b/README.md
index c22a8a8..4e2ad89 100644
--- a/README.md
+++ b/README.md
@@ -304,7 +304,7 @@ For detailed usage instructions, please refer to the README files in the specifi
- [Flink Examples](/examples/flink/README.md)
- [Spark Table Examples](/examples/spark-table/README.md)
- [MyBatis Generator Examples](/examples/mybatis-generator/README.md)
-- [IoTDB Spring Boot Starter Examples](/examples/iotdb-spring-boot-start/README)
+- [IoTDB Spring Boot Starter Examples](/examples/iotdb-spring-boot-start/README.md)
- [Kafka Examples](/examples/kafka/readme.md)
You can also refer to module-specific documentation:
diff --git a/examples/iotdb-spring-boot-start/.vscode/settings.json b/examples/iotdb-spring-boot-start/.vscode/settings.json
deleted file mode 100644
index e012065..0000000
--- a/examples/iotdb-spring-boot-start/.vscode/settings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "java.compile.nullAnalysis.mode": "automatic",
- "java.configuration.updateBuildConfiguration": "interactive"
-}
\ No newline at end of file
From fd01ea6b7f78a8ff780af6a7d2387b2105925071 Mon Sep 17 00:00:00 2001
From: xiaoyekanren <876670773@qq.com>
Date: Thu, 26 Jun 2025 11:51:31 +0800
Subject: [PATCH 4/7] rm .vscode
---
iotdb-spring-boot-starter/.vscode/settings.json | 3 ---
1 file changed, 3 deletions(-)
delete mode 100644 iotdb-spring-boot-starter/.vscode/settings.json
diff --git a/iotdb-spring-boot-starter/.vscode/settings.json b/iotdb-spring-boot-starter/.vscode/settings.json
deleted file mode 100644
index 7b016a8..0000000
--- a/iotdb-spring-boot-starter/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "java.compile.nullAnalysis.mode": "automatic"
-}
\ No newline at end of file
From 3ef36bf1aadf362a66ef898be96d8f93736e3dde Mon Sep 17 00:00:00 2001
From: CritasWang
Date: Thu, 26 Jun 2025 12:07:13 +0800
Subject: [PATCH 5/7] Update pom.xml
---
examples/iotdb-spring-boot-start/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/iotdb-spring-boot-start/pom.xml b/examples/iotdb-spring-boot-start/pom.xml
index 59adca2..27bd7c0 100644
--- a/examples/iotdb-spring-boot-start/pom.xml
+++ b/examples/iotdb-spring-boot-start/pom.xml
@@ -57,7 +57,7 @@
org.apache.iotdb
isession
- 2.0.5-SNAPSHOT
+ 2.0.4-SNAPSHOT
From 1acf43e4402e6a73aa191fbfdeed7ff46396a406 Mon Sep 17 00:00:00 2001
From: CritasWang
Date: Thu, 26 Jun 2025 12:07:34 +0800
Subject: [PATCH 6/7] Apply suggestions from code review
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
examples/mybatisplus-generator/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/mybatisplus-generator/pom.xml b/examples/mybatisplus-generator/pom.xml
index 26fae9a..79fa227 100644
--- a/examples/mybatisplus-generator/pom.xml
+++ b/examples/mybatisplus-generator/pom.xml
@@ -31,7 +31,7 @@
org.apache.iotdb
mybatisplus-generator-example
IoTDB: Example: Mybatis Plus Generator
- 2.0.4-SNAPHOT
+ 2.0.4-SNAPSHOT
3.5.10
17
From f3a09ec2dff974554277b76b3017bd05d5283799 Mon Sep 17 00:00:00 2001
From: CritasWang
Date: Thu, 26 Jun 2025 12:08:27 +0800
Subject: [PATCH 7/7] Update pom.xml
---
iotdb-spring-boot-starter/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/iotdb-spring-boot-starter/pom.xml b/iotdb-spring-boot-starter/pom.xml
index 340d026..64a5292 100644
--- a/iotdb-spring-boot-starter/pom.xml
+++ b/iotdb-spring-boot-starter/pom.xml
@@ -34,7 +34,7 @@
17
17
UTF-8
- 3.4.5
+ 3.5.1
6.2.7
2.0.4-SNAPSHOT