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

logs/search/20200721.log

+{"msg":"提示信息：testest，请求url：/test{}","msgCode":"001000","ts":1595334221,"dateStr":"2020-07-21 20:23:41","app":"search_api","serverIp":"127.0.0.1","fileName":"C:/laragon/usr/go1.14/src/search_server/routes/router.go","lineNo":"36","method":"search_server/routes.InitRouter.func1"}

logs/search/20200722.log

+{"msg":"提示信息：testest，请求url：/test{}","msgCode":"001000","ts":1595382533,"dateStr":"2020-07-22 09:48:53","app":"search_api","serverIp":"127.0.0.1","fileName":"C:/laragon/usr/go1.14/src/search_server/routes/router.go","lineNo":"36","method":"search_server/routes.InitRouter.func1"}
+{"msg":"提示信息：型号不存在，请求url：/search/other/hasStock{\"flag\":\"1\",\"goods_name\":\"LM358\"}","msgCode":"001001","ts":1595403000,"dateStr":"2020-07-22 15:30:00","app":"search_api","serverIp":"127.0.0.1","fileName":"C:/laragon/usr/go1.14/src/search_server/controller/other_controller.go","lineNo":"19","method":"search_server/controller.CheckHasStock"}
+{"msg":"提示信息：型号不存在，请求url：/search/other/hasStock{\"flag\":\"1\",\"goods_name\":\"LM358\"}","msgCode":"001001","ts":1595403015,"dateStr":"2020-07-22 15:30:15","app":"search_api","serverIp":"127.0.0.1","fileName":"C:/laragon/usr/go1.14/src/search_server/controller/other_controller.go","lineNo":"19","method":"search_server/controller.CheckHasStock"}
+{"msg":"提示信息：型号不存在，请求url：/search/other/hasStock{\"flag\":\"1\",\"goods_name\":\"LM358\"}","msgCode":"001001","ts":1595403022,"dateStr":"2020-07-22 15:30:22","app":"search_api","serverIp":"127.0.0.1","fileName":"C:/laragon/usr/go1.14/src/search_server/controller/other_controller.go","lineNo":"19","method":"search_server/controller.CheckHasStock"}
+{"msg":"提示信息：型号不存在，请求url：/search/other/hasStock?goods_name=LM358PT{\"flag\":\"1\",\"goods_name\":\"LM358PT\"}","msgCode":"001001","ts":1595403074,"dateStr":"2020-07-22 15:31:14","app":"search_api","serverIp":"127.0.0.1","fileName":"C:/laragon/usr/go1.14/src/search_server/controller/other_controller.go","lineNo":"19","method":"search_server/controller.CheckHasStock"}
+{"msg":"提示信息：型号不存在，请求url：/search/other/hasStock?goods_name=LM358PT{\"flag\":\"1\",\"goods_name\":\"LM358PT\"}","msgCode":"001001","ts":1595403091,"dateStr":"2020-07-22 15:31:31","app":"search_api","serverIp":"127.0.0.1","fileName":"C:/laragon/usr/go1.14/src/search_server/controller/other_controller.go","lineNo":"21","method":"search_server/controller.CheckHasStock"}

logs/search/20200811.log

+{"msg":"提示信息：消息参数不正确，请求url：/search/server_api/sendMsg{}","msgCode":"000101","ts":1597139998,"dateStr":"2020-08-11 17:59:58","app":"search_api","serverIp":"127.0.0.1","fileName":"C:/laragon/usr/go1.14/src/search_server/controller/server_api_controller.go","lineNo":"59","method":"search_server/controller.ServerApiSendMsg"}

service/bom_service.go

@@ -167,11 +167,8 @@ func getBomTermQuery(goodsName, brandName string, number int, isRawSearch bool)
 	}
 	source := elastic.NewSearchSource().Query(query)
 	source.From(0)
-	if isRawSearch {
-		source.Size(100)
-	} else {
-		source.Size(50)
-	}
+	source.Size(30)
+
 	source.Sort("_score", false).Sort("sort", false).Sort("single_price", true)
 	queryRequest := elastic.NewSearchRequest().Source(source)
 	result, _ = queryRequest.Body()