xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

change

This commit is contained in:
zyyang 2020-12-30 10:09:31 +08:00
parent b5c1f0029f
commit 05cf7afc0d
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/examples/JDBC/taosdemo/pom.xml
View File

@ -68,6 +68,8 @@
<groupId>com.taosdata.jdbc</groupId> <groupId>com.taosdata.jdbc</groupId>
<artifactId>taos-jdbcdriver</artifactId> <artifactId>taos-jdbcdriver</artifactId>
<version>2.0.15</version> <version>2.0.15</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/lib/taos-jdbcdriver-2.0.15.jar</systemPath>
</dependency> </dependency>
<!-- fastjson --> <!-- fastjson -->
<dependency> <dependency>
@ -75,12 +77,12 @@
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.75</version> <version>1.2.75</version>
</dependency> </dependency>
<!-- mysql: just for test -->
<!-- mysql -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.47</version> <version>5.1.47</version>
<scope>test</scope>
</dependency> </dependency>
<!-- log4j --> <!-- log4j -->
<dependency> <dependency>
@ -111,6 +113,7 @@
<includes> <includes>
<include>**/*.properties</include> <include>**/*.properties</include>
<include>**/*.xml</include> <include>**/*.xml</include>
<include>**/*.jar</include>
</includes> </includes>
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>

4
tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java
View File

@ -25,8 +25,8 @@ public class TaosDemoApplication {
// 读配置参数 // 读配置参数
JdbcTaosdemoConfig config = new JdbcTaosdemoConfig(args); JdbcTaosdemoConfig config = new JdbcTaosdemoConfig(args);
boolean isHelp = Arrays.asList(args).contains("--help"); 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) { // if (isHelp) {
JdbcTaosdemoConfig.printHelp(); JdbcTaosdemoConfig.printHelp();
System.exit(0); System.exit(0);
} }

13
tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/DataSourceFactory.java
View File

@ -23,10 +23,19 @@ public class DataSourceFactory {
properties.load(is); properties.load(is);
HikariConfig config = new HikariConfig(); HikariConfig config = new HikariConfig();
if (properties.containsKey("jdbc.driver"))
if (properties.containsKey("jdbc.driver")) {
// String driverName = properties.getProperty("jdbc.driver");
// System.out.println(">>> load driver : " + driverName);
// try {
// Class.forName(driverName);
// } catch (ClassNotFoundException e) {
// e.printStackTrace();
// }
config.setDriverClassName(properties.getProperty("jdbc.driver")); config.setDriverClassName(properties.getProperty("jdbc.driver"));
else } else {
config.setDriverClassName("com.taosdata.jdbc.TSDBDriver"); config.setDriverClassName("com.taosdata.jdbc.TSDBDriver");
}
if ("com.taosdata.jdbc.rs.RestfulDriver".equalsIgnoreCase(properties.getProperty("jdbc.driver"))) if ("com.taosdata.jdbc.rs.RestfulDriver".equalsIgnoreCase(properties.getProperty("jdbc.driver")))
config.setJdbcUrl("jdbc:TAOS-RS://" + host + ":6041/?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 else

3
tests/examples/JDBC/taosdemo/src/main/resources/application.properties
View File

@ -14,7 +14,8 @@ spring.datasource.password=taosdata
#spring.datasource.hikari.minimum-idle=1 #spring.datasource.hikari.minimum-idle=1
#spring.datasource.hikari.max-lifetime=0 #spring.datasource.hikari.max-lifetime=0
#logging.level.com.taosdata.taosdemo.dao=error #logging.level.com.taosdata.taosdemo.dao=error
jdbc.driver=com.taosdata.jdbc.TSDBDriver
jdbc.driver=com.taosdata.jdbc.rs.RestfulDriver
hikari.maximum-pool-size=500 hikari.maximum-pool-size=500
hikari.minimum-idle=100 hikari.minimum-idle=100
hikari.max-lifetime=0 hikari.max-lifetime=0