Merge branch 'dev' of http://119.23.72.7/mushishixian/search_server into dev

cmd/test1.go

 package main
 package main
 
 
 import (
 import (
-	"github.com/gin-gonic/gin"
-	"search_server/framework/gin_"
-	"search_server/protopb/mouser"
+	"os"
 	"search_server/service"
 	"search_server/service"
 )
 )
 
 
 func main() {
 func main() {
-	MouserService := service.NewMouserServiceImpl()
-	rsp := &mouser.MouserResponse{}
-	err = MouserService.MouserGetData(*gin.Context, request.(*mouser.MouserRequest), rsp)
-	return rsp, err
+	//MouserService := service.NewMouserServiceImpl()
+	//MouserGetData(MouserService)
 
 
+
+	dd := service.OutLink("LM358")
+	print("niin")
+	print(dd)
+	os.Exit(1)
 }
 }
-//处理请求
-func MouserGetData(c *service.MouserServiceImpl) gin_.Endpoint {
-		rsp := &mouser.MouserResponse{}
-		err = c.MouserGetData(context, request.(*mouser.MouserRequest), rsp)
-		return rsp, err
-}
+
\ No newline at end of file

conf/search.ini

+[supplier_all]
+1 ="rochester"
+2 ="verical"
+3 ="tme"
+
+[common]
+'MOUSER_API'='http://footstone.liexin.net/webapi/handle_mouser'
\ No newline at end of file

go.mod

@@ -3,6 +3,7 @@ module search_server
 go 1.14
 go 1.14
 
 
 require (
 require (
+	github.com/basgys/goxml2json v1.1.0
 	github.com/gin-contrib/cors v1.3.1
 	github.com/gin-contrib/cors v1.3.1
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-ini/ini v1.57.0
 	github.com/go-ini/ini v1.57.0
@@ -14,6 +15,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.14.3 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.14.3 // indirect
 	github.com/ichunt2019/logger v1.0.5
 	github.com/ichunt2019/logger v1.0.5
+	github.com/idoubi/goz v1.0.0
 	github.com/imroc/req v0.3.0
 	github.com/imroc/req v0.3.0
 	github.com/jinzhu/gorm v1.9.12
 	github.com/jinzhu/gorm v1.9.12
 	github.com/joncalhoun/qson v0.0.0-20170526102502-8a9cab3a62b1 // indirect
 	github.com/joncalhoun/qson v0.0.0-20170526102502-8a9cab3a62b1 // indirect

model/ly.go

+package model
+
+//联营请求外链后格式化数据
+type LyClearData struct {
+	GoodsID   string
+	GoodsName string
+}
+
+//联营请求外链后格式化数据
+type LyClearDataItem struct {
+	GoodsName          string
+	GoodsNameTemp      string
+	BrandName          string
+	Desc               string
+	GoodsSn            string
+	Docurl             string
+	Url                string
+	GoodsImg           string
+	Cat                string
+	RestrictionMessage string
+	increment          int
+	SinglePrice        float64
+	PriceTemp          []PriceTempItem
+}
+
+type PriceTempItem struct {
+	Purchases int
+	PriceUs   float64
+	PriceCn   float64
+	PriceAc   float64
+}