Fix dependence (#85)

* fix version dependence

* optimized code

* fix readme

* rm .vscode

* Update pom.xml

* Apply suggestions from code review

Co-authored-by: Copilot <[email protected]>

* Update pom.xml

---------

Co-authored-by: CritasWang <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: 3 people

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.md)
 - [Kafka 示例](/examples/kafka/readme.md)
 
 您还可以参考模块特定的文档：

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.md)
 - [Kafka Examples](/examples/kafka/readme.md)
 
 You can also refer to module-specific documentation:

…amples/iotdb-spring-boot-start/readme.md …amples/iotdb-spring-boot-start/README.mdexamples/iotdb-spring-boot-start/readme.md renamed to examples/iotdb-spring-boot-start/README.md examples/iotdb-spring-boot-start/readme.md renamed to examples/iotdb-spring-boot-start/README.md

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.3</version>
+        <version>3.5.1</version>
         <relativePath/>
         <!-- lookup parent from repository -->
     </parent>
@@ -35,8 +35,7 @@
     <description>iotdb-spring-boot-start</description>
     <properties>
         <java.version>17</java.version>
-        <spring-boot.version>3.4.5</spring-boot.version>
-        <spring.version>6.2.6</spring.version>
+        <version>3.5.1</version>
         <google.java.format.version>1.22.0</google.java.format.version>
         <spotless.version>2.43.0</spotless.version>
     </properties>
@@ -55,6 +54,11 @@
             <artifactId>iotdb-spring-boot-starter</artifactId>
             <version>2.0.4-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.iotdb</groupId>
+            <artifactId>isession</artifactId>
+            <version>2.0.4-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

examples/iotdb-spring-boot-start/pom.xml

@@ -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

examples/iotdb-spring-boot-start/src/main/resources/application.properties

@@ -21,30 +21,26 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
-        <groupId>org.apache.iotdb</groupId>
-        <artifactId>iotdb-extras-parent</artifactId>
-        <version>2.0.4-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.5.1</version>
+        <relativePath/>
+        <!-- lookup parent from repository -->
     </parent>
-
     <groupId>org.apache.iotdb</groupId>
     <artifactId>mybatisplus-generator-example</artifactId>
     <name>IoTDB: Example: Mybatis Plus Generator</name>
-    <version>2.0.4-SNAPHOT</version>
-
+    <version>2.0.4-SNAPSHOT</version>
     <properties>
         <mybatisplus.version>3.5.10</mybatisplus.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-boot.version>3.4.5</spring-boot.version>
-        <spring.version>6.2.6</spring.version>
+        <spring-boot.version>3.5.1</spring-boot.version>
         <iotdb-jdbc.version>2.0.4-SNAPSHOT</iotdb-jdbc.version>
         <io-springfox.version>3.0.0</io-springfox.version>
     </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -56,11 +52,16 @@
             <artifactId>mybatis-plus-generator</artifactId>
             <version>${mybatisplus.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.iotdb</groupId>
             <artifactId>iotdb-jdbc</artifactId>
             <version>${iotdb-jdbc.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -70,15 +71,13 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
@@ -89,7 +88,6 @@
             <artifactId>springfox-swagger-ui</artifactId>
             <version>${io-springfox.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -100,8 +98,15 @@
             <artifactId>mybatisplus-plus</artifactId>
             <version>1.7.5-RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -112,7 +117,7 @@
                     <dependency>
                         <groupId>org.apache.iotdb</groupId>
                         <artifactId>mybatis-generator-plugin</artifactId>
-                        <version>2.0.2-SNAPSHOT</version>
+                        <version>2.0.4-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -123,5 +128,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

examples/mybatisplus-generator/pom.xml

@@ -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;

examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.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;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @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 {}

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;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @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 {}