diff --git a/influx-data/influx-source/pom.xml b/influx-data/influx-source/pom.xml
index 10b72cb..247f787 100644
--- a/influx-data/influx-source/pom.xml
+++ b/influx-data/influx-source/pom.xml
@@ -42,12 +42,6 @@
org.springframework.boot
spring-boot-starter-actuator
-
-
- org.springframework.boot
- spring-boot-configuration-processor
- true
-
org.springframework.boot
@@ -98,13 +92,11 @@
com.njcn
influxdb-springboot-starter
1.0.0
-
com.njcn
oracle-source
1.0.0
- compile
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java
index 25805ed..5c8ac98 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataFlicker;
import lombok.Data;
import org.influxdb.annotation.Column;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFluc.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFluc.java
index 1769207..5d8d05b 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFluc.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFluc.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataFlicker;
import com.njcn.oracle.bo.po.DataFluc;
import lombok.Data;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicI.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicI.java
index 9bd31b5..ef18e17 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicI.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicI.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataHarmphasicI;
import lombok.Data;
import org.influxdb.annotation.Column;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicV.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicV.java
index b6a0503..6bf6f97 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicV.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicV.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataHarmphasicI;
import com.njcn.oracle.bo.po.DataHarmphasicV;
import lombok.Data;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerP.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerP.java
index 60c9c9d..e493f29 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerP.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerP.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataHarmpowerP;
import com.njcn.oracle.bo.po.DataHarmpowerP;
import lombok.Data;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerQ.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerQ.java
index 3df7664..c3e726b 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerQ.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerQ.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataHarmpowerQ;
import lombok.Data;
import org.influxdb.annotation.Column;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerS.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerS.java
index 8c1d3b2..6756d03 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerS.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerS.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataHarmpowerS;
import lombok.Data;
import org.influxdb.annotation.Column;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateI.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateI.java
index e02ebde..f4e7134 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateI.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateI.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataHarmrateI;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateV.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateV.java
index 210bdf8..c9e975b 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateV.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateV.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataHarmrateV;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataI.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataI.java
index 4743fe7..4c7f62c 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataI.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataI.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataI;
import lombok.Data;
import org.influxdb.annotation.Column;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmI.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmI.java
index 4acb6c2..d675c46 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmI.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmI.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataInharmI;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmV.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmV.java
index 79563c5..29a81a6 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmV.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmV.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataInharmV;
import lombok.Data;
import org.influxdb.annotation.Column;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataPlt.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataPlt.java
index 30ad3f1..689c3aa 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataPlt.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataPlt.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataPlt;
import lombok.Data;
import org.influxdb.annotation.Column;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataV.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataV.java
index ff8b10f..40246b5 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataV.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataV.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DataV;
import lombok.Data;
import org.influxdb.annotation.Column;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayFlicker.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayFlicker.java
index 4f3e024..04e2810 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayFlicker.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayFlicker.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import com.njcn.oracle.bo.po.DayFlicker;
import lombok.Data;
import org.influxdb.annotation.Column;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayFluc.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayFluc.java
index d7a3528..92750e6 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayFluc.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayFluc.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPhasicI.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPhasicI.java
index 3003654..2e9adbe 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPhasicI.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPhasicI.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPhasicV.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPhasicV.java
index 50d1782..2c7d012 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPhasicV.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPhasicV.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerP.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerP.java
index 21e5e38..7629a4e 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerP.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerP.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerQ.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerQ.java
index 3fb9bcb..48e3f9f 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerQ.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerQ.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerS.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerS.java
index 2389e98..1ddf2ad 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerS.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayHarmPowerS.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayI.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayI.java
index 31b62e4..e4c2ca1 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayI.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayI.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayPlt.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayPlt.java
index 89df5ab..e73e884 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayPlt.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayPlt.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayV.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayV.java
index e78d509..6b7e69e 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayV.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDayV.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/LimitTarget.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/LimitTarget.java
index fe83636..114aea7 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/LimitTarget.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/LimitTarget.java
@@ -1,7 +1,7 @@
package com.njcn.influx.bo.po;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
diff --git a/influx-data/influx-target/src/main/resources/application.yml b/influx-data/influx-target/src/main/resources/application.yml
index 23aaec6..0098f82 100644
--- a/influx-data/influx-target/src/main/resources/application.yml
+++ b/influx-data/influx-target/src/main/resources/application.yml
@@ -2,24 +2,6 @@
business:
#分片次数,一定为24的约数,1 2 3 4 6 8 12 24
slice: 4
- #处理波形数据位置
- # wavePath: C://comtrade
- wavePath: /usr/local/comtrade
- #处理临时数据
- #tempPath: C://file
- tempPath: /usr/local/file
- #文件存储的方式
- file:
- storage: 3
-microservice:
- ename: @artifactId@
- name: oracle-data
-#线程池配置信息
-threadPool:
- corePoolSize: 10
- maxPoolSize: 20
- queueCapacity: 500
- keepAliveSeconds: 60
server:
port: 8090
spring:
diff --git a/pom.xml b/pom.xml
index d316d17..bede349 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,6 +268,13 @@
log4j-api
2.18.0
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ true
+ runtime
+