Skip to content

Commit

Permalink
commit:taosd-v2.0.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sudohuang committed Aug 7, 2020
1 parent c7b17a3 commit c9efaa3
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

###【功能】:

1. 内置驱动包(v1.6.5.9 x64), 客户端无需手动安装驱动包
1. 内置驱动包(x64), 客户端无需手动安装驱动包

2. 支持Http,为方便 Mac 端开发,实现了Http JDBC调用

Expand Down Expand Up @@ -31,7 +31,7 @@
<dependency>
<groupId>com.taosdata.jdbc</groupId>
<artifactId>taos-jdbcdriver</artifactId>
<version>1.0.3</version>
<version>2.0.2</version>
</dependency>
<!--taos-datasource依赖放到工程目录-->
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>com.taosdata.jdbc</groupId>
<artifactId>taos-jdbcdriver</artifactId>
<version>1.0.3</version>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/ewant/taos/http/TaosHttpConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private void initProperties(String url, Properties info) {
String host = uri.getHost();
int port = uri.getPort();
if(port < 1){
port = 6020;
port = 6041;
}
this.httpClient = new HttpClient("http://" + host + ":" + port + "/rest/sql");
}
Expand Down
Binary file modified src/main/java/net/ewant/taos/native/Linux/x86_64/libtaos.so
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/java/net/ewant/taos/native/Linux/x86_64/readme.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
library version 1.6.5.9
library version 2.0.0.1
4 changes: 3 additions & 1 deletion src/test/java/net/ewant/taos/test/TestDataSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.zaxxer.hikari.HikariDataSource;
import net.ewant.taos.pool2.TaosDataSource;
import net.ewant.taos.support.TaosConfigProperties;
import net.ewant.taos.support.TaosDataSourceAutoConfiguration;

import javax.sql.DataSource;
import java.sql.*;
Expand All @@ -18,7 +19,7 @@ public class TestDataSource {
static int tablesCount = 1;

public static void main(String[] args) throws Exception {
String url = "jdbc:TAOS://192.168.2.43:0/atom_index?user=root&password=taosdata";
String url = "jdbc:TAOS://192.168.2.44:0/"+databaseName+"?user=root&password=taosdata";
DataSource dataSource = getTaosDataSource(url);
//DataSource dataSource = getHikariDataSource(url);
//DataSource dataSource = getDruidDataSource(url);
Expand Down Expand Up @@ -49,6 +50,7 @@ public static void main(String[] args) throws Exception {
private static DataSource getTaosDataSource(String url){
TaosConfigProperties configProperties = new TaosConfigProperties();
configProperties.setJdbcUrl(url);
new TaosDataSourceAutoConfiguration(configProperties);// apply useHttp
return new TaosDataSource(configProperties, null);
}
private static DataSource getDruidDataSource(String url) throws Exception {
Expand Down
Binary file modified taos-datasource-springboot-starter-1.0.0-SNAPSHOT.jar
Binary file not shown.

0 comments on commit c9efaa3

Please sign in to comment.