Commit 35d91068 by huangchengyi

Merge branch 'hcy-2020.11.25-soucegine'

# Conflicts:
#	service/ly/sourceability.go
parents d9bd172e 7f202186
package controller
import (
"github.com/gin-gonic/gin"
"search_server/pkg/common"
"search_server/service/ly"
)
//搜索 sourcegine 型号,返回格式化后的原始数据
func GetSourceabilityData(ctx *gin.Context) {
goodsName := ctx.Request.FormValue("k") //关键词
common.PrintDebugHeader(ctx) //debug
if ctx.Request.FormValue("flag") == "1" {
ctx.String(200,`{"error_code":0,"err_msg":"","data":{"LM358AD-1438416474":{"goods_sn":"LM358AD-1438416474","goods_name":"LM358AD","brand_name":"STMICROELECTRONICS","desc":"Low input bias current","docurl":"","url":"","goods_img":"","cat":"","stock":[1613,19924],"increment":1,"price_temp":[[1613,0.13307],[10000,0.12621]],"tiered":[{"purchases":1613,"price_us":0.13307,"price_cn":0,"price_ac":0},{"purchases":10000,"price_us":0.12621,"price_cn":0,"price_ac":0}],"single_price":0.12621},"LM358MX-1840114430":{"goods_sn":"LM358MX-1840114430","goods_name":"LM358MX","brand_name":"Texas Instruments Incorporated","desc":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDSO8","docurl":"","url":"","goods_img":"","cat":"","stock":[782,2187],"increment":1,"price_temp":[[782,0.4928],[790,0.48752],[1600,0.47608]],"tiered":[{"purchases":782,"price_us":0.4928,"price_cn":0,"price_ac":0},{"purchases":790,"price_us":0.48752,"price_cn":0,"price_ac":0},{"purchases":1600,"price_us":0.47608,"price_cn":0,"price_ac":0}],"single_price":0.47608},"LM358H-1840114428":{"goods_sn":"LM358H-1840114428","goods_name":"LM358H","brand_name":"Texas Instruments Incorporated","desc":"Operational Amplifier, 2 Func, 9000uV Offset-Max, BIPolar, MBCY8","docurl":"","url":"","goods_img":"","cat":"","stock":[68,2736],"increment":1,"price_temp":[[68,5.7134],[70,5.65219],[140,5.51956],[340,5.40733],[680,5.3053]],"tiered":[{"purchases":68,"price_us":5.7134,"price_cn":0,"price_ac":0},{"purchases":70,"price_us":5.65219,"price_cn":0,"price_ac":0},{"purchases":140,"price_us":5.51956,"price_cn":0,"price_ac":0},{"purchases":340,"price_us":5.40733,"price_cn":0,"price_ac":0},{"purchases":680,"price_us":5.3053,"price_cn":0,"price_ac":0}],"single_price":5.3053},"LM358P-1503747557":{"goods_sn":"LM358P-1503747557","goods_name":"LM358P","brand_name":"Texas Instruments Incorporated","desc":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDIP8","docurl":"","url":"","goods_img":"","cat":"","stock":[709,1520],"increment":1,"price_temp":[[709,0.07768]],"tiered":[{"purchases":709,"price_us":0.07768,"price_cn":0,"price_ac":0}],"single_price":0.07768},"LM358ST-1932800621":{"goods_sn":"LM358ST-1932800621","goods_name":"LM358ST","brand_name":"STMICROELECTRONICS","desc":"Low-power dual op-amps with low input bias current","docurl":"","url":"","goods_img":"","cat":"","stock":[4000,20000],"increment":1,"price_temp":[[4000,0.09544],[8000,0.09471],[16000,0.09398]],"tiered":[{"purchases":4000,"price_us":0.09544,"price_cn":0,"price_ac":0},{"purchases":8000,"price_us":0.09471,"price_cn":0,"price_ac":0},{"purchases":16000,"price_us":0.09398,"price_cn":0,"price_ac":0}],"single_price":0.09398},"LM358DR-1503747545":{"goods_sn":"LM358DR-1503747545","goods_name":"LM358DR","brand_name":"Texas Instruments Incorporated","desc":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDSO8","docurl":"","url":"","goods_img":"","cat":"","stock":[1021,5190],"increment":1,"price_temp":[[1021,0.0539]],"tiered":[{"purchases":1021,"price_us":0.0539,"price_cn":0,"price_ac":0}],"single_price":0.0539}}}`)
return
}
if goodsName == "" {
common.Output(ctx,1001, "查询关键词不得为空", "")
return
}
//调外链拿数据
apiData := ly.OutLinkSource(ctx,&goodsName)
common.Output(ctx,0,"",apiData)
}
\ No newline at end of file
package controller
import (
"github.com/gin-gonic/gin"
"search_server/pkg/common"
"search_server/service/ly"
)
//搜索 sourcegine 型号,返回格式化后的原始数据
func GetSourcengineData(ctx *gin.Context) {
goodsName := ctx.Request.FormValue("k") //关键词
common.PrintDebugHeader(ctx) //debug
if goodsName == "" {
common.Output(ctx,1001, "查询关键词不得为空", "")
return
}
//调外链拿数据
apiData := ly.OutLinkSource(ctx,&goodsName)
common.Output(ctx,0,"",apiData)
}
\ No newline at end of file
package main
import (
"fmt"
"sort"
)
// 按map的key排序
func main() {
params := make(map[string]interface{})
params["name"] = "xxx"
params["age"] = 23
params["sex"] = 0
params["level"] = 1
// 1.取出所有的key
var keys []string
for k := range params{
keys = append(keys, k)
}
// 对字符串切片排序
sort.Strings(keys)
fmt.Println(keys)
// 打印key, val
for _, k := range keys{
fmt.Printf("key: %v val:%v \n", k, params[k])
}
}
package main
import (
"fmt"
"sync"
)
var wg sync.WaitGroup
func main() {
userCount := 1
ch := make(chan bool, 2)
for i := 0; i < userCount; i++ {
wg.Add(1)
//fmt.Println(i)
ch <- true
//fmt.Println("ddd")
go send(ch, i)
}
wg.Wait()
//time.Sleep(time.Second)
}
func send(ch chan bool, i int) {
defer wg.Done()
//time.Sleep(time.Second*i)
fmt.Println("dddd",i)
//fmt.Printf("go func: %d\n", i)
<- ch
}
......@@ -47,8 +47,8 @@ func InitRouter() *gin.Engine {
v4.GET("digikey/a", controller.GetDigikeyData)
v4.POST("tme/a", controller.GetTmeData)
v4.GET("tme/a", controller.GetTmeData)
v4.POST("sourcengine/raw", controller.GetSourcengineData)
v4.GET("sourcengine/raw", controller.GetSourcengineData)
v4.POST("sourceability/raw", controller.GetSourceabilityData)
v4.GET("sourceability/raw", controller.GetSourceabilityData)
}
//路由
......
......@@ -3,12 +3,13 @@ package ly
import (
"fmt"
"github.com/gin-gonic/gin"
"github.com/gogf/gf/util/gconv"
"github.com/iancoleman/orderedmap"
"github.com/imroc/req"
"github.com/tidwall/gjson"
"search_server/model"
"search_server/pkg/common"
"strings"
"sync"
"time"
)
......@@ -61,7 +62,7 @@ const SourceSkuPriceUrl = "https://catalog.sourcengine.com/api/parts/%s/offers/s
请求外链
但是价格和库存有很多条记录,我们过滤掉交期大于14天的期货之后,找一条库存大于0,价格最便宜的一条记录作为这个SKU的价格和库存
*/
*/
func OutLinkSource(ctx *gin.Context,goodsName *string) *orderedmap.OrderedMap {
if *goodsName == "" {
return nil
......@@ -72,22 +73,29 @@ func OutLinkSource(ctx *gin.Context,goodsName *string) *orderedmap.OrderedMap {
skuIdRes = `{"page":1,"size":20,"pages":2,"total":26,"results":[{"sku":"LM358P-1503747557","mpn":"LM358P","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDIP8","status":"Active","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":true,"marketAvailabilityScore":8,"alternateRiskScore":3,"supplyChainScore":9},{"sku":"LM358PT-1456421550","mpn":"LM358PT","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"STMICROELECTRONICS","manufacturerId":"e-4591","description":"Low-power dual op-amps with low input bias current","status":"Active","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":true,"marketAvailabilityScore":10,"alternateRiskScore":5,"supplyChainScore":10},{"sku":"LM358PW-1503747554","mpn":"LM358PW","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDSO8","status":"Active","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":true,"marketAvailabilityScore":7,"alternateRiskScore":5,"supplyChainScore":9},{"sku":"LM358PWR-1512811931","mpn":"LM358PWR","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDSO8","status":"Active","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":true,"marketAvailabilityScore":8,"alternateRiskScore":5,"supplyChainScore":9},{"sku":"LM358PSR-1512811930","mpn":"LM358PSR","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDSO8","status":"Active","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":true,"marketAvailabilityScore":9,"alternateRiskScore":3,"supplyChainScore":10},{"sku":"LM358PE4-2094441957","mpn":"LM358PE4","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDIP8","status":"Active","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":true,"marketAvailabilityScore":8,"alternateRiskScore":3,"supplyChainScore":9},{"sku":"LM358PE3-1047246090","mpn":"LM358PE3","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDIP8","status":"Active","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":true,"marketAvailabilityScore":8,"alternateRiskScore":3,"supplyChainScore":9},{"sku":"LM358PWRG3-1047246091","mpn":"LM358PWRG3","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDSO8","status":"Active","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":true,"marketAvailabilityScore":6,"alternateRiskScore":5,"supplyChainScore":8},{"sku":"LM358PWRG4-JF-8096269880","mpn":"LM358PWRG4-JF","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDSO8","status":"Active","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":true,"marketAvailabilityScore":6,"alternateRiskScore":5,"supplyChainScore":8},{"sku":"LM358PWRG4-2055588833","mpn":"LM358PWRG4","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDSO8","status":"Active","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":true,"marketAvailabilityScore":6,"alternateRiskScore":5,"supplyChainScore":8},{"sku":"LM358P3-100023793","mpn":"LM358P3","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 9000uV Offset-Max, BIPolar, PDIP8","status":"Discontinued","euRohsCompliant":false,"chinaRohsCompliant":false,"reachCompliant":false,"hasOffers":false,"marketAvailabilityScore":0,"alternateRiskScore":0,"supplyChainScore":0},{"sku":"LM358-P08-T-1019521684","mpn":"LM358-P08-T","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"UNISONIC TECHNOLOGIES CO.,LTD","manufacturerId":"e-5061","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDSO8","status":"Active-Unconfirmed","euRohsCompliant":false,"chinaRohsCompliant":null,"reachCompliant":true,"hasOffers":false,"marketAvailabilityScore":0,"alternateRiskScore":3,"supplyChainScore":0},{"sku":"LM358PP3-100023792","mpn":"LM358P/P3","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 9000uV Offset-Max, BIPolar, PDIP8","status":"Discontinued","euRohsCompliant":false,"chinaRohsCompliant":false,"reachCompliant":false,"hasOffers":false,"marketAvailabilityScore":0,"alternateRiskScore":0,"supplyChainScore":0},{"sku":"LM358PSLE-1503188880","mpn":"LM358PSLE","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 9000uV Offset-Max, BIPolar, PDSO8","status":"Discontinued","euRohsCompliant":null,"chinaRohsCompliant":null,"reachCompliant":null,"hasOffers":false,"marketAvailabilityScore":0,"alternateRiskScore":3,"supplyChainScore":0},{"sku":"LM358P-1438416486","mpn":"LM358P","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"STMICROELECTRONICS","manufacturerId":"e-4591","description":"Operational Amplifier, 2 Func, 9000uV Offset-Max, BIPolar, PDSO8","status":"Discontinued","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":false,"marketAvailabilityScore":0,"alternateRiskScore":5,"supplyChainScore":0},{"sku":"LM358-P08-R-1019521683","mpn":"LM358-P08-R","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"UNISONIC TECHNOLOGIES CO.,LTD","manufacturerId":"e-5061","description":"Operational Amplifier, 2 Func, 7000uV Offset-Max, BIPolar, PDSO8","status":"Active-Unconfirmed","euRohsCompliant":false,"chinaRohsCompliant":null,"reachCompliant":true,"hasOffers":false,"marketAvailabilityScore":0,"alternateRiskScore":3,"supplyChainScore":0},{"sku":"LM358PWR-2118477716","mpn":"LM358PWR","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"ROHM CO., LTD.","manufacturerId":"e-4024","description":"Operational Amplifier, 2 Func, 9000uV Offset-Max, BIPolar, PDSO8","status":"Discontinued","euRohsCompliant":true,"chinaRohsCompliant":null,"reachCompliant":true,"hasOffers":false,"marketAvailabilityScore":0,"alternateRiskScore":5,"supplyChainScore":0},{"sku":"LM358PT-2118477715","mpn":"LM358PT","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"ROHM CO., LTD.","manufacturerId":"e-4024","description":"Operational Amplifier, 2 Func, 9000uV Offset-Max, BIPolar, PDSO8","status":"Discontinued","euRohsCompliant":true,"chinaRohsCompliant":null,"reachCompliant":true,"hasOffers":false,"marketAvailabilityScore":0,"alternateRiskScore":5,"supplyChainScore":0},{"sku":"LM358PWG4-2143868845","mpn":"LM358PWG4","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 9000uV Offset-Max, BIPolar, PDSO8","status":"Discontinued","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":true,"hasOffers":false,"marketAvailabilityScore":0,"alternateRiskScore":5,"supplyChainScore":0},{"sku":"LM358PSRG4-2065293414","mpn":"LM358PSRG4","categories":[{"name":"Semiconductors"},{"name":"Amplifiers"},{"name":"Operational Amplifiers"},{"name":"OPERATIONAL AMPLIFIER"}],"manufacturer":"Texas Instruments Incorporated","manufacturerId":"e-4832","description":"Operational Amplifier, 2 Func, 9000uV Offset-Max, BIPolar, PDSO8","status":"Discontinued","euRohsCompliant":true,"chinaRohsCompliant":true,"reachCompliant":null,"hasOffers":false,"marketAvailabilityScore":0,"alternateRiskScore":3,"supplyChainScore":0}],"facets":{"manufacturers":[{"value":"e-4832","label":"Texas Instruments Incorporated","count":18},{"value":"e-4024","label":"ROHM CO., LTD.","count":4},{"value":"e-4591","label":"STMICROELECTRONICS","count":2},{"value":"e-5061","label":"UNISONIC TECHNOLOGIES CO.,LTD","count":2}],"rohsCompliance":[{"value":"true","label":"true","count":20},{"value":"false","label":"false","count":6}],"statuses":[{"value":"Discontinued","label":"Discontinued","count":13},{"value":"Active","label":"Active","count":10},{"value":"Active-Unconfirmed","label":"Active-Unconfirmed","count":3}]},"_links":{"schema":{"href":"/api/schemas/part-search.json"}}}`;
} else {
skuIdRes = GetSourceGineData(ctx,fmt.Sprintf(SourceSkuIdUrl,*goodsName)) //查询得到所有的sku->goods_sn
skuIdRes = GetSourceGineData(ctx,fmt.Sprintf(SourceSkuIdUrl,strings.ToUpper(*goodsName))) //查询得到所有的sku->goods_sn
}
common.PrintDebugHtml(ctx,"原始数据:" + skuIdRes)
if skuIdRes == "" {
return nil;
}
skuRsults := gjson.Get(skuIdRes,"results").Array()
//协程并发请求
ch := make(chan *orderedmap.OrderedMap)
//接收通道所有的值
A := orderedmap.New()
wg := sync.WaitGroup{} //协程等待
ch := make(chan bool,1) //管道
p := 0;
for _,a := range skuRsults {
goods_sn := a.Get("sku").String() //goods_sn
goods_name := a.Get("mpn").String() //型号
brand_name := a.Get("manufacturer").String() //品牌
goods_sn := a.Get("sku").String() //goods_sn
goods_name := a.Get("mpn").String() //型号
brand_name := a.Get("manufacturer").String() //品牌
desc := a.Get("description").String() //描述
wg.Add(1)
ch <- true
go func() {
//fmt.Println(php2go.Time())
B := orderedmap.New()
......@@ -95,38 +103,24 @@ func OutLinkSource(ctx *gin.Context,goodsName *string) *orderedmap.OrderedMap {
B.Set("goods_name",goods_name)
B.Set("brand_name",brand_name)
B.Set("desc",desc)
flag := GetSourceInfo(ctx,B)
flag := GetSourceInfo(ctx,B,&wg)
//res,_ := json.Marshal(A)
if flag {
ch <- B
}else{
ch <- nil
A.Set(goods_sn,B)
}
<- ch
}()
p ++;
}
wg.Wait()
//接收通道所有的值
A := orderedmap.New();
for i := 0; i < p; i++ {
select {
case x := <-ch:
if x == nil {
continue
}
goods_sn,_ := x.Get("goods_sn")
A.Set(gconv.String(goods_sn),x)
case <- time.After(time.Second *2):
fmt.Println("超时退出等待")
}
}
//allRes,_ := json.Marshal(A)
return A;
}
//请求价格和库存
func GetSourceInfo(ctx *gin.Context,B *orderedmap.OrderedMap) bool {
func GetSourceInfo(ctx *gin.Context,B *orderedmap.OrderedMap,wg *sync.WaitGroup) bool {
defer wg.Done()
goods_sn,_ := B.Get("goods_sn")
skuInfo := GetSourceGineData(ctx,fmt.Sprintf(SourceSkuPriceUrl,goods_sn))
......@@ -145,7 +139,7 @@ func GetSourceInfo(ctx *gin.Context,B *orderedmap.OrderedMap) bool {
B.Set("goods_img","")
B.Set("cat","")
//todo 确定: 分类 , 来源网站sku的url ,图片路径 这三个字段留空,然后价格取: 梯度最后一个价格判断最低 && 库存大于0 && 交期<14 天
//todo 确定: 分类 , 来源网站sku的url ,图片路径 这三个字段留空,然后价格取: 梯度最后一个价格判断最低 && 库存大于0 && 交期<14 天
var LowerPrice float64 = 0 //最低价格
flag := false;
for _, goods := range priceGoodsList {
......@@ -194,9 +188,9 @@ func GetSourceInfo(ctx *gin.Context,B *orderedmap.OrderedMap) bool {
}
if LowerPrice == 0 {
LowerPrice = apiLowerPrice;
}else if LowerPrice > apiLowerPrice { //不是最低价格,跳过
}else if LowerPrice < apiLowerPrice { //不是最低价格,跳过
common.PrintDebugHtml(ctx,"不是最低价格跳过")
continue;
continue;
}
//写入数据
mpq := goods.Get("mpq").Int()
......@@ -221,12 +215,12 @@ func GetSourceGineData(ctx *gin.Context,url string) string {
"Content-Type": "application/json",
"Authorization": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpYXQiOjE2MDUwMjk3ODQsInVzZXJuYW1lIjoiYWNiMjMzMmItYjQ4MC00M2UwLTgwZjYtZjQ0OTVkY2M0NjBhIn0.Bt6Aii7xxVKIfxpnttmHi4hDhvBmw0Bow47b1s08ibfDVtQxmn5ZzOAbsl0spxqMysUngZ31KfPEnos5EeD04jOtu5Y9llNHCymO15_--AYy4JdzcoDgSwUnogUw4tD4zkm4vTsRxzfTjbrN9gX2n_33BemD4S1oT4M4rPK_RRw6dJ8wYqMIKYjjHPPlNIy5S155vG7CtN8i2mpHaJkDNcK2thhAgEkFuncpKAuV8oV87Pk0WoiQYkzCcQ3MbqsdV7FYuNpDCJfalzplk8y04UkG3lAGCySGUSwHnSk0RbJablg-s2td54-Tixwm5q8X3UPViVo0QTk2EmMZq2qKnrXnPUy7MVJUEpWaFRih0P3oRJUusW3cxcXRRjxlgVyD4n3vKmM0lFo-gcNfWFhbh6pJw9dxs6GqIZZqjHPa92EIWHgezDmXt97FYH5i9J_pesJCYGdRfAZDZ_mcD9KPZUylDd17nlrMWl_D14vMOklU4_9RksBX7YsNu5lyexW-djOmCcnTFV5GMcPF1jht0i6IlvQYHgNYtEITEKNMjAGRy4AL_3kYXRjlGsq37uKJup14t4VkZe95Zt_beIqPyRvcig3TV1ol5vdPf2IW1Vt_vJXsoNno5F_uznvsv268srplyO-akqbpP-X16m-Sh9kgZhk1fDcWQ8kJXt7uqd0",
}
req.SetTimeout(3 * time.Second)
req.SetTimeout(8 * time.Second)
resp, err := req.Get(url, header)
if err != nil {
return ""
}
res := resp.String() //请求外链拿到结果
common.PrintDebugHtml(ctx,"原始数据:" + res)
common.PrintDebugHtml(ctx,"原始数据:"+ url + res)
return res
}
......@@ -2,7 +2,7 @@
#!/bin/bash
cd /data/golang/search_server
git reset --hard HEAD
git pull origin master
git pull origin dev
filename="/data/golang/search_server/cmd/http/http"
rm -f $filename
export GO111MODULE=on
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment