diff --git a/springboot/fastbee-admin/pom.xml b/springboot/fastbee-admin/pom.xml index 0cb74acd..6c56202c 100644 --- a/springboot/fastbee-admin/pom.xml +++ b/springboot/fastbee-admin/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${fastbee.version} 4.0.0 jar diff --git a/springboot/fastbee-admin/src/main/resources/application.yml b/springboot/fastbee-admin/src/main/resources/application.yml index b730500c..8989a4ee 100644 --- a/springboot/fastbee-admin/src/main/resources/application.yml +++ b/springboot/fastbee-admin/src/main/resources/application.yml @@ -1,7 +1,7 @@ # 项目相关配置 fastbee: name: fastbee # 名称 - version: 3.8.5 # 版本 + version: 2.1.0 # 版本 copyrightYear: 2024 # 版权年份 demoEnabled: true # 实例演示开关 # 文件路径,以uploadPath结尾 示例( Windows配置 D:/uploadPath,Linux配置 /uploadPath) diff --git a/springboot/fastbee-common/pom.xml b/springboot/fastbee-common/pom.xml index 70ba5cb8..e5eba079 100644 --- a/springboot/fastbee-common/pom.xml +++ b/springboot/fastbee-common/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${fastbee.version} 4.0.0 diff --git a/springboot/fastbee-framework/pom.xml b/springboot/fastbee-framework/pom.xml index 67e35e98..b628b4e8 100644 --- a/springboot/fastbee-framework/pom.xml +++ b/springboot/fastbee-framework/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${fastbee.version} 4.0.0 @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/springboot/fastbee-gateway/fastbee-mq/pom.xml b/springboot/fastbee-gateway/fastbee-mq/pom.xml index e6842797..b8c62e46 100644 --- a/springboot/fastbee-gateway/fastbee-mq/pom.xml +++ b/springboot/fastbee-gateway/fastbee-mq/pom.xml @@ -5,7 +5,7 @@ fastbee-gateway com.fastbee - 3.8.5 + ${fastbee.version} fastbee-mq @@ -23,8 +23,6 @@ com.fastbee fastbee-mqtt-client - 3.8.5 - compile diff --git a/springboot/fastbee-gateway/gateway-boot/pom.xml b/springboot/fastbee-gateway/gateway-boot/pom.xml index f5191516..83ccb6f4 100644 --- a/springboot/fastbee-gateway/gateway-boot/pom.xml +++ b/springboot/fastbee-gateway/gateway-boot/pom.xml @@ -5,7 +5,7 @@ fastbee-gateway com.fastbee - 3.8.5 + ${fastbee.version} gateway-boot @@ -20,8 +20,6 @@ com.fastbee fastbee-mqtt-client - 3.8.5 - compile diff --git a/springboot/fastbee-gateway/pom.xml b/springboot/fastbee-gateway/pom.xml index 67bf0333..c5484fa4 100644 --- a/springboot/fastbee-gateway/pom.xml +++ b/springboot/fastbee-gateway/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${fastbee.version} pom diff --git a/springboot/fastbee-open-api/pom.xml b/springboot/fastbee-open-api/pom.xml index 549f17c8..d1673ceb 100644 --- a/springboot/fastbee-open-api/pom.xml +++ b/springboot/fastbee-open-api/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${fastbee.version} diff --git a/springboot/fastbee-plugs/fastbee-generator/pom.xml b/springboot/fastbee-plugs/fastbee-generator/pom.xml index 4242b221..404e3919 100644 --- a/springboot/fastbee-plugs/fastbee-generator/pom.xml +++ b/springboot/fastbee-plugs/fastbee-generator/pom.xml @@ -4,7 +4,7 @@ fastbee-plugs com.fastbee - 3.8.5 + ${fastbee.version} 4.0.0 @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/springboot/fastbee-plugs/fastbee-http/pom.xml b/springboot/fastbee-plugs/fastbee-http/pom.xml index 1c295765..4c9e5016 100644 --- a/springboot/fastbee-plugs/fastbee-http/pom.xml +++ b/springboot/fastbee-plugs/fastbee-http/pom.xml @@ -6,11 +6,10 @@ com.fastbee fastbee-plugs - 3.8.5 + ${fastbee.version} fastbee-http - 3.8.5 8 diff --git a/springboot/fastbee-plugs/fastbee-mqtt-client/pom.xml b/springboot/fastbee-plugs/fastbee-mqtt-client/pom.xml index bf0e12f6..9fa91d2d 100644 --- a/springboot/fastbee-plugs/fastbee-mqtt-client/pom.xml +++ b/springboot/fastbee-plugs/fastbee-mqtt-client/pom.xml @@ -5,7 +5,7 @@ fastbee-plugs com.fastbee - 3.8.5 + ${fastbee.version} fastbee-mqtt-client diff --git a/springboot/fastbee-plugs/fastbee-quartz/pom.xml b/springboot/fastbee-plugs/fastbee-quartz/pom.xml index e45e24d9..e27ec859 100644 --- a/springboot/fastbee-plugs/fastbee-quartz/pom.xml +++ b/springboot/fastbee-plugs/fastbee-quartz/pom.xml @@ -5,7 +5,7 @@ fastbee-plugs com.fastbee - 3.8.5 + ${fastbee.version} 4.0.0 @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/springboot/fastbee-plugs/fastbee-ruleEngine/pom.xml b/springboot/fastbee-plugs/fastbee-ruleEngine/pom.xml index 2e4a162d..3eaaff4f 100644 --- a/springboot/fastbee-plugs/fastbee-ruleEngine/pom.xml +++ b/springboot/fastbee-plugs/fastbee-ruleEngine/pom.xml @@ -6,7 +6,7 @@ com.fastbee fastbee-plugs - 3.8.5 + ${fastbee.version} fastbee-ruleEngine diff --git a/springboot/fastbee-plugs/pom.xml b/springboot/fastbee-plugs/pom.xml index a2bb4c2e..c311ae92 100644 --- a/springboot/fastbee-plugs/pom.xml +++ b/springboot/fastbee-plugs/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${fastbee.version} pom diff --git a/springboot/fastbee-protocol/fastbee-protocol-collect/pom.xml b/springboot/fastbee-protocol/fastbee-protocol-collect/pom.xml index 2524e2b8..e857d4b1 100644 --- a/springboot/fastbee-protocol/fastbee-protocol-collect/pom.xml +++ b/springboot/fastbee-protocol/fastbee-protocol-collect/pom.xml @@ -2,21 +2,19 @@ 4.0.0 + + fastbee-protocol + com.fastbee + ${fastbee.version} + + + fastbee-protocol-collect com.fastbee fastbee-iot-service - - fastbee-protocol - com.fastbee - 3.8.5 - - - - fastbee-protocol-collect - diff --git a/springboot/fastbee-protocol/pom.xml b/springboot/fastbee-protocol/pom.xml index c73f0536..6dbcb124 100644 --- a/springboot/fastbee-protocol/pom.xml +++ b/springboot/fastbee-protocol/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${fastbee.version} fastbee-protocol diff --git a/springboot/fastbee-server/base-server/pom.xml b/springboot/fastbee-server/base-server/pom.xml index 3cb96e4f..f43dda33 100644 --- a/springboot/fastbee-server/base-server/pom.xml +++ b/springboot/fastbee-server/base-server/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${fastbee.version} base-server diff --git a/springboot/fastbee-server/boot-strap/pom.xml b/springboot/fastbee-server/boot-strap/pom.xml index d0ec5509..63f42397 100644 --- a/springboot/fastbee-server/boot-strap/pom.xml +++ b/springboot/fastbee-server/boot-strap/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${fastbee.version} boot-strap 网关服务启动模块 @@ -24,8 +24,6 @@ com.fastbee base-server - 3.8.5 - compile diff --git a/springboot/fastbee-server/iot-server-core/pom.xml b/springboot/fastbee-server/iot-server-core/pom.xml index a008bbe2..f5feb158 100644 --- a/springboot/fastbee-server/iot-server-core/pom.xml +++ b/springboot/fastbee-server/iot-server-core/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${fastbee.version} iot-server-core diff --git a/springboot/fastbee-server/mqtt-broker/pom.xml b/springboot/fastbee-server/mqtt-broker/pom.xml index 806cadfd..fa2327ea 100644 --- a/springboot/fastbee-server/mqtt-broker/pom.xml +++ b/springboot/fastbee-server/mqtt-broker/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${fastbee.version} mqtt-broker @@ -24,8 +24,6 @@ com.fastbee fastbee-mqtt-client - 3.8.5 - compile diff --git a/springboot/fastbee-server/pom.xml b/springboot/fastbee-server/pom.xml index 521144e4..7dea3da5 100644 --- a/springboot/fastbee-server/pom.xml +++ b/springboot/fastbee-server/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${fastbee.version} pom @@ -36,7 +36,6 @@ com.fastbee fastbee-common - 3.8.5 diff --git a/springboot/fastbee-server/sip-server/pom.xml b/springboot/fastbee-server/sip-server/pom.xml index f8dcf917..3a65bf3a 100644 --- a/springboot/fastbee-server/sip-server/pom.xml +++ b/springboot/fastbee-server/sip-server/pom.xml @@ -5,7 +5,7 @@ fastbee-server com.fastbee - 3.8.5 + ${fastbee.version} sip-server @@ -71,8 +71,6 @@ com.fastbee fastbee-mqtt-client - 3.8.5 - compile diff --git a/springboot/fastbee-service/fastbee-iot-service/pom.xml b/springboot/fastbee-service/fastbee-iot-service/pom.xml index b6b0399c..b44ca5d4 100644 --- a/springboot/fastbee-service/fastbee-iot-service/pom.xml +++ b/springboot/fastbee-service/fastbee-iot-service/pom.xml @@ -5,7 +5,7 @@ fastbee-service com.fastbee - 3.8.5 + ${fastbee.version} 4.0.0 diff --git a/springboot/fastbee-service/fastbee-system-service/pom.xml b/springboot/fastbee-service/fastbee-system-service/pom.xml index 5887c774..cacc9adb 100644 --- a/springboot/fastbee-service/fastbee-system-service/pom.xml +++ b/springboot/fastbee-service/fastbee-system-service/pom.xml @@ -5,7 +5,7 @@ fastbee-service com.fastbee - 3.8.5 + ${fastbee.version} 4.0.0 @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/springboot/fastbee-service/pom.xml b/springboot/fastbee-service/pom.xml index a76ddc70..f3bd66bf 100644 --- a/springboot/fastbee-service/pom.xml +++ b/springboot/fastbee-service/pom.xml @@ -5,7 +5,7 @@ fastbee com.fastbee - 3.8.5 + ${fastbee.version} pom fastbee-service diff --git a/springboot/pom.xml b/springboot/pom.xml index 87bc4097..534796ad 100644 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -6,14 +6,15 @@ com.fastbee fastbee - 3.8.5 + ${fastbee.version} fastbee http://fastbee.cn FastBee物联网平台 - 3.8.5 + 3.8.5 + 2.1.0 UTF-8 UTF-8 1.8 @@ -350,6 +351,12 @@ ${fastbee.version} + + com.fastbee + fastbee-mqtt-client + ${fastbee.version} + + org.mapstruct mapstruct