Merge branch 'v2' of http://gogs.yehaoji.cn/yongxu/sparrow into v2

pkg/klink/klink.go

@@ -86,8 +86,8 @@ type DevSendData struct {
 }
 
 type CloudSendData struct {
-	Cmd    string      `json:"cmd"`
-	Params *gjson.Json `json:"params"`
+	Cmd    string                 `json:"cmd"`
+	Params map[string]interface{} `json:"params"`
 }
 
 type CloudSend struct {

services/httpaccess/actions.go

@@ -53,8 +53,6 @@ type DeviceAuthArgs struct {
 // RegisterDevice 设备激活
 func RegisterDevice(args DeviceRegisterArgs, r render.Render) {
 	server.Log.Printf("ACTION RegisterDevice, args:: %v ", args)
-	span, ctx := opentracing.StartSpanFromContext(context.Background(), "RegisterDevice")
-	defer span.Finish()
 
 	rpcargs := &rpcs.ArgsDeviceRegister{
 		ProductKey:    args.ProductKey,
@@ -63,8 +61,7 @@ func RegisterDevice(args DeviceRegisterArgs, r render.Render) {
 		ModuleName:    args.ModuleName,
 	}
 	device := &models.Device{}
-	ext.SpanKindRPCClient.Set(span)
-	err := server.RPCCallByName(ctx, rpcs.RegistryServerName, "Registry.RegisterDevice", rpcargs, device)
+	err := server.RPCCallByName(nil, rpcs.RegistryServerName, "Registry.RegisterDevice", rpcargs, device)
 	if err != nil {
 		r.JSON(http.StatusOK, renderError(ErrSystemFault, err))
 		return

services/mqttaccess/access.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"github.com/gogf/gf/encoding/gjson"
 	"sparrow/pkg/klink"
 	"sparrow/pkg/mqtt"
 	"sparrow/pkg/protocol"
@@ -66,7 +65,7 @@ func (a *Access) SendCommand(args rpcs.ArgsSendCommand, reply *rpcs.ReplySendCom
 		Timestamp:   time.Now().Unix(),
 		Data: &klink.CloudSendData{
 			Cmd:    args.Cmd,
-			Params: gjson.New(args.Params),
+			Params: args.Params,
 		},
 	}
 	msg, err := cmd.Marshal()

services/mqttaccess/mqtt_provider.go

@@ -45,7 +45,9 @@ func (mp *MQTTProvider) OnDeviceOnline(args rpcs.ArgsGetOnline, VendorId string)
 	return err
 }
 func (mp *MQTTProvider) OnDeviceOffline(deviceid string, vendorId string) error {
-	deviceOnlineCount.Dec()
+	if deviceid != "" {
+		deviceOnlineCount.Dec()
+	}
 	args := rpcs.ArgsGetOffline{
 		Id:       deviceid,
 		VendorId: vendorId,