Merge branch 'v2' of http://192.168.0.224:3000/yongxu/sparrow into v2

services/apiprovider/router.go

@@ -39,22 +39,22 @@ func route(m *martini.ClassicMartini) {
 
 		// get devie current status
 		r.Get("/devices/:identifier/status/current",
-			ApplicationAuthOnDeviceIdentifer, CheckDeviceOnline, CheckProductConfig,
+			ApplicationAuthOnDeviceIdentifer, CheckDeviceOnline,
 			GetDeviceCurrentStatus)
 
 		// get devie latest status
 		r.Get("/devices/:identifier/status/latest",
-			ApplicationAuthOnDeviceIdentifer, CheckDeviceOnline, CheckProductConfig,
+			ApplicationAuthOnDeviceIdentifer, CheckDeviceOnline,
 			GetDeviceLatestStatus)
 
 		// set device status
 		r.Put("/devices/:identifier/status",
-			ApplicationAuthOnDeviceIdentifer, CheckDeviceOnline, CheckProductConfig,
+			ApplicationAuthOnDeviceIdentifer, CheckDeviceOnline,
 			SetDeviceStatus)
 
 		// send a command to device
 		r.Post("/devices/:identifier/commands",
-			ApplicationAuthOnDeviceIdentifer, CheckDeviceOnline, CheckProductConfig,
+			ApplicationAuthOnDeviceIdentifer, CheckDeviceOnline,
 			SendCommandToDevice)
 
 		// and a rule to device

services/knowoapi/services/rule_chain.go

@@ -9,14 +9,6 @@ import (
 	"sparrow/services/knowoapi/model"
 )
 
-var nodeType = map[string]string{
-	"MsgTypeFilter":     "MsgTypeFilterNode",
-	"MsgTypeSwitchNode": "MsgTypeSwitchNode",
-	"JavascriptFilter":  "FilterJavascriptNode",
-	"RestApiAction":     "RestApiRequestNode",
-	"InfluxDBNode":      "InfluxDBNode",
-}
-
 // RuleChainService 业务接口
 type RuleChainService interface {
 	Create(*models.RuleChain) error
@@ -90,7 +82,7 @@ func (a ruleChainService) create(params *models.RuleChainParams) (firstNodeId st
 				RecordId:      guid.S(),
 				RuleChainID:   params.RecordId,
 				Configuration: v.GetString("data"),
-				Type:          nodeType[v.GetString("data.type")],
+				Type:          v.GetString("data.type"),
 				Name:          v.GetString("data.name"),
 				DebugModel:    true,
 				Intro:         v.GetString("data.desc"),