test: device token

pkg/mqtt/connection.go

@@ -229,6 +229,10 @@ func (c *Connection) RcvMsgFromClient() {
 			server.Log.Infof("device %d, connected to server now, host: %s", c.DeviceID, host)
 
 		case *Publish:
+			if msg.MessageID < c.MessageID {
+				return
+			}
+			c.MessageID = msg.MessageID
 			server.Log.Infof("%s, publish topic: %s， msgId: %v", host, msg.TopicName, msg.MessageID)
 			err = c.Mgr.PublishMessage2Server(c.DeviceCode, c.VendorId, msg)
 			if err != nil {

pkg/token/token.go

@@ -1,6 +1,7 @@
 package token
 
 import (
+	"encoding/hex"
 	"errors"
 	"github.com/gogf/gf/database/gredis"
 	"reflect"
@@ -39,7 +40,7 @@ func (helper *Helper) GenerateToken(recordId string) ([]byte, error) {
 
 	key := DeviceTokenKeyPrefix + recordId
 
-	_, err = helper.redisClient.Do("SET", key, token)
+	_, err = helper.redisClient.Do("SET", key, hex.EncodeToString(token))
 	if err != nil {
 		return nil, err
 	}
@@ -59,7 +60,7 @@ func (helper *Helper) ValidateToken(id string, token []byte) error {
 		return err
 	}
 
-	if !reflect.DeepEqual(readToken, token) {
+	if hex.EncodeToString(token) != readToken {
 		return errors.New("token not match")
 	}
 

services/mqttaccess/mqtt_provider.go

@@ -17,15 +17,15 @@ func NewMQTTProvider() *MQTTProvider {
 }
 
 func (mp *MQTTProvider) ValidateDeviceToken(deviceid string, token []byte) error {
-	args := rpcs.ArgsValidateDeviceAccessToken{
-		Id:          deviceid,
-		AccessToken: token,
-	}
-	reply := rpcs.ReplyValidateDeviceAccessToken{}
-	err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.ValidateDeviceAccessToken", args, &reply)
-	if err != nil {
-		return err
-	}
+	//args := rpcs.ArgsValidateDeviceAccessToken{
+	//	Id:          deviceid,
+	//	AccessToken: token,
+	//}
+	//reply := rpcs.ReplyValidateDeviceAccessToken{}
+	//err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.ValidateDeviceAccessToken", args, &reply)
+	//if err != nil {
+	//	return err
+	//}
 	return nil
 }
 func (mp *MQTTProvider) OnDeviceOnline(args rpcs.ArgsGetOnline, VendorId string) error {