diff --git a/fastbee-admin/pom.xml b/fastbee-admin/pom.xml index 4cf76ad6..5254d260 100644 --- a/fastbee-admin/pom.xml +++ b/fastbee-admin/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${revision} 4.0.0 jar diff --git a/fastbee-admin/src/main/resources/application.yml b/fastbee-admin/src/main/resources/application.yml index c5ad1275..6357b46d 100644 --- a/fastbee-admin/src/main/resources/application.yml +++ b/fastbee-admin/src/main/resources/application.yml @@ -28,7 +28,7 @@ server: min-spare: 100 # Tomcat启动初始化的线程数,默认值10 # 基于netty的服务器 broker: - enabled: false # mqttBroker类型选择, true: 基于netty的mqttBroker和webSocket false: emq的mqttBroker + enabled: false # mqttBroker类型选择, true: 基于netty的mqttBroker和webSocket false: emqx(外部)的mqttBroker port: 1883 websocket-port: 8083 websocket-path: /mqtt diff --git a/fastbee-common/pom.xml b/fastbee-common/pom.xml index d18ce35a..2aa5d86e 100644 --- a/fastbee-common/pom.xml +++ b/fastbee-common/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${revision} 4.0.0 diff --git a/fastbee-framework/pom.xml b/fastbee-framework/pom.xml index 7f86f04d..0a979b39 100644 --- a/fastbee-framework/pom.xml +++ b/fastbee-framework/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${revision} 4.0.0 diff --git a/fastbee-iot-data/pom.xml b/fastbee-iot-data/pom.xml index 694de2e9..5a3c344b 100644 --- a/fastbee-iot-data/pom.xml +++ b/fastbee-iot-data/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${revision} fastbee-iot-data diff --git a/fastbee-mq/pom.xml b/fastbee-mq/pom.xml index 864f7bed..bc4406d4 100644 --- a/fastbee-mq/pom.xml +++ b/fastbee-mq/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${revision} fastbee-mq diff --git a/fastbee-notify/fastbee-notify-core/pom.xml b/fastbee-notify/fastbee-notify-core/pom.xml index 91dcdf1d..9a1cb47e 100644 --- a/fastbee-notify/fastbee-notify-core/pom.xml +++ b/fastbee-notify/fastbee-notify-core/pom.xml @@ -6,7 +6,7 @@ com.fastbee fastbee-notify - 3.8.5 + ${revision} 通知核心发送模块 diff --git a/fastbee-notify/fastbee-notify-web/pom.xml b/fastbee-notify/fastbee-notify-web/pom.xml index cab71389..97b94b4a 100644 --- a/fastbee-notify/fastbee-notify-web/pom.xml +++ b/fastbee-notify/fastbee-notify-web/pom.xml @@ -6,7 +6,7 @@ com.fastbee fastbee-notify - 3.8.5 + ${revision} fastbee-notify-web diff --git a/fastbee-notify/pom.xml b/fastbee-notify/pom.xml index c4200f4c..508bdc15 100644 --- a/fastbee-notify/pom.xml +++ b/fastbee-notify/pom.xml @@ -6,7 +6,7 @@ com.fastbee fastbee - 3.8.5 + ${revision} pom diff --git a/fastbee-open-api/pom.xml b/fastbee-open-api/pom.xml index f53b6b37..50f23a82 100644 --- a/fastbee-open-api/pom.xml +++ b/fastbee-open-api/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${revision} diff --git a/fastbee-plugs/fastbee-generator/pom.xml b/fastbee-plugs/fastbee-generator/pom.xml index c5b35bc5..4371e6a9 100644 --- a/fastbee-plugs/fastbee-generator/pom.xml +++ b/fastbee-plugs/fastbee-generator/pom.xml @@ -4,7 +4,7 @@ fastbee-plugs com.fastbee - 3.8.5 + ${revision} 4.0.0 diff --git a/fastbee-plugs/fastbee-http/pom.xml b/fastbee-plugs/fastbee-http/pom.xml index 285bcfbc..f4259373 100644 --- a/fastbee-plugs/fastbee-http/pom.xml +++ b/fastbee-plugs/fastbee-http/pom.xml @@ -6,7 +6,7 @@ com.fastbee fastbee-plugs - 3.8.5 + ${revision} fastbee-http diff --git a/fastbee-plugs/fastbee-mqtt-client/pom.xml b/fastbee-plugs/fastbee-mqtt-client/pom.xml index 34e0db9a..142b0c42 100644 --- a/fastbee-plugs/fastbee-mqtt-client/pom.xml +++ b/fastbee-plugs/fastbee-mqtt-client/pom.xml @@ -5,7 +5,7 @@ fastbee-plugs com.fastbee - 3.8.5 + ${revision} fastbee-mqtt-client diff --git a/fastbee-plugs/fastbee-oauth/pom.xml b/fastbee-plugs/fastbee-oauth/pom.xml index 20d3300f..4598b754 100644 --- a/fastbee-plugs/fastbee-oauth/pom.xml +++ b/fastbee-plugs/fastbee-oauth/pom.xml @@ -6,7 +6,7 @@ fastbee-plugs com.fastbee - 3.8.5 + ${revision} fastbee-oauth diff --git a/fastbee-plugs/fastbee-oss/pom.xml b/fastbee-plugs/fastbee-oss/pom.xml index 59ea26d5..ca3008b9 100644 --- a/fastbee-plugs/fastbee-oss/pom.xml +++ b/fastbee-plugs/fastbee-oss/pom.xml @@ -5,7 +5,7 @@ fastbee-plugs com.fastbee - 3.8.5 + ${revision} 4.0.0 diff --git a/fastbee-plugs/fastbee-pay/pom.xml b/fastbee-plugs/fastbee-pay/pom.xml index 043166ed..37391aea 100644 --- a/fastbee-plugs/fastbee-pay/pom.xml +++ b/fastbee-plugs/fastbee-pay/pom.xml @@ -6,7 +6,7 @@ fastbee-plugs com.fastbee - 3.8.5 + ${revision} com.fastbee.pay diff --git a/fastbee-plugs/fastbee-quartz/pom.xml b/fastbee-plugs/fastbee-quartz/pom.xml index a21fe075..4ed6af09 100644 --- a/fastbee-plugs/fastbee-quartz/pom.xml +++ b/fastbee-plugs/fastbee-quartz/pom.xml @@ -5,7 +5,7 @@ fastbee-plugs com.fastbee - 3.8.5 + ${revision} 4.0.0 diff --git a/fastbee-plugs/fastbee-ruleEngine/pom.xml b/fastbee-plugs/fastbee-ruleEngine/pom.xml index 3ad39884..bafa1d09 100644 --- a/fastbee-plugs/fastbee-ruleEngine/pom.xml +++ b/fastbee-plugs/fastbee-ruleEngine/pom.xml @@ -6,7 +6,7 @@ com.fastbee fastbee-plugs - 3.8.5 + ${revision} fastbee-ruleEngine diff --git a/fastbee-plugs/pom.xml b/fastbee-plugs/pom.xml index e93da379..ba96e83f 100644 --- a/fastbee-plugs/pom.xml +++ b/fastbee-plugs/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${revision} pom diff --git a/fastbee-protocol/fastbee-protocol-base/pom.xml b/fastbee-protocol/fastbee-protocol-base/pom.xml index bf290b7b..2d87bc5f 100644 --- a/fastbee-protocol/fastbee-protocol-base/pom.xml +++ b/fastbee-protocol/fastbee-protocol-base/pom.xml @@ -5,7 +5,7 @@ fastbee-protocol com.fastbee - 3.8.5 + ${revision} 网关协议管理模块 diff --git a/fastbee-protocol/fastbee-protocol-collect/pom.xml b/fastbee-protocol/fastbee-protocol-collect/pom.xml index b011c974..830543cc 100644 --- a/fastbee-protocol/fastbee-protocol-collect/pom.xml +++ b/fastbee-protocol/fastbee-protocol-collect/pom.xml @@ -5,7 +5,7 @@ fastbee-protocol com.fastbee - 3.8.5 + ${revision} diff --git a/fastbee-protocol/pom.xml b/fastbee-protocol/pom.xml index 172927c4..e023ba6d 100644 --- a/fastbee-protocol/pom.xml +++ b/fastbee-protocol/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${revision} fastbee-protocol diff --git a/fastbee-record/pom.xml b/fastbee-record/pom.xml index 5d4027ad..7f87bb62 100644 --- a/fastbee-record/pom.xml +++ b/fastbee-record/pom.xml @@ -5,12 +5,12 @@ fastbee com.fastbee - 3.8.5 + ${revision} com.fastbee.record fastbee-record - 3.8.5 + ${revision} fastbee-record zlm录制服务 diff --git a/fastbee-server/base-server/pom.xml b/fastbee-server/base-server/pom.xml index ac4bfb44..112edfea 100644 --- a/fastbee-server/base-server/pom.xml +++ b/fastbee-server/base-server/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${revision} base-server diff --git a/fastbee-server/boot-strap/pom.xml b/fastbee-server/boot-strap/pom.xml index b2ec860f..1e438c64 100644 --- a/fastbee-server/boot-strap/pom.xml +++ b/fastbee-server/boot-strap/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${revision} boot-strap 网关服务启动模块 @@ -30,7 +30,6 @@ com.fastbee base-server - 3.8.5 compile diff --git a/fastbee-server/coap-server/pom.xml b/fastbee-server/coap-server/pom.xml index bc50d18d..79b39268 100644 --- a/fastbee-server/coap-server/pom.xml +++ b/fastbee-server/coap-server/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${revision} coap-server coap-server diff --git a/fastbee-server/http-server/pom.xml b/fastbee-server/http-server/pom.xml index a96afe2d..96a50a82 100644 --- a/fastbee-server/http-server/pom.xml +++ b/fastbee-server/http-server/pom.xml @@ -6,7 +6,7 @@ com.fastbee fastbee-server - 3.8.5 + ${revision} http-server diff --git a/fastbee-server/iot-server-core/pom.xml b/fastbee-server/iot-server-core/pom.xml index 9f57fe48..b8fa71d9 100644 --- a/fastbee-server/iot-server-core/pom.xml +++ b/fastbee-server/iot-server-core/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${revision} iot-server-core diff --git a/fastbee-server/mqtt-broker/pom.xml b/fastbee-server/mqtt-broker/pom.xml index 6c1e1230..b005a9ac 100644 --- a/fastbee-server/mqtt-broker/pom.xml +++ b/fastbee-server/mqtt-broker/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${revision} mqtt-broker diff --git a/fastbee-server/pom.xml b/fastbee-server/pom.xml index bbd96efd..62f24d10 100644 --- a/fastbee-server/pom.xml +++ b/fastbee-server/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${revision} pom @@ -39,7 +39,6 @@ com.fastbee fastbee-common - 3.8.5 diff --git a/fastbee-server/sip-server/pom.xml b/fastbee-server/sip-server/pom.xml index ea622000..6d907ecc 100644 --- a/fastbee-server/sip-server/pom.xml +++ b/fastbee-server/sip-server/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${revision} sip-server diff --git a/fastbee-service/fastbee-iot-service/pom.xml b/fastbee-service/fastbee-iot-service/pom.xml index bdef0afb..09e85564 100644 --- a/fastbee-service/fastbee-iot-service/pom.xml +++ b/fastbee-service/fastbee-iot-service/pom.xml @@ -5,7 +5,7 @@ fastbee-service com.fastbee - 3.8.5 + ${revision} 4.0.0 diff --git a/fastbee-service/fastbee-system-service/pom.xml b/fastbee-service/fastbee-system-service/pom.xml index fd88e348..7d3285c4 100644 --- a/fastbee-service/fastbee-system-service/pom.xml +++ b/fastbee-service/fastbee-system-service/pom.xml @@ -5,7 +5,7 @@ fastbee-service com.fastbee - 3.8.5 + ${revision} 4.0.0 diff --git a/fastbee-service/pom.xml b/fastbee-service/pom.xml index a76ddc70..b2b0d7e4 100644 --- a/fastbee-service/pom.xml +++ b/fastbee-service/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${revision} pom fastbee-service diff --git a/pom.xml b/pom.xml index 9067de1d..b665824b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.fastbee fastbee - 3.8.5 + ${revision} fastbee http://fastbee.cn FastBee物联网平台 - 3.8.5 + 3.8.5 UTF-8 UTF-8 1.8 @@ -242,156 +242,156 @@ com.fastbee fastbee-framework - ${fastbee.version} + ${revision} com.fastbee fastbee-common - ${fastbee.version} + ${revision} com.fastbee fastbee-iot-data - ${fastbee.version} + ${revision} com.fastbee fastbee-message-bus - ${fastbee.version} + ${revision} com.fastbee fastbee-server - ${fastbee.version} + ${revision} com.fastbee fastbee-plugs - ${fastbee.version} + ${revision} com.fastbee fastbee-iot-service - ${fastbee.version} + ${revision} com.fastbee fastbee-system-service - ${fastbee.version} + ${revision} com.fastbee fastbee-quartz - ${fastbee.version} + ${revision} com.fastbee fastbee-generator - ${fastbee.version} + ${revision} com.fastbee fastbee-oss - ${fastbee.version} + ${revision} com.fastbee mqtt-broker - ${fastbee.version} + ${revision} com.fastbee http-server - ${fastbee.version} + ${revision} com.fastbee coap-server - ${fastbee.version} + ${revision} com.fastbee sip-server - ${fastbee.version} + ${revision} com.fastbee fastbee-protocol - ${fastbee.version} + ${revision} com.fastbee fastbee-open-api - ${fastbee.version} + ${revision} com.fastbee fastbee-protocol-collect - ${fastbee.version} + ${revision} com.fastbee iot-server-core - ${fastbee.version} + ${revision} com.fastbee base-server - ${fastbee.version} + ${revision} com.fastbee fastbee-mq - ${fastbee.version} + ${revision} com.fastbee boot-strap - ${fastbee.version} + ${revision} com.fastbee fastbee-protocol-base - ${fastbee.version} + ${revision} com.fastbee fastbee-http - ${fastbee.version} + ${revision} com.fastbee fastbee-mqtt-client - ${fastbee.version} + ${revision} @@ -444,46 +444,46 @@ com.fastbee fastbee-notify - ${fastbee.version} + ${revision} com.fastbee fastbee-notify-web - ${fastbee.version} + ${revision} com.fastbee fastbee-notify-core - ${fastbee.version} + ${revision} com.fastbee fastbee-oauth - ${fastbee.version} + ${revision} - + - + com.fastbee fastbee-scada - ${fastbee.version} + ${revision} diff --git a/yack-web/src/views/dataCenter/analysis.vue b/yack-web/src/views/dataCenter/analysis.vue index 119e19d7..c8db1225 100644 --- a/yack-web/src/views/dataCenter/analysis.vue +++ b/yack-web/src/views/dataCenter/analysis.vue @@ -43,8 +43,7 @@
最大值
{{ formatNum(stat.maxValue) }}
最小值
{{ formatNum(stat.minValue) }}
平均值
{{ formatNum(stat.avgValue) }}
-
累计值
{{ formatNum(stat.sumValue) }}
-
最新值
{{ formatNum(stat.lastValue) }}
{{ stat.lastTime || '' }}
+
最新值
{{ formatNum(stat.lastValue) }}
{{ stat.lastTime || '' }}
数据量
{{ stat.dataCount }}
@@ -434,7 +433,6 @@ export default { &.metric-max { border-top-color: #F56C6C; .mv { color: #F56C6C; } } &.metric-min { border-top-color: #409EFF; .mv { color: #409EFF; } } &.metric-avg { border-top-color: #67C23A; .mv { color: #67C23A; } } - &.metric-sum { border-top-color: #9C27B0; .mv { color: #9C27B0; } } &.metric-last { border-top-color: #E6A23C; .mv { color: #E6A23C; } } &.metric-count { border-top-color: #909399; } }