From ad4111684106acf08949cb6c99ab36608a989873 Mon Sep 17 00:00:00 2001 From: zyyang Date: Fri, 11 Dec 2020 15:13:44 +0800 Subject: [PATCH] change --- .../com/taosdata/taosdemo/mapper/DatabaseMapper.java | 6 +++--- .../com/taosdata/taosdemo/mapper/DatabaseMapper.xml | 8 ++++---- .../src/main/resources/application.properties | 12 +++++++++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/mapper/DatabaseMapper.java b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/mapper/DatabaseMapper.java index 062346c274..e535ed1f98 100644 --- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/mapper/DatabaseMapper.java +++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/mapper/DatabaseMapper.java @@ -9,16 +9,16 @@ import java.util.Map; public interface DatabaseMapper { // create database if not exists XXX - int createDatabase(@Param("dbname") String dbname); + int createDatabase(@Param("database") String dbname); // drop database if exists XXX - int dropDatabase(@Param("dbname") String dbname); + int dropDatabase(@Param("database") String dbname); // create database if not exists XXX keep XX days XX replica XX int createDatabaseWithParameters(Map map); // use XXX - int useDatabase(@Param("dbname") String dbname); + int useDatabase(@Param("database") String dbname); //TODO: alter database diff --git a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/mapper/DatabaseMapper.xml b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/mapper/DatabaseMapper.xml index 8f421e935b..1a1de34842 100644 --- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/mapper/DatabaseMapper.xml +++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/mapper/DatabaseMapper.xml @@ -5,15 +5,15 @@ - create database if not exists ${dbname} + create database if not exists ${database} - DROP database if exists ${dbname} + DROP database if exists ${database} - CREATE database if not exists ${dbname} + CREATE database if not exists ${database} KEEP ${keep} @@ -38,7 +38,7 @@ - use ${dbname} + use ${database} diff --git a/tests/examples/JDBC/taosdemo/src/main/resources/application.properties b/tests/examples/JDBC/taosdemo/src/main/resources/application.properties index cdee3e46a3..1e7a7de89f 100644 --- a/tests/examples/JDBC/taosdemo/src/main/resources/application.properties +++ b/tests/examples/JDBC/taosdemo/src/main/resources/application.properties @@ -1,7 +1,13 @@ -spring.datasource.url=jdbc:mysql://master:3306/?useSSL=false&useUnicode=true&characterEncoding=UTF-8 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver +#spring.datasource.url=jdbc:mysql://master:3306/?useSSL=false&useUnicode=true&characterEncoding=UTF-8 +#spring.datasource.driver-class-name=com.mysql.jdbc.Driver +#spring.datasource.username=root +#spring.datasource.password=123456 + +spring.datasource.url=jdbc:TAOS://master:6030/?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8 +spring.datasource.driver-class-name=com.taosdata.jdbc.TSDBDriver spring.datasource.username=root -spring.datasource.password=123456 +spring.datasource.password=taosdata + spring.datasource.hikari.maximum-pool-size=10 spring.datasource.hikari.minimum-idle=10 spring.datasource.hikari.max-lifetime=600000 -- GitLab