From 1e578c399cc99120a8abb68a5fe39cb108efaca6 Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Tue, 22 Dec 2020 15:21:49 +0800
Subject: [PATCH] change

---
 .../com/taosdata/jdbc/rs/RestfulJDBCTest.java     |  1 -
 tests/examples/JDBC/taosdemo/pom.xml              | 15 +++++++--------
 .../taosdata/taosdemo/TaosDemoApplication.java    |  3 ++-
 .../taosdemo/components/DataSourceFactory.java    |  2 +-
 .../taosdemo/components/JdbcTaosdemoConfig.java   |  2 +-
 .../src/main/resources/application.properties     |  4 ++--
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
index d13475b96d..f66b7407e0 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
@@ -23,7 +23,6 @@ public class RestfulJDBCTest {
             connection.close();
     }
 
-
     /**
      * 查询所有log.log
      **/
diff --git a/tests/examples/JDBC/taosdemo/pom.xml b/tests/examples/JDBC/taosdemo/pom.xml
index d4797fa2fb..f63309962e 100644
--- a/tests/examples/JDBC/taosdemo/pom.xml
+++ b/tests/examples/JDBC/taosdemo/pom.xml
@@ -57,14 +57,6 @@
             <version>${spring.version}</version>
         </dependency>
 
-        <!-- fastjson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.75</version>
-        </dependency>
-
-
         <!-- HikariCP -->
         <dependency>
             <groupId>com.zaxxer</groupId>
@@ -77,6 +69,13 @@
             <artifactId>taos-jdbcdriver</artifactId>
             <version>2.0.15</version>
         </dependency>
+        <!-- fastjson -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.75</version>
+        </dependency>
+
         <!-- mysql -->
         <dependency>
             <groupId>mysql</groupId>
diff --git a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java
index 0700675fa8..f6ae7b7ce8 100644
--- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java
@@ -25,7 +25,8 @@ public class TaosDemoApplication {
         // 读配置参数
         JdbcTaosdemoConfig config = new JdbcTaosdemoConfig(args);
         boolean isHelp = Arrays.asList(args).contains("--help");
-        if (isHelp || config.host == null || config.host.isEmpty()) {
+//        if (isHelp || config.host == null || config.host.isEmpty()) {
+        if (isHelp) {
             JdbcTaosdemoConfig.printHelp();
             System.exit(0);
         }
diff --git a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/DataSourceFactory.java b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/DataSourceFactory.java
index 9f420b4eed..abd0fcf3a8 100644
--- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/DataSourceFactory.java
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/DataSourceFactory.java
@@ -28,7 +28,7 @@ public class DataSourceFactory {
                     else
                         config.setDriverClassName("com.taosdata.jdbc.TSDBDriver");
                     if ("com.taosdata.jdbc.rs.RestfulDriver".equalsIgnoreCase(properties.getProperty("jdbc.driver")))
-                        config.setJdbcUrl("jdbc:TAOS-RS://" + host + ":" + port + "/?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8");
+                        config.setJdbcUrl("jdbc:TAOS-RS://" + host + ":6041/?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8");
                     else
                         config.setJdbcUrl("jdbc:TAOS://" + host + ":" + port + "/?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8");
                     config.setUsername(user);
diff --git a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/JdbcTaosdemoConfig.java b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/JdbcTaosdemoConfig.java
index f9bd4bca28..be19f1a211 100644
--- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/JdbcTaosdemoConfig.java
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/JdbcTaosdemoConfig.java
@@ -4,7 +4,7 @@ import com.taosdata.taosdemo.utils.TimeStampUtil;
 
 public final class JdbcTaosdemoConfig {
     // instance
-    public String host;                     //host
+    public String host = "master";          //host
     public int port = 6030;                 //port
     public String user = "root";            //user
     public String password = "taosdata";    //password
diff --git a/tests/examples/JDBC/taosdemo/src/main/resources/application.properties b/tests/examples/JDBC/taosdemo/src/main/resources/application.properties
index 51d9b64ce9..4ff3dad78c 100644
--- a/tests/examples/JDBC/taosdemo/src/main/resources/application.properties
+++ b/tests/examples/JDBC/taosdemo/src/main/resources/application.properties
@@ -7,14 +7,14 @@ spring.datasource.driver-class-name=com.taosdata.jdbc.TSDBDriver
 spring.datasource.username=root
 spring.datasource.password=taosdata
 #spring.datasource.url=jdbc:TAOS-RS://:/?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
-#spring.datasource.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
+#spring.datasource.driver-class-name=com.taosdata.RestfulDriver
 #spring.datasource.username=root
 #spring.datasource.password=taosdata
 #spring.datasource.hikari.maximum-pool-size=1
 #spring.datasource.hikari.minimum-idle=1
 #spring.datasource.hikari.max-lifetime=0
 #logging.level.com.taosdata.taosdemo.dao=error
-jdbc.driver=com.taosdata.jdbc.TSDBDriver
+jdbc.driver=com.taosdata.jdbc.rs.RestfulDriver
 hikari.maximum-pool-size=1
 hikari.minimum-idle=1
 hikari.max-lifetime=0
\ No newline at end of file
-- 
GitLab