From a6154279e7a78cd3faee198a3036dd599c20691e Mon Sep 17 00:00:00 2001 From: fish Date: Mon, 24 Jun 2019 10:01:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=B0=E6=8D=AE=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=BB=A5=E5=8F=8Afix=E9=97=A8=E7=A3=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- loadconfig.go | 2 -- router.go | 6 +++++- tcpserver.go | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/loadconfig.go b/loadconfig.go index e0426f3..31c47ad 100644 --- a/loadconfig.go +++ b/loadconfig.go @@ -120,8 +120,6 @@ var db, _ = sql.Open("sqlite3", "./db/gateway.db") // 加载配置文件 func init() { - - t := time.Now() today = t.Format("2006-01-02") diff --git a/router.go b/router.go index fef3b53..569532f 100644 --- a/router.go +++ b/router.go @@ -498,7 +498,11 @@ func changeDataV2(loraNode LoraNode){ // log.Println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@00000:",loraNode) // log.Println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@11111:",DEVICEDATAS.DATA[loraNode.DEVICE]) DEVICEDATAS.RLock() - DEVICEDATAS.DATA[loraNode.DEVICE].DATA[loraNode.LOCATION_DATA] = loraNode.CURRENT_DATA + if DEVICEDATAS.DATA[loraNode.DEVICE]!=nil{ + DEVICEDATAS.DATA[loraNode.DEVICE].DATA[loraNode.LOCATION_DATA] = loraNode.CURRENT_DATA + }else{ + log.Println("changeDataV2.DEVICEDATAS not init") + } DEVICEDATAS.RUnlock() log.Println("yunhorndeug.push.data.change:",DEVICEDATAS.DATA[loraNode.DEVICE]) // log.Println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@") diff --git a/tcpserver.go b/tcpserver.go index c111802..db779c7 100644 --- a/tcpserver.go +++ b/tcpserver.go @@ -189,8 +189,8 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) { continue } - // values = data[i+2:i+3] - values := data[i+2] + values = data[i+2:i+end] + // values = data[i+2] //28 3C 00 00 47 46 // var green []byte = []byte{0x28,0x3C,0x00,0x00,0x47,0x46}