From 5fdc5059555e7a4cf533b7bfdb79025f23fa2b6a Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 26 六月 2019 14:53:46 +0800
Subject: [PATCH] task with zhangmeng ok release 2

---
 tasktag/tasktag.go |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/tasktag/tasktag.go b/tasktag/tasktag.go
index 5f6cb8e..8afacbb 100644
--- a/tasktag/tasktag.go
+++ b/tasktag/tasktag.go
@@ -8,7 +8,6 @@
 	"github.com/long/test/util"
 )
 
-//var TaskMapLab = make(map[string]*protomsg.TaskLabel)
 var TaskMapLab sync.Map
 
 func Init() {
@@ -29,31 +28,28 @@
 	for _, taskSdk := range util.TaskSdks {
 		var tl protomsg.TaskLabel
 		tl.Taskid = taskSdk.Task.Taskid
+        tl.Taskname = taskSdk.Task.Taskname
 		for _, sdkinfo := range taskSdk.Sdks {
-			tl.Sdkids = append(tl.Sdkids, sdkinfo.Id)
+            sdkinfowithtask := new(protomsg.SdkmsgWithTask) 
+            sdkinfowithtask.Sdkid = sdkinfo.Id
+            sdkinfowithtask.Sdktype = sdkinfo.SdkType
+            sdkinfowithtask.SdkName = sdkinfo.SdkName
+            sdkinfowithtask.Sdkdata = make([]byte, 1)
+            tl.Sdkinfos = append(tl.Sdkinfos, sdkinfowithtask)
 		}
 		tl.Index = int32(0)
 		tls = append(tls, tl)
 	}
-
 	GenTasklab(tls)
-
 	TaskMapLab.Range(func(k, v interface{}) bool {
 		fmt.Println(k, v)
 		return true
 	})
-
-	//for key, value := range TaskMapLab {
-	//	fmt.Println()
-	//	fmt.Println(key, value)
-	//}
 }
 
 // 浠巗qlite 鎺ュ彛鎷垮埌鎵�鏈夌殑浠诲姟, 姣忎竴涓换鍔¢兘鏈夎嚜宸辩殑鍑犱釜绠楁硶
 //浠� taskid 浣滀负key, 瀵瑰簲鐨勭畻娉曠粍鍚堜綔涓� value
 func GenTasklab(tasklab []protomsg.TaskLabel) {
-	// TaskMapLab = nil
-	// TaskMapLab = make(map[string]*protomsg.TaskLabel)
 	TaskMapLab.Range(func(key interface{}, value interface{}) bool {
 		TaskMapLab.Delete(key)
 		return true
@@ -62,6 +58,5 @@
 	for _, value := range tasklab {
 		pv := value
 		TaskMapLab.Store(value.Taskid, &pv)
-		//TaskMapLab[value.Taskid] = &pv
 	}
 }

--
Gitblit v1.8.0