From cb75a3e2d3f2c808b1ab8ff1619e7b51e36c921f Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Wed, 16 Dec 2020 09:24:54 +0800
Subject: [PATCH] change

---
 .../components/DataSourceFactory.java         | 33 +++++++++++++++++++
 .../components/TaosDemoCommandLineRunner.java |  6 +++-
 .../src/main/resources/application.properties | 19 -----------
 3 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/DataSourceFactory.java
 delete mode 100644 tests/examples/JDBC/taosdemo/src/main/resources/application.properties

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
new file mode 100644
index 0000000000..1b0af29ab6
--- /dev/null
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/DataSourceFactory.java
@@ -0,0 +1,33 @@
+package com.taosdata.taosdemo.components;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
+
+@Component
+public class DataSourceFactory {
+
+    private static DataSource instance;
+
+    public static DataSource getInstance(String host, int port, String user, String password) {
+        if (instance == null) {
+            synchronized (DataSourceFactory.class) {
+                if (instance == null) {
+                    HikariConfig config = new HikariConfig();
+                    config.setDriverClassName("com.taosdata.jdbc.TSDBDriver");
+                    config.setJdbcUrl("jdbc:TAOS://" + host + ":" + port + "/?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8");
+                    config.setUsername(user);
+                    config.setPassword(password);
+                    config.setMaxLifetime(0);
+                    config.setMaximumPoolSize(500);
+                    config.setMinimumIdle(100);
+                    instance = new HikariDataSource(config);
+                }
+            }
+        }
+        return instance;
+    }
+
+}
diff --git a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/TaosDemoCommandLineRunner.java b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/TaosDemoCommandLineRunner.java
index 138635559c..6163f7bd04 100644
--- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/TaosDemoCommandLineRunner.java
+++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/TaosDemoCommandLineRunner.java
@@ -10,12 +10,12 @@ import com.taosdata.taosdemo.service.SuperTableService;
 import com.taosdata.taosdemo.service.data.SubTableValueGenerator;
 import com.taosdata.taosdemo.service.data.SuperTableMetaGenerator;
 import com.taosdata.taosdemo.utils.JdbcTaosdemoConfig;
-import com.taosdata.taosdemo.utils.TimeStampUtil;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
+import javax.sql.DataSource;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.*;
@@ -37,6 +37,7 @@ public class TaosDemoCommandLineRunner implements CommandLineRunner {
 //    private List<SubTableValue> subTableValueList;
 //    private List<List<SubTableValue>> dataList;
 
+
     @Override
     public void run(String... args) throws Exception {
         // 读配置参数
@@ -46,6 +47,9 @@ public class TaosDemoCommandLineRunner implements CommandLineRunner {
             JdbcTaosdemoConfig.printHelp();
             System.exit(0);
         }
+
+        DataSource dataSource = DataSourceFactory.getInstance(config.host, config.port, config.user, config.password);
+
         // 准备数据
         prepareMetaData(config);
         // 超级表的meta
diff --git a/tests/examples/JDBC/taosdemo/src/main/resources/application.properties b/tests/examples/JDBC/taosdemo/src/main/resources/application.properties
deleted file mode 100644
index 0b5129ea01..0000000000
--- a/tests/examples/JDBC/taosdemo/src/main/resources/application.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#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://:/?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=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.username=root
-#spring.datasource.password=taosdata
-
-spring.datasource.hikari.maximum-pool-size=10
-spring.datasource.hikari.minimum-idle=10
-spring.datasource.hikari.max-lifetime=600000
-logging.level.com.taosdata.taosdemo.mapper=error
\ No newline at end of file