diff --git a/src/main/java/com/njcn/influx/config/InfluxDbConfig.java b/src/main/java/com/njcn/influx/config/InfluxDbConfig.java
index 0192019..a16f1c4 100644
--- a/src/main/java/com/njcn/influx/config/InfluxDbConfig.java
+++ b/src/main/java/com/njcn/influx/config/InfluxDbConfig.java
@@ -5,6 +5,7 @@ import com.njcn.influx.core.InfluxExecutor;
import com.njcn.influx.utils.InfluxDbUtils;
import lombok.Data;
import org.influxdb.InfluxDB;
+import org.influxdb.InfluxDBFactory;
import org.influxdb.impl.InfluxDBMapper;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ConfigurableApplicationContext;
@@ -42,12 +43,14 @@ public class InfluxDbConfig {
@Bean(name = "influxDbMapper")
public InfluxDBMapper influxDbMapper(InfluxDB influxDb) {
+ influxDb = InfluxDBFactory.connect(url, user, password,InfluxDbUtils.client);
influxDb.setLogLevel(InfluxDB.LogLevel.BASIC);
return new InfluxDBMapper(influxDb);
}
@Bean(name = "influxDbExecutor")
public InfluxExecutor executor(InfluxDB influxDb, InfluxDBMapper influxDbMapper) {
+ influxDb = InfluxDBFactory.connect(url, user, password,InfluxDbUtils.client);
return new InfluxExecutor(influxDb, influxDbMapper,database);
}
diff --git a/src/main/java/com/njcn/influx/utils/InfluxDbUtils.java b/src/main/java/com/njcn/influx/utils/InfluxDbUtils.java
index 3e02395..e70fa08 100644
--- a/src/main/java/com/njcn/influx/utils/InfluxDbUtils.java
+++ b/src/main/java/com/njcn/influx/utils/InfluxDbUtils.java
@@ -32,8 +32,8 @@ import java.util.concurrent.TimeUnit;
@Slf4j
@Data
public class InfluxDbUtils {
- static OkHttpClient.Builder client = new OkHttpClient.Builder()
- .connectTimeout(1000,TimeUnit.SECONDS)
+ public static OkHttpClient.Builder client = new OkHttpClient.Builder()
+ .connectTimeout(1000, TimeUnit.SECONDS)
.readTimeout(1000, TimeUnit.SECONDS)
.writeTimeout(1000, TimeUnit.SECONDS);
private static final int FRACTION_MIN_WIDTH = 0;
@@ -45,15 +45,25 @@ public class InfluxDbUtils {
.appendZoneOrOffsetId()
.toFormatter();
- /**用户名*/
+ /**
+ * 用户名
+ */
private String username;
- /**密码*/
+ /**
+ * 密码
+ */
private String password;
- /**链接地址*/
+ /**
+ * 链接地址
+ */
private String openurl;
- /**数据库*/
+ /**
+ * 数据库
+ */
private String dbName;
- /**保留策略*/
+ /**
+ * 保留策略
+ */
private String retentionPolicy;
private InfluxDB influxDB;
@@ -75,7 +85,7 @@ public class InfluxDbUtils {
*/
public InfluxDB influxDbBuild() {
if (influxDB == null) {
- influxDB = InfluxDBFactory.connect(openurl, username, password,client);
+ influxDB = InfluxDBFactory.connect(openurl, username, password, client);
}
try {
// if (!influxDB.databaseExists(database)) {
@@ -92,8 +102,6 @@ public class InfluxDbUtils {
}
-
-
/**
* 创建数据库
*
@@ -153,7 +161,7 @@ public class InfluxDbUtils {
/**
* 创建默认的保留策略
- *
+ *
* 策略名:hour,保存天数:30天,保存副本数量:1,设为默认保留策略
*/
public void createDefaultRetentionPolicy() {
@@ -192,7 +200,6 @@ public class InfluxDbUtils {
}
-
/**
* 批量写入测点
*
@@ -214,7 +221,7 @@ public class InfluxDbUtils {
* @param consistency 一致性
* @param records 要保存的数据(调用BatchPoints.lineProtocol()可得到一条record)
*/
- public void batchInsert(final String database, final String retentionPolicy, final ConsistencyLevel consistency,TimeUnit timeUnit, final List records) {
+ public void batchInsert(final String database, final String retentionPolicy, final ConsistencyLevel consistency, TimeUnit timeUnit, final List records) {
influxDB.write(database, retentionPolicy, consistency, records);
}
@@ -264,39 +271,38 @@ public class InfluxDbUtils {
}
-
-
-
//单条查询语句封装
+
/**
* 查询结果封装到map
- * @param commond 单条sql语句
+ *
+ * @param commond 单条sql语句
* @return 查询结果
*/
@Deprecated
- public List