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/wxmp/v1/SearchController.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java index a1663fc..7fa60db 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java @@ -26,6 +26,7 @@ import com.yeshi.fanli.dto.pdd.PDDSearchFilter; 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.log.LogHelper; import com.yeshi.fanli.service.inter.brand.BrandInfoService; import com.yeshi.fanli.service.inter.config.ConfigService; @@ -296,7 +297,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