Merge branch 'master' of ssh://119.23.72.7:22611/q578953158/go_sku_server

controller/sku_controller.go

@@ -45,33 +45,33 @@ func Synchronization(ctx *gin.Context) {
 	goodsIdArr := php2go.Explode(",", GoodsIdStr)
 	//wg := sync.WaitGroup{} //协程
 	ch := make(chan sync.Map) //管道
-    p := 0; //总共协程
+	p := 0                    //总共协程
 
 	zyGoodsId := make([]string, 0)
 	lyGoodsId := make([]string, 0)
-	for _, goods_id := range goodsIdArr {
-		if goods_id == "" {
-			continue;
+	for _, goodsId := range goodsIdArr {
+		if goodsId == "" {
+			continue
 		}
-		if len(goods_id) < 19 { //自营
-			zyGoodsId = append(zyGoodsId, goods_id)
+		if len(goodsId) < 19 { //自营
+			zyGoodsId = append(zyGoodsId, goodsId)
 			if len(zyGoodsId) >= goods_slice_count {
 				common.PrintDebugHtml(ctx, "zy增加协程1001：")
 				common.PrintDebugHtml(ctx, zyGoodsId)
 				//wg.Add(1) //协程计数一
 				go zyService.ZyGoodsDetail(ctx, zyGoodsId, ch)
 				zyGoodsId = zyGoodsId[:0:0]
-				p ++;
+				p++
 			}
 		} else { //联营
-			lyGoodsId = append(lyGoodsId, goods_id)
+			lyGoodsId = append(lyGoodsId, goodsId)
 			if len(lyGoodsId) >= goods_slice_count {
 				common.PrintDebugHtml(ctx, "ly增加协程1002：")
 				common.PrintDebugHtml(ctx, lyGoodsId)
 				//wg.Add(1)
 				go lyService.LyGoodsDetail(ctx, lyGoodsId, ch)
 				lyGoodsId = lyGoodsId[:0:0]
-				p ++;
+				p++
 			}
 		}
 	}
@@ -81,7 +81,7 @@ func Synchronization(ctx *gin.Context) {
 		common.PrintDebugHtml(ctx, zyGoodsId)
 		//wg.Add(1) //协程计数一
 		go zyService.ZyGoodsDetail(ctx, zyGoodsId, ch)
-		p ++;
+		p++
 	}
 
 	if len(lyGoodsId) > 0 {
@@ -89,7 +89,7 @@ func Synchronization(ctx *gin.Context) {
 		common.PrintDebugHtml(ctx, zyGoodsId)
 		//wg.Add(1)
 		go lyService.LyGoodsDetail(ctx, lyGoodsId, ch)
-		p ++;
+		p++
 	}
 	//wg.Wait()
 
@@ -97,22 +97,21 @@ func Synchronization(ctx *gin.Context) {
 	temp := make(map[string]interface{})
 	for i := 0; i < p; i++ {
 		select {
-		case GoodsRes := <- ch:
+		case GoodsRes := <-ch:
 			GoodsRes.Range(func(k, v interface{}) bool {
 				s, _ := k.(string)
 				temp[s] = v
 				return true
 			})
 
-		case <- time.After(time.Second *6):
-			logger.Log("协程超时","sku",1)
+		case <-time.After(time.Second * 6):
+			logger.Log("协程超时", "sku", 1)
 		}
 	}
 
 	common.Output(ctx, 0, "success", temp)
 }
 
-
 /*
 健康监测
 */