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

conf/local/config.ini.local

@@ -11,6 +11,7 @@ api_md5_str = fh6y5t4rr351d2c3bryi
 
 
 [goods]
 [goods]
 api_url = http://192.168.2.232:60004
 api_url = http://192.168.2.232:60004
+sz_api_url = http://192.168.2.232:60004
 
 
 [es]
 [es]
 url = http://192.168.2.232:9200
 url = http://192.168.2.232:9200

conf/prod/config.ini.prod

@@ -10,6 +10,7 @@ api_md5_str = fh6y5t4rr351d2c3bryi
 
 
 [goods]
 [goods]
 api_url = http://47.106.60.211:60004
 api_url = http://47.106.60.211:60004
+sz_api_url = http://47.106.60.211:60004
 
 
 [es]
 [es]
 url = http://172.18.137.29:9211
 url = http://172.18.137.29:9211

conf/prod/database.ini.prod

@@ -24,9 +24,9 @@ type = mysql
 #线上地址
 #线上地址
 #mysql://dtuserread:dAtaL#ym2902m2lLX2y33@172.18.137.22:3306/icdata#utf8
 #mysql://dtuserread:dAtaL#ym2902m2lLX2y33@172.18.137.22:3306/icdata#utf8
 [cms]
 [cms]
-user_name = dtuserread
+user_name = dtuser
 password = `dAtaL#ym2902m2lLX2y33`
 password = `dAtaL#ym2902m2lLX2y33`
-host = 172.18.137.22
+host = appdb-master.ichunt.db
 database = icdata
 database = icdata
 table_prefix =
 table_prefix =
 type = mysql
 type = mysql

controller/quote_controller.go

@@ -150,3 +150,7 @@ func GetData(keyword, supplierName string) (res interface{}) {
 	res, _ = quoteService.GetData(keyword, supplierName)
 	res, _ = quoteService.GetData(keyword, supplierName)
 	return
 	return
 }
 }
+
+func QuoteTest(c *gin.Context) {
+	c.String(200, "测试")
+}

routes/router.go

@@ -29,6 +29,7 @@ func InitRouter() *gin.Engine {
 	r.POST("/search/bom/recommend", controller.Recommend)
 	r.POST("/search/bom/recommend", controller.Recommend)
 
 
 	//快手平台相关
 	//快手平台相关
+	r.GET("/search/quote/test", controller.QuoteTest)
 	r.GET("/search/quote", controller.QuoteIndex)
 	r.GET("/search/quote", controller.QuoteIndex)
 	r.POST("/search/quote", controller.QuoteIndex)
 	r.POST("/search/quote", controller.QuoteIndex)
 	r.GET("/search/quote/getDataPur", controller.GetDataPur)
 	r.GET("/search/quote/getDataPur", controller.GetDataPur)

search_server.bash

 #!/bin/bash
 #!/bin/bash
-cd /data2/gocode/search_server
+cd /data/gocode/search_server
 git pull origin dev
 git pull origin dev
-cp /data2/gocode/search_server/config_prod.ini.demo /data2/gocode/search_server/config.ini
-cp /data2/gocode/search_server/database_prod.ini.demo /data2/gocode/search_server/database.ini
-cp /data2/gocode/search_server/message_prod.ini.demo /data2/gocode/search_server/message.ini
-cp /data2/gocode/search_server/rabmq_key_prod.ini.demo /data2/gocode/search_server/rabmq_key.ini
-cp /data2/gocode/search_server/redis_config_prod.ini.demo /data2/gocode/search_server/redis_config.ini
-cp /data2/gocode/search_server/redis_key_prod.ini.demo /data2/gocode/search_server/redis_key.ini
-cp /data2/gocode/search_server/search_prod.ini.demo /data2/gocode/search_server/search.ini
+cp /data/gocode/search_server/conf/prod/config.ini.prod /data/gocode/search_server/conf/config.ini
+cp /data/gocode/search_server/conf/prod/database.ini.prod /data/gocode/search_server/conf/database.ini
+cp /data/gocode/search_server/conf/prod/message.ini.prod /data/gocode/search_server/conf/message.ini
+cp /data/gocode/search_server/conf/prod/rabmq_key.ini.prod /data/gocode/search_server/conf/rabmq_key.ini
+cp /data/gocode/search_server/conf/prod/redis_config.ini.prod /data/gocode/search_server/conf/redis_config.ini
+cp /data/gocode/search_server/conf/prod/redis_key.ini.prod /data/gocode/search_server/conf/redis_key.ini
+cp /data/gocode/search_server/conf/prod/search.ini.prod /data/gocode/search_server/conf/search.ini
 go build -o ./cmd/search_http_server ./cmd/search_http_server.go
 go build -o ./cmd/search_http_server ./cmd/search_http_server.go
 supervisorctl restart search_server
 supervisorctl restart search_server

service/quote_service.go

@@ -2,6 +2,7 @@ package service
 
 
 import (
 import (
 	"encoding/json"
 	"encoding/json"
+	"fmt"
 	"github.com/imroc/req"
 	"github.com/imroc/req"
 	"github.com/syyongx/php2go"
 	"github.com/syyongx/php2go"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/gjson"
@@ -50,7 +51,9 @@ func (qs *QuoteService) GetGoodsBySupplierName(r requests.GetGoodsBySupplierRequ
 	if err != nil {
 	if err != nil {
 		return
 		return
 	}
 	}
+	fmt.Println(esResult)
 	goodsIds := GetGoodsIdsByEs(esResult)
 	goodsIds := GetGoodsIdsByEs(esResult)
+	fmt.Println(goodsIds)
 	goodsList, err := GetGoodsInfo(goodsIds)
 	goodsList, err := GetGoodsInfo(goodsIds)
 	dullData, err := transformer.DullDataInfo(r.Keyword, goodsList)
 	dullData, err := transformer.DullDataInfo(r.Keyword, goodsList)
 	quoteTransformer := transformer.QuoteTransformer{}
 	quoteTransformer := transformer.QuoteTransformer{}

test/test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/syyongx/php2go"
 	"github.com/syyongx/php2go"
 	"reflect"
 	"reflect"
 	"search_server/boot"
 	"search_server/boot"
-	"search_server/pkg/common"
+	"search_server/service"
 )
 )
 
 
 func StrRandom(lenNum int) string {
 func StrRandom(lenNum int) string {
@@ -39,18 +39,8 @@ func main() {
 	if err := boot.Boot(path); err != nil {
 	if err := boot.Boot(path); err != nil {
 		fmt.Println(err)
 		fmt.Println(err)
 	}
 	}
-	//log.SetFormatter(new(LogFormatter))
-	////设置output,默认为stderr,可以为任何io.Writer，比如文件*os.File
-	//str, _ := os.Getwd()
-	//file, _ := os.OpenFile(str+"/logs/search/1.log", os.O_CREATE|os.O_WRONLY, 0666)
-	//log.SetOutput(file)
-	//fmt.Println(str)
-	//log.Error("sadsadsadsa")
-	//log.Error("sadsadsadsa")
-	//log_report.WriteSearchErrorLog("sdasdasdas")
-	common.Output(1000, "ceshiceshi", nil)
-	//log.Error("sadsadsadsa")
-	//controller.GetData("LM358","arrow")
+	res, _ := service.GetGoodsInfo([]string{"74163","116492","74123","106095","116451","162774","74152","116078","74122","74132"})
+	fmt.Println(len(res))
 
 
 }
 }