From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java b/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
index 6c4c9ba..36f58bf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
@@ -16,6 +16,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;
@@ -38,7 +39,10 @@
private TaoBaoShopService taoBaoShopService;
@Resource
- private TaoBaoUnionConfigService taoBaoUnionConfigService;
+ private TaoBaoUnionConfigService taoBaoUnionConfigService;
+
+ @Resource
+ private ConfigService configService;
/**
* 缂撳瓨瀛楃涓�
@@ -169,10 +173,13 @@
if (StringUtil.isNullOrEmpty(value)) {
List<ImageInfo> list = null;
try {
- list = TaoBaoUtil.getTBDetailImageWithSize(auctionId);
+ list = TaoBaoUtil.getTBDetailImageWithSizev2(auctionId, configService.getTaoBaoProxyIP());
} catch (Exception e) {
e.printStackTrace();
}
+ if (list == null || list.size() == 0) {
+ list = TaoBaoUtil.getTBDetailImageWithSize(auctionId);
+ }
if (list != null && list.size() > 0)
// 缂撳瓨1澶�
if (Constant.IS_OUTNET)
--
Gitblit v1.8.0