增加 supplier_name 字段

doc/redis_config_generate.go

@@ -56,7 +56,7 @@ func generate()  {
 //白名单配置
 //白名单配置
 func whiteIp()  {
 func whiteIp()  {
 	redisKey:=openWhiteList
 	redisKey:=openWhiteList
-	whiteList:=[]string{
+	/*whiteList:=[]string{
 		"127.0.0.1",
 		"127.0.0.1",
 		"127.0.0.2",
 		"127.0.0.2",
 		"192.168.2.72",
 		"192.168.2.72",
@@ -64,8 +64,27 @@ func whiteIp()  {
 		"192.168.2.241",
 		"192.168.2.241",
 		"192.168.1.1",
 		"192.168.1.1",
 		"192.168.2.129",
 		"192.168.2.129",
+	}*/
+
+	//线上配置
+	whiteList:=[]string{
+		"127.0.0.1",
+		"::1",
+		"119.123.78.115",
+		"172.18.137.41",
+		"172.18.137.42",
+		"192.168.2.129",
+		"19.123.78.115",
+		"222.92.21.99",
+		"::1",
 	}
 	}
 
 
+	/*whiteList:=[]string{
+		"172.18.137.41",
+		"::1",
+	}*/
+
+
 	fmt.Println("白名单配置:"+redisKey)
 	fmt.Println("白名单配置:"+redisKey)
 	redisStringSet(redisKey,whiteList)
 	redisStringSet(redisKey,whiteList)
 }
 }
@@ -76,7 +95,7 @@ func  businessList() {
 
 
 	businessList:=[]string{
 	businessList:=[]string{
 		jdToken,//京东
 		jdToken,//京东
-		baiduToken,//百度
+		//baiduToken,//百度
 	}
 	}
 	fmt.Println("商家列表:key:"+redisKey)
 	fmt.Println("商家列表:key:"+redisKey)
 	redisStringSet(redisKey,businessList)
 	redisStringSet(redisKey,businessList)
@@ -126,8 +145,8 @@ func redisHashSet(key string,values map[string]interface{})  {
 		b,_=json.Marshal(string(b))
 		b,_=json.Marshal(string(b))
 		hsetStr:="Hset "+key+" "+string(hashk)+" "+string(b)
 		hsetStr:="Hset "+key+" "+string(hashk)+" "+string(b)
 		fmt.Println(hsetStr)
 		fmt.Println(hsetStr)
-		fmt.Println("对应计时的min key\nflowUse_"+hashk+"_min")
-		fmt.Println("对应计时的day key\nflowUse_"+hashk+"_day")
+		//fmt.Println("对应计时的min key\nflowUse_"+hashk+"_min")
+		//fmt.Println("对应计时的day key\nflowUse_"+hashk+"_day")
 	}
 	}
 }
 }
 
 

service/service_sku.go

@@ -54,7 +54,7 @@ func (this *SkuService)GetSkuListByClass(req *model.QuerySkuCreq) (rsp *model.Qu
 				return rsp,e.NewApiError("service error",open.REMOTESKUINFO)
 				return rsp,e.NewApiError("service error",open.REMOTESKUINFO)
 			}
 			}
 			field:=[]string{"goods_id","spu_id","brand_id","brand_name","goods_name", "stock","moq","mpq",
 			field:=[]string{"goods_id","spu_id","brand_id","brand_name","goods_name", "stock","moq","mpq",
-				"class_id1","class_id2","class_id1_name","class_id2_name","attrs","ladder_price",}
+				"class_id1","class_id2","class_id1_name","class_id2_name","attrs","ladder_price","supplier_name",}
 
 
 			//field:=[]string{"spu_id","attrs","supplier_name","goods_images","hk_delivery_time"}
 			//field:=[]string{"spu_id","attrs","supplier_name","goods_images","hk_delivery_time"}
 			rsp.SkuData=model.SkuFilter(*remoteData,field)
 			rsp.SkuData=model.SkuFilter(*remoteData,field)
@@ -77,7 +77,7 @@ func (this *SkuService) GetSkuListFull(req * model.QuerySkuReq)(rsp *model.Query
 	//            "class_id1_name": "处理器及微控制器",
 	//            "class_id1_name": "处理器及微控制器",
 	//            "class_id2_name": "ADI(亚德诺)",
 	//            "class_id2_name": "ADI(亚德诺)",
 	field:=[]string{"goods_id","spu_id","brand_id","brand_name","goods_name", "stock","moq","mpq",
 	field:=[]string{"goods_id","spu_id","brand_id","brand_name","goods_name", "stock","moq","mpq",
-		"class_id1","class_id2","class_id1_name","class_id2_name","attrs","ladder_price",}
+		"class_id1","class_id2","class_id1_name","class_id2_name","attrs","ladder_price","supplier_name"}
 	rsp.SkuData=model.SkuFilter(*remoteData,field)
 	rsp.SkuData=model.SkuFilter(*remoteData,field)
 	return
 	return
 }
 }