Browse Source

删除多余参数

yjp 2 years ago
parent
commit
144ec12871

+ 1 - 2
mqtt_binding/mqtt_binding.go

@@ -35,7 +35,6 @@ func Bind[I any, O any](b *Binding, item *BindItem[I, O], handlers ...router.Han
 // BindItem 路由条目结构
 type BindItem[I any, O any] struct {
 	Topic               string               // 请求路径
-	Qos                 byte                 // QOS
 	ResponseFunc        response.SendFunc[O] // 响应泛型函数
 	BusinessFunc        BusinessFunc[I, O]   // 业务泛型函数
 	OptionalBindingFunc BindingFunc[O]       // 可选的绑定函数
@@ -91,7 +90,7 @@ func (item *BindItem[I, O]) bind(r *router.Router, handlers ...router.Handler) {
 	})
 
 	// 所有的函数加入到执行链中
-	routerItem, err := router.NewItem(r.Group+item.Topic, item.Qos, handlers)
+	routerItem, err := router.NewItem(r.Group+item.Topic, handlers)
 	if err != nil {
 		panic("创建路由条目失败: " + err.Error())
 		return

+ 3 - 3
mqtt_binding/mqtt_client/mqtt_client.go

@@ -129,7 +129,7 @@ func (c *MqttClient) GetRouter(group string, handlers []router.Handler) *router.
 		}
 
 		err := item.DoIfUnSubscribe(func() error {
-			token := c.client.Subscribe(item.Topic, item.Qos, func(client mqtt.Client, message mqtt.Message) {
+			token := c.client.Subscribe(item.Topic, 2, func(client mqtt.Client, message mqtt.Message) {
 				item.CallHandlers(message.Payload())
 			})
 			if token.Wait(); token.Error() != nil {
@@ -151,7 +151,7 @@ func (c *MqttClient) GetRouter(group string, handlers []router.Handler) *router.
 }
 
 func (c *MqttClient) Response(item *router.Item, data []byte) error {
-	token := c.client.Publish(item.Topic+"/reply", item.Qos, false, data)
+	token := c.client.Publish(item.Topic+"/reply", 2, false, data)
 	if token.Wait(); token.Error() != nil {
 		return token.Error()
 	}
@@ -163,7 +163,7 @@ func (c *MqttClient) onConnect() error {
 	err := c.rangeRouters(func(r *router.Router) error {
 		err := r.RangeItem(func(item *router.Item) error {
 			err := item.DoIfUnSubscribe(func() error {
-				token := c.client.Subscribe(item.Topic, item.Qos, func(client mqtt.Client, message mqtt.Message) {
+				token := c.client.Subscribe(item.Topic, 2, func(client mqtt.Client, message mqtt.Message) {
 					item.CallHandlers(message.Payload())
 				})
 				if token.Wait(); token.Error() != nil {

+ 1 - 3
mqtt_binding/mqtt_client/router/router.go

@@ -85,7 +85,6 @@ func (router *Router) RangeItem(rangeFunc func(item *Item) error) error {
 
 type Item struct {
 	Topic string
-	Qos   byte
 
 	subscribedMutex *sync.Mutex
 	subscribed      bool
@@ -95,14 +94,13 @@ type Item struct {
 	currentData         []byte
 }
 
-func NewItem(topic string, qos byte, handlers []Handler) (*Item, error) {
+func NewItem(topic string, handlers []Handler) (*Item, error) {
 	if utils.IsStringEmpty(topic) {
 		return nil, errors.New("没有传递主题")
 	}
 
 	return &Item{
 		Topic:               topic,
-		Qos:                 qos,
 		subscribedMutex:     &sync.Mutex{},
 		subscribed:          false,
 		handlers:            handlers,

+ 0 - 1
mqtt_binding_test.go

@@ -36,7 +36,6 @@ func TestMqttBinding(t *testing.T) {
 		Time string `json:"time"`
 	}, map[string]interface{}]{
 		Topic:        "/test-topic",
-		Qos:          2,
 		ResponseFunc: response.SendMapResponse,
 		BusinessFunc: func(c *mqtt_client.MqttClient, inputModel struct {
 			Time string `json:"time"`