|
|
@@ -12,8 +12,8 @@ import (
|
|
|
)
|
|
|
|
|
|
const (
|
|
|
- MODULE_NAME = "Reporter"
|
|
|
- DefaultQoS = 1
|
|
|
+ MODULE_NAME = "Reporter"
|
|
|
+ DefaultQoS byte = 1
|
|
|
)
|
|
|
|
|
|
var Reporter *MQTTReporter
|
|
|
@@ -106,6 +106,11 @@ func (r *MQTTReporter) initYFKJClient(server MQTTServer, devID string) error {
|
|
|
return fmt.Errorf("服务器名称重复")
|
|
|
}
|
|
|
|
|
|
+ qos := DefaultQoS
|
|
|
+ if server.Qos == MqttQos0 || server.Qos == MqttQos1 || server.Qos != MqttQos2 {
|
|
|
+ qos = server.Qos
|
|
|
+ }
|
|
|
+
|
|
|
config := ClientConfig{
|
|
|
Broker: server.BrokerAddress,
|
|
|
BrokerName: server.Name,
|
|
|
@@ -114,7 +119,7 @@ func (r *MQTTReporter) initYFKJClient(server MQTTServer, devID string) error {
|
|
|
Password: server.Password,
|
|
|
WillTopic: server.Topics.Offline,
|
|
|
WillPayload: fmt.Sprintf(`{"cmd":"offline","ext":{"imei":"%s"}}`, devID),
|
|
|
- WillQos: DefaultQoS,
|
|
|
+ WillQos: qos,
|
|
|
WillRetained: false,
|
|
|
}
|
|
|
|
|
|
@@ -130,7 +135,7 @@ func (r *MQTTReporter) initYFKJClient(server MQTTServer, devID string) error {
|
|
|
}
|
|
|
|
|
|
subTopic := server.Topics.Sub
|
|
|
- err = client.Subscribe(subTopic, DefaultQoS, yfkj_handleMessage)
|
|
|
+ err = client.Subscribe(subTopic, qos, yfkj_handleMessage)
|
|
|
if err != nil {
|
|
|
client.Close()
|
|
|
return fmt.Errorf("主题%s订阅失败: %w", subTopic, err)
|