lijian 4 سال پیش
والد
کامیت
4ea1acff39
3فایلهای تغییر یافته به همراه15 افزوده شده و 26 حذف شده
  1. 0 2
      pkg/mqtt/connection.go
  2. 0 2
      services/httpaccess/actions.go
  3. 15 22
      services/registry/registry.go

+ 0 - 2
pkg/mqtt/connection.go

@@ -142,8 +142,6 @@ func (c *Connection) RcvMsgFromClient() {
 			c.Close()
 			return
 		}
-
-		server.Log.Infof("%s, come msg===\n%v\n=====", host, msg)
 		c.LastHbTime = time.Now().Unix()
 		switch msg := msg.(type) {
 		case *Connect:

+ 0 - 2
services/httpaccess/actions.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/hex"
 	"errors"
-	"fmt"
 	"math/rand"
 	"net/http"
 	"sparrow/pkg/models"
@@ -100,7 +99,6 @@ func AuthDevice(args DeviceAuthArgs, r render.Render) {
 	}
 
 	if device.DeviceSecret != args.DeviceSecret {
-		fmt.Printf("%s, %s\r\n", device.DeviceSecret, args.DeviceSecret)
 		// device secret is wrong.
 		r.JSON(http.StatusOK, renderError(ErrWrongSecret, errors.New("wrong device secret.")))
 		return

+ 15 - 22
services/registry/registry.go

@@ -368,9 +368,7 @@ func (r *Registry) FindDeviceByIdentifier(identifier string, reply *models.Devic
 		if err != nil {
 			return err
 		}
-		var storage models.Device
-		storage = *reply
-		cache.Set(cacheKey, &storage)
+		cache.Set(cacheKey, &reply)
 	}
 
 	return nil
@@ -381,22 +379,20 @@ func (r *Registry) FindDeviceById(args uint64, reply *models.Device) error {
 	if err != nil {
 		return err
 	}
-	cache := getCache()
-	key := fmt.Sprintf("Device:%v", args)
-	if v, ok := cache.Get(key);ok {
-		device := v.(*models.Device)
-		setDevice(reply, device)
-		fmt.Printf("%v\r\n", device)
-	} else {
-		d := &models.Device{}
-		d.ID = uint(args)
-		err = db.Where(d).First(reply).Error
-		if err != nil {
-			return err
-		}
-		cache.Set(key, reply)
+	//cache := getCache()
+	//key := fmt.Sprintf("Device:%v", args)
+	//if v, ok := cache.Get(key);ok {
+	//	device := v.(*models.Device)
+	//	setDevice(reply, device)
+	//} else {
+	d := &models.Device{}
+	d.ID = uint(args)
+	err = db.Where(d).First(reply).Error
+	if err != nil {
+		return err
 	}
-
+	//	cache.Set(key, reply)
+	//}
 
 	return nil
 }
@@ -409,7 +405,7 @@ func (r *Registry) FindDeviceByRecordId(args *rpcs.ArgsDeviceAuth, reply *models
 	}
 	cache := getCache()
 	key := fmt.Sprintf("Device:%v", args.DeviceID)
-	if v, ok := cache.Get(key);ok {
+	if v, ok := cache.Get(key); ok {
 		device := v.(*models.Device)
 		setDevice(reply, device)
 	} else {
@@ -424,12 +420,9 @@ func (r *Registry) FindDeviceByRecordId(args *rpcs.ArgsDeviceAuth, reply *models
 		cache.Set(key, &storage)
 	}
 
-
 	return nil
 }
 
-
-
 // ValidateDevice will validate a device key and return the model if success.
 func (r *Registry) ValidateDevice(key string, device *models.Device) error {
 	id, err := r.keygen.DecodeIDFromRandomKey(key)