Sumuxi/fastbee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20260507:项目版本梳理

Browse Source
This commit is contained in:
zhugongping 2026-05-07 18:56:42 +08:00
parent 6f3028f9ee
commit 4cc5c457bd
36 changed files with 70 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fastbee-admin/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

2
fastbee-admin/src/main/resources/application.yml
View File

@ -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

2
fastbee-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
fastbee-framework/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
fastbee-iot-data/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>fastbee-iot-data</artifactId>

2
fastbee-mq/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>fastbee-mq</artifactId>

2
fastbee-notify/fastbee-notify-core/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-notify</artifactId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<description>通知核心发送模块</description>

2
fastbee-notify/fastbee-notify-web/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-notify</artifactId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>fastbee-notify-web</artifactId>

2
fastbee-notify/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.fastbee</groupId>
<artifactId>fastbee</artifactId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<packaging>pom</packaging>

2
fastbee-open-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>

2
fastbee-plugs/fastbee-generator/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>fastbee-plugs</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
fastbee-plugs/fastbee-http/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-plugs</artifactId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>fastbee-http</artifactId>

2
fastbee-plugs/fastbee-mqtt-client/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-plugs</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>fastbee-mqtt-client</artifactId>
</project>

2
fastbee-plugs/fastbee-oauth/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>fastbee-plugs</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>fastbee-oauth</artifactId>

2
fastbee-plugs/fastbee-oss/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-plugs</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
fastbee-plugs/fastbee-pay/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>fastbee-plugs</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<groupId>com.fastbee.pay</groupId>

2
fastbee-plugs/fastbee-quartz/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-plugs</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
fastbee-plugs/fastbee-ruleEngine/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-plugs</artifactId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>fastbee-ruleEngine</artifactId>

2
fastbee-plugs/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<packaging>pom</packaging>

2
fastbee-protocol/fastbee-protocol-base/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-protocol</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<description>网关协议管理模块</description>

2
fastbee-protocol/fastbee-protocol-collect/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-protocol</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>

2
fastbee-protocol/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>fastbee-protocol</artifactId>

4
fastbee-record/pom.xml
View File

@ -5,12 +5,12 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<groupId>com.fastbee.record</groupId>
<artifactId>fastbee-record</artifactId>
<version>3.8.5</version>
<version>${revision}</version>
<name>fastbee-record</name>
<description>zlm录制服务</description>

2
fastbee-server/base-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-server</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>base-server</artifactId>

3
fastbee-server/boot-strap/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-server</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>boot-strap</artifactId>
<description>网关服务启动模块</description>
@ -30,7 +30,6 @@
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>base-server</artifactId>
<version>3.8.5</version>
<scope>compile</scope>
</dependency>

2
fastbee-server/coap-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-server</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>coap-server</artifactId>
<name>coap-server</name>

2
fastbee-server/http-server/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-server</artifactId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>http-server</artifactId>

2
fastbee-server/iot-server-core/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-server</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>iot-server-core</artifactId>

2
fastbee-server/mqtt-broker/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-server</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>mqtt-broker</artifactId>

3
fastbee-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<packaging>pom</packaging>
@ -39,7 +39,6 @@
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-common</artifactId>
<version>3.8.5</version>
</dependency>
<dependency>

2
fastbee-server/sip-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-server</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<artifactId>sip-server</artifactId>

2
fastbee-service/fastbee-iot-service/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-service</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
fastbee-service/fastbee-system-service/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee-service</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
fastbee-service/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fastbee</artifactId>
<groupId>com.fastbee</groupId>
<version>3.8.5</version>
<version>${revision}</version>
</parent>
<packaging>pom</packaging>
<artifactId>fastbee-service</artifactId>

68
pom.xml
View File

@ -6,14 +6,14 @@
<groupId>com.fastbee</groupId>
<artifactId>fastbee</artifactId>
<version>3.8.5</version>
<version>${revision}</version>
<name>fastbee</name>
<url>http://fastbee.cn</url>
<description>FastBee物联网平台</description>
<properties>
<fastbee.version>3.8.5</fastbee.version>
<revision>3.8.5</revision> <!-- 这是 Maven 白名单允许的特殊变量 -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
@ -242,156 +242,156 @@
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-framework</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-common</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-iot-data</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-message-bus</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--服务层模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-server</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--工具插件管理类-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-plugs</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-iot-service</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-system-service</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--定时模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-quartz</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--代码生成模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-generator</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-oss</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--基于netty的MqttBroker-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>mqtt-broker</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>http-server</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>coap-server</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>sip-server</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--协议层模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-protocol</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--controller层模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-open-api</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--modbus协议模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-protocol-collect</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--服务核心模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>iot-server-core</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--服务基础模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>base-server</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--mq模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-mq</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--服务启动模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>boot-strap</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!--协议解析基础模块-->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-protocol-base</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-http</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-mqtt-client</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
@ -444,46 +444,46 @@
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-notify</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!-- 通知配置模块 -->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-notify-web</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-notify-core</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!-- 工具插件模块：oauth2.0 -->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-oauth</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<!-- &lt;!&ndash; 音箱接入模块 &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.fastbee</groupId>-->
<!-- <artifactId>fastbee-speaker</artifactId>-->
<!-- <version>${fastbee.version}</version>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; 小度音箱模块 &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.fastbee</groupId>-->
<!-- <artifactId>fastbee-link-dueros</artifactId>-->
<!-- <version>${fastbee.version}</version>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- 组态模块 -->
<dependency>
<groupId>com.fastbee</groupId>
<artifactId>fastbee-scada</artifactId>
<version>${fastbee.version}</version>
<version>${revision}</version>
</dependency>
<dependency>

4
yack-web/src/views/dataCenter/analysis.vue
View File

@ -43,8 +43,7 @@
<el-col :span="4"><div class="metric metric-max"><div class="ml">最大值</div><div class="mv">{{ formatNum(stat.maxValue) }}</div></div></el-col>
<el-col :span="4"><div class="metric metric-min"><div class="ml">最小值</div><div class="mv">{{ formatNum(stat.minValue) }}</div></div></el-col>
<el-col :span="4"><div class="metric metric-avg"><div class="ml">平均值</div><div class="mv">{{ formatNum(stat.avgValue) }}</div></div></el-col>
<el-col :span="4"><div class="metric metric-sum"><div class="ml">累计值</div><div class="mv">{{ formatNum(stat.sumValue) }}</div></div></el-col>
<el-col :span="4"><div class="metric metric-last"><div class="ml">最新值</div><div class="mv">{{ formatNum(stat.lastValue) }}</div><div class="mt">{{ stat.lastTime || '' }}</div></div></el-col>
<el-col :span="8"><div class="metric metric-last"><div class="ml">最新值</div><div class="mv">{{ formatNum(stat.lastValue) }}</div><div class="mt">{{ stat.lastTime || '' }}</div></div></el-col>
<el-col :span="4"><div class="metric metric-count"><div class="ml">数据量</div><div class="mv">{{ stat.dataCount }}</div></div></el-col>
</el-row>
</el-card>
@ -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; }
}