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-22 15:21:49 +08:00
parent 118f1ac138
commit 1e578c399c
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
View File

@ -23,7 +23,6 @@ public class RestfulJDBCTest {
connection.close(); connection.close();
} }
/** /**
* 查询所有log.log * 查询所有log.log
**/ **/

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

@ -57,14 +57,6 @@
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<!-- fastjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.75</version>
</dependency>
<!-- HikariCP --> <!-- HikariCP -->
<dependency> <dependency>
<groupId>com.zaxxer</groupId> <groupId>com.zaxxer</groupId>
@ -77,6 +69,13 @@
<artifactId>taos-jdbcdriver</artifactId> <artifactId>taos-jdbcdriver</artifactId>
<version>2.0.15</version> <version>2.0.15</version>
</dependency> </dependency>
<!-- fastjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.75</version>
</dependency>
<!-- mysql --> <!-- mysql -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>

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

@ -25,7 +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) {
JdbcTaosdemoConfig.printHelp(); JdbcTaosdemoConfig.printHelp();
System.exit(0); System.exit(0);
} }

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

@ -28,7 +28,7 @@ public class DataSourceFactory {
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 + ":" + 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 else
config.setJdbcUrl("jdbc:TAOS://" + host + ":" + port + "/?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8"); config.setJdbcUrl("jdbc:TAOS://" + host + ":" + port + "/?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8");
config.setUsername(user); config.setUsername(user);

2
tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/components/JdbcTaosdemoConfig.java
View File

@ -4,7 +4,7 @@ import com.taosdata.taosdemo.utils.TimeStampUtil;
public final class JdbcTaosdemoConfig { public final class JdbcTaosdemoConfig {
// instance // instance
public String host; //host public String host = "master"; //host
public int port = 6030; //port public int port = 6030; //port
public String user = "root"; //user public String user = "root"; //user
public String password = "taosdata"; //password public String password = "taosdata"; //password

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

@ -7,14 +7,14 @@ spring.datasource.driver-class-name=com.taosdata.jdbc.TSDBDriver
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=taosdata spring.datasource.password=taosdata
#spring.datasource.url=jdbc:TAOS-RS://:/?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8 #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.username=root
#spring.datasource.password=taosdata #spring.datasource.password=taosdata
#spring.datasource.hikari.maximum-pool-size=1 #spring.datasource.hikari.maximum-pool-size=1
#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=1 hikari.maximum-pool-size=1
hikari.minimum-idle=1 hikari.minimum-idle=1
hikari.max-lifetime=0 hikari.max-lifetime=0