Merge pull request #29677 from taosdata/docs/TD-33503

resolve jdbc demo trivy issues

docs/examples/JDBC/mybatisplus-demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.7.18</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.taosdata.example</groupId>
@@ -18,6 +18,18 @@
         <java.version>1.8</java.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-bom</artifactId>
+                <version>3.5.10.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -28,14 +40,21 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <!-- spring boot2 引入可选模块 -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.1.2</version>
+        </dependency>
+
+        <!-- jdk 8+ 引入可选模块 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser-4.9</artifactId>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>2.3.232</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

docs/examples/JDBC/mybatisplus-demo/src/main/java/com/taosdata/example/mybatisplusdemo/config/MybatisPlusConfig.java

@@ -1,34 +1,26 @@
 package com.taosdata.example.mybatisplusdemo.config;
 
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+@EnableTransactionManagement
 @Configuration
+@MapperScan("com.taosdata.example.mybatisplusdemo.mapper")
 public class MybatisPlusConfig {
 
-
-    /** mybatis 3.4.1 pagination config start ***/
-//    @Bean
-//    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-//        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-//        interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
-//        return interceptor;
-//    }
-
-//    @Bean
-//    public ConfigurationCustomizer configurationCustomizer() {
-//        return configuration -> configuration.setUseDeprecatedExecutor(false);
-//    }
-
+    /**
+     * 添加分页插件
+     */
     @Bean
-    public PaginationInterceptor paginationInterceptor() {
-//        return new PaginationInterceptor();
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        //TODO: mybatis-plus do not support TDengine, use postgresql Dialect
-        paginationInterceptor.setDialectType("postgresql");
-
-        return paginationInterceptor;
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
     }
-
 }

docs/examples/JDBC/mybatisplus-demo/src/main/java/com/taosdata/example/mybatisplusdemo/mapper/MetersMapper.java

@@ -5,6 +5,7 @@ import com.taosdata.example.mybatisplusdemo.domain.Meters;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.executor.BatchResult;
 
 import java.util.List;
 
@@ -15,17 +16,6 @@ public interface MetersMapper extends BaseMapper<Meters> {
 
     @Insert("insert into meters (tbname, ts, groupid, location, current, voltage, phase) values(#{tbname}, #{ts}, #{groupid}, #{location}, #{current}, #{voltage}, #{phase})")
     int insertOne(Meters one);
-
-    @Insert({
-            "<script>",
-            "insert into meters (tbname, ts, groupid, location, current, voltage, phase) values ",
-            "<foreach collection='list' item='item' index='index' separator=','>",
-            "(#{item.tbname}, #{item.ts}, #{item.groupid}, #{item.location}, #{item.current}, #{item.voltage}, #{item.phase})",
-            "</foreach>",
-            "</script>"
-    })
-    int insertBatch(@Param("list") List<Meters> metersList);
-
     @Update("drop stable if exists meters")
     void dropTable();
 }

docs/examples/JDBC/mybatisplus-demo/src/main/java/com/taosdata/example/mybatisplusdemo/mapper/TemperatureMapper.java

@@ -11,9 +11,6 @@ public interface TemperatureMapper extends BaseMapper<Temperature> {
     @Update("CREATE TABLE if not exists temperature(ts timestamp, temperature float) tags(location nchar(64), tbIndex int)")
     int createSuperTable();
 
-    @Update("create table #{tbName} using temperature tags( #{location}, #{tbindex})")
-    int createTable(@Param("tbName") String tbName, @Param("location") String location, @Param("tbindex") int tbindex);
-
     @Update("drop table if exists temperature")
     void dropSuperTable();
 

docs/examples/JDBC/mybatisplus-demo/src/main/java/com/taosdata/example/mybatisplusdemo/mapper/WeatherMapper.java

@@ -10,7 +10,7 @@ public interface WeatherMapper extends BaseMapper<Weather> {
     @Update("CREATE TABLE if not exists weather(ts timestamp, temperature float, humidity int, location nchar(100))")
     int createTable();
 
-    @Insert("insert into weather (ts, temperature, humidity, location) values(#{ts}, #{temperature}, #{humidity}, #{location})")
+    @Insert("insert into weather (ts, temperature, humidity, location) values(#{ts}, #{temperature}, #{humidity}, #{location, jdbcType=NCHAR})")
     int insertOne(Weather one);
 
     @Update("drop table if exists weather")

docs/examples/JDBC/mybatisplus-demo/src/main/java/com/taosdata/example/mybatisplusdemo/service/DatabaseConnectionService.java

@@ -0,0 +1,19 @@
+package com.taosdata.example.mybatisplusdemo.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+@Service
+public class DatabaseConnectionService {
+
+    @Autowired
+    private DataSource dataSource;
+
+    public Connection getConnection() throws SQLException {
+        return dataSource.getConnection();
+    }
+}

docs/examples/JDBC/mybatisplus-demo/src/main/java/com/taosdata/example/mybatisplusdemo/service/TemperatureService.java

@@ -0,0 +1,23 @@
+package com.taosdata.example.mybatisplusdemo.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+@Service
+public class TemperatureService {
+    @Autowired
+    private DatabaseConnectionService databaseConnectionService;
+
+    public void createTable(String tableName, String location, int tbIndex) throws SQLException {
+
+
+        try (Connection connection = databaseConnectionService.getConnection();
+             Statement statement = connection.createStatement()) {
+            statement.executeUpdate("create table " + tableName +  " using temperature tags( '" + location +"', " + tbIndex + ")");
+        }
+    }
+}

docs/examples/JDBC/mybatisplus-demo/src/test/java/com/taosdata/example/mybatisplusdemo/mapper/MetersMapperTest.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.taosdata.example.mybatisplusdemo.domain.Meters;
 import com.taosdata.example.mybatisplusdemo.domain.Weather;
+import org.apache.ibatis.executor.BatchResult;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -18,6 +19,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
+import static java.sql.Statement.SUCCESS_NO_INFO;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
 public class MetersMapperTest {
@@ -63,8 +66,19 @@ public class MetersMapperTest {
             metersList.add(one);
 
         }
-        int affectRows = mapper.insertBatch(metersList);
-        Assert.assertEquals(100, affectRows);
+        List<BatchResult> affectRowsList = mapper.insert(metersList, 10000);
+
+        long totalAffectedRows = 0;
+        for (BatchResult batchResult : affectRowsList) {
+            int[] updateCounts = batchResult.getUpdateCounts();
+            for (int status : updateCounts) {
+                if (status == SUCCESS_NO_INFO) {
+                    totalAffectedRows++;
+                }
+            }
+        }
+
+        Assert.assertEquals(100, totalAffectedRows);
     }
 
     @Test
@@ -93,7 +107,7 @@ public class MetersMapperTest {
 
     @Test
     public void testSelectCount() {
-        int count = mapper.selectCount(null);
+        long count = mapper.selectCount(null);
 //        Assert.assertEquals(5, count);
         System.out.println(count);
     }

docs/examples/JDBC/mybatisplus-demo/src/test/java/com/taosdata/example/mybatisplusdemo/mapper/TemperatureMapperTest.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.taosdata.example.mybatisplusdemo.domain.Temperature;
+import com.taosdata.example.mybatisplusdemo.service.TemperatureService;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -13,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
@@ -22,18 +25,20 @@ import java.util.Random;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
 public class TemperatureMapperTest {
+    @Autowired
+    private TemperatureService temperatureService;
 
     private static Random random = new Random(System.currentTimeMillis());
     private static String[] locations = {"北京", "上海", "深圳", "广州", "杭州"};
 
     @Before
-    public void before() {
+    public void before() throws SQLException {
         mapper.dropSuperTable();
         // create table temperature
         mapper.createSuperTable();
         // create table t_X using temperature
         for (int i = 0; i < 10; i++) {
-            mapper.createTable("t" + i, locations[random.nextInt(locations.length)], i);
+            temperatureService.createTable("t" + i, locations[i % locations.length], i);
         }
         // insert into table
         int affectRows = 0;
@@ -107,7 +112,7 @@ public class TemperatureMapperTest {
      * **/
     @Test
     public void testSelectCount() {
-        int count = mapper.selectCount(null);
+        long count = mapper.selectCount(null);
         Assert.assertEquals(10, count);
     }
 

docs/examples/JDBC/mybatisplus-demo/src/test/java/com/taosdata/example/mybatisplusdemo/mapper/WeatherMapperTest.java

@@ -52,7 +52,7 @@ public class WeatherMapperTest {
         one.setTemperature(random.nextFloat() * 50);
         one.setHumidity(random.nextInt(100));
         one.setLocation("望京");
-        int affectRows = mapper.insert(one);
+        int affectRows = mapper.insertOne(one);
         Assert.assertEquals(1, affectRows);
     }
 
@@ -82,7 +82,7 @@ public class WeatherMapperTest {
 
     @Test
     public void testSelectCount() {
-        int count = mapper.selectCount(null);
+        long count = mapper.selectCount(null);
 //        Assert.assertEquals(5, count);
         System.out.println(count);
     }

docs/examples/JDBC/springbootdemo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.15</version>
+        <version>2.7.18</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.taosdata.example</groupId>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.1.1</version>
+            <version>2.3.2</version>
         </dependency>
 
         <dependency>

docs/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml

@@ -50,13 +50,6 @@
         ), groupId int)
     </update>
 
-    <update id="createTable" parameterType="com.taosdata.example.springbootdemo.domain.Weather">
-        create table if not exists test.t#{groupId} using test.weather tags
-        (
-            #{location},
-            #{groupId}
-        )
-    </update>
 
     <select id="select" resultMap="BaseResultMap">
         select * from test.weather order by ts desc
@@ -69,8 +62,8 @@
     </select>
 
     <insert id="insert" parameterType="com.taosdata.example.springbootdemo.domain.Weather">
-        insert into test.t#{groupId} (ts, temperature, humidity, note, bytes)
-        values (#{ts}, ${temperature}, ${humidity}, #{note}, #{bytes})
+        insert into test.t${groupId} (ts, temperature, humidity, note, bytes)
+        values (#{ts}, #{temperature}, #{humidity}, #{note}, #{bytes})
     </insert>
 
     <select id="getSubTables" resultType="String">

docs/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/DatabaseConnectionService.java

@@ -0,0 +1,19 @@
+package com.taosdata.example.springbootdemo.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+@Service
+public class DatabaseConnectionService {
+
+    @Autowired
+    private DataSource dataSource;
+
+    public Connection getConnection() throws SQLException {
+        return dataSource.getConnection();
+    }
+}

docs/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java

@@ -6,6 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.nio.charset.StandardCharsets;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
@@ -16,6 +19,9 @@ public class WeatherService {
 
     @Autowired
     private WeatherMapper weatherMapper;
+
+    @Autowired
+    private DatabaseConnectionService databaseConnectionService;
     private Random random = new Random(System.currentTimeMillis());
     private String[] locations = {"北京", "上海", "广州", "深圳", "天津"};
 
@@ -32,7 +38,7 @@ public class WeatherService {
             weather.setGroupId(i % locations.length);
             weather.setNote("note-" + i);
             weather.setBytes(locations[random.nextInt(locations.length)].getBytes(StandardCharsets.UTF_8));
-            weatherMapper.createTable(weather);
+            createTable(weather);
             count += weatherMapper.insert(weather);
         }
         return count;
@@ -78,4 +84,14 @@ public class WeatherService {
         weather.setLocation(location);
         return weather;
     }
+
+    public void createTable(Weather weather) {
+        try (Connection connection = databaseConnectionService.getConnection();
+             Statement statement = connection.createStatement()) {
+            String tableName = "t" + weather.getGroupId();
+            statement.executeUpdate("create table if not exists " + tableName +  " using test.weather tags( '" + weather.getLocation() +"', " + weather.getGroupId() + ")");
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

docs/examples/JDBC/springbootdemo/src/main/resources/application.properties

@@ -4,8 +4,8 @@
 #spring.datasource.username=root
 #spring.datasource.password=taosdata
 # datasource config - JDBC-RESTful
-spring.datasource.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-spring.datasource.url=jdbc:TAOS-RS://localhost:6041/test
+spring.datasource.driver-class-name=com.taosdata.jdbc.ws.WebSocketDriver
+spring.datasource.url=jdbc:TAOS-WS://localhost:6041/test
 spring.datasource.username=root
 spring.datasource.password=taosdata
 spring.datasource.druid.initial-size=5