Merge branch 'dev_6.8.5_yoho2ufo' into test6.8.5

@@ -44,7 +44,7 @@ public class Yoho2ufoProductServiceImpl implements Yoho2ufoProductService {
     @Resource
     @Resource
     ProductSortMapper productSortMapper;
     ProductSortMapper productSortMapper;
 
 
-    @Value("${search.server.address}")
+    @Value("${ip.port.search.server}")
     private String searchServerAddress;
     private String searchServerAddress;
 
 
     private static final Logger logger = LoggerFactory.getLogger(Yoho2ufoProductServiceImpl.class);
     private static final Logger logger = LoggerFactory.getLogger(Yoho2ufoProductServiceImpl.class);
@@ -195,7 +195,7 @@ public class Yoho2ufoProductServiceImpl implements Yoho2ufoProductService {
 
 
         List<YohoProductInfo> productBoList = new ArrayList<>();
         List<YohoProductInfo> productBoList = new ArrayList<>();
         //调用搜索的接口批量查询产品信息
         //调用搜索的接口批量查询产品信息
-        String url = searchServerAddress + "productindex/productListBySkn.json?product_skn=" +
+        String url = searchServerAddress + "/yohosearch/productindex/productListBySkn.json?product_skn=" +
                 org.apache.commons.lang.StringUtils.join(sknList, ",");
                 org.apache.commons.lang.StringUtils.join(sknList, ",");
         JSONObject jsonObject = serviceCaller.get("", url, null, JSONObject.class, null).get(1);
         JSONObject jsonObject = serviceCaller.get("", url, null, JSONObject.class, null).get(1);
         if(jsonObject != null && jsonObject.getJSONObject("data") != null){
         if(jsonObject != null && jsonObject.getJSONObject("data") != null){

@@ -42,4 +42,4 @@ ufo.live.notify.url = ${ufo.live.notify.url}
 
 
 ufo.nfc.syncBlockChain.url=${ufo.nfc.syncBlockChain.url}
 ufo.nfc.syncBlockChain.url=${ufo.nfc.syncBlockChain.url}
 
 
-search.server.address=${search.server.address}
+ip.port.search.server=${ip.port.search.server}