From be641cbe14bf20c807dccceb1c4b825d80443aed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 一月 2020 14:42:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 881f331..9d5f2a8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -34,6 +34,7 @@
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.entity.taobao.SearchFilter;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
@@ -840,7 +841,7 @@
 
 		JDSearchResult result = null;
 		boolean hasCoupon = false;
-		String way = configService.get("jd_api_search_key");
+		String way = configService.get(ConfigKeyEnum.jdApiSearchKey.getKey());
 		if ("1".equals(way)) {
 			JDFilter filterAPI = new JDFilter();
 			filterAPI.setKeyword(SearchFilterUtil.filterSearchContent(key));

--
Gitblit v1.8.0