From 36a6c7f1d1bc054a987aeabb4ab6d9f1278d8e4d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 四月 2019 09:36:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java | 137 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 131 insertions(+), 6 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 0c59a2c..8e53740 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;
@@ -39,6 +40,9 @@
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
+
+ @Resource
+ private ConfigService configService;
/**
* 缂撳瓨瀛楃涓�
@@ -98,6 +102,24 @@
}
}
+ public void increase(String key) {
+ Jedis jedis = jedisPool.getResource();
+ try {
+ jedis.incr(key);
+ } finally {
+ jedisPool.returnResource(jedis);
+ }
+ }
+
+ public void expire(String key,int seconds) {
+ Jedis jedis = jedisPool.getResource();
+ try {
+ jedis.expire(key, seconds);
+ } finally {
+ jedisPool.returnResource(jedis);
+ }
+ }
+
public void cacheCommonString(String key, String value, int seconds) {
setString(key, value, seconds);
}
@@ -115,15 +137,27 @@
}
/**
- * 灏嗕俊鎭案涔呬繚瀛樺埌Redis
+ * 涓存椂瀛樺偍娣樺疂鐨勫晢鍝佽鎯�
*
* @param goods
*/
- public void saveTaoBaoGoodsBriefForever(TaoBaoGoodsBrief goods) {
- String key = "taobao-goods-" + goods.getAuctionId();
+ public void saveTaoBaoGoodsBriefTemp(TaoBaoGoodsBrief goods) {
+ if (goods == null)
+ return;
+ String key = "taobao-goods-temp-" + goods.getAuctionId();
if (Constant.IS_OUTNET) {
- cacheCommonString(key, JsonUtil.getSimpleGson().toJson(goods));
+ // 鏆傚瓨4涓皬鏃剁殑鍒嗕韩
+ cacheCommonString(key, JsonUtil.getSimpleGson().toJson(goods), 60 * 60 * 4);
}
+ }
+
+ public TaoBaoGoodsBrief getTaoBaoGoodsTemp(Long auctionId) {
+ String key = "taobao-goods-temp-" + auctionId;
+ String value = getCommonString(key);
+ if (!StringUtil.isNullOrEmpty(value)) {
+ return JsonUtil.getSimpleGson().fromJson(value, TaoBaoGoodsBrief.class);
+ }
+ return null;
}
/**
@@ -169,9 +203,12 @@
if (StringUtil.isNullOrEmpty(value)) {
List<ImageInfo> list = null;
try {
- list = TaoBaoUtil.getTBDetailImageWithSizev2(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澶�
@@ -265,19 +302,38 @@
String value = "";
if (Constant.IS_OUTNET)
value = getCommonString(key);
+
if (StringUtil.isNullOrEmpty(value)) {
TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
goods.setShopTitle(shopTitle);
goods.setSellerId(sellerId);
goods.setAuctionId(auctionId);
TaoBaoShopInfo info = taoBaoShopService.getTaoBaoShopInfo(goods);
+
+ if (info != null) {
+ String shopUrl = info.getShopUrl();
+ if (shopUrl != null && shopUrl.contains("tmall://page.tm/shop")) {
+ shopUrl = "http://store.taobao.com/shop/view_shop.htm?user_number_id=" + sellerId;
+ info.setShopUrl(shopUrl);
+ }
+ }
+
if (Constant.IS_OUTNET && info != null) {
value = new Gson().toJson(info);
cacheCommonString(key, value, 60 * 60 * 2);
}
+
return info;
} else {
- return new Gson().fromJson(value, TaoBaoShopInfo.class);
+ TaoBaoShopInfo info = new Gson().fromJson(value, TaoBaoShopInfo.class);
+
+ String shopUrl = info.getShopUrl();
+ if (shopUrl != null && shopUrl.contains("tmall://page.tm/shop")) {
+ shopUrl = "http://store.taobao.com/shop/view_shop.htm?user_number_id=" + sellerId;
+ info.setShopUrl(shopUrl);
+ }
+
+ return info;
}
}
@@ -384,4 +440,73 @@
return !StringUtil.isNullOrEmpty(getString(key));
}
+ /**
+ * 缂撳瓨鐭繛鎺�1鍒嗛挓
+ *
+ * @param uid
+ * @param shortlink
+ */
+ public void setInviteShortLink(long uid, String shortlink) {
+ String value = "";
+ String key = "invite-shortlink-" + uid;
+
+ if (Constant.IS_OUTNET) {
+
+ value = getCommonString(key);
+
+ if (StringUtil.isNullOrEmpty(value)) {
+ cacheCommonString(key, shortlink, 60);
+ }
+ }
+
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鐭繛鎺�
+ *
+ * @param uid
+ * @return
+ */
+ public String getInviteShortLink(long uid) {
+
+ String value = "";
+ String key = "invite-shortlink-" + uid;
+
+ if (Constant.IS_OUTNET)
+ value = getCommonString(key);
+
+ return value;
+ }
+
+ /**
+ * 淇濆瓨娣樺彛浠�
+ *
+ * @param auctionId
+ * @param token
+ */
+ public void saveCommonTaoToken(Long auctionId, String token) {
+ String key = "taobao-common-token-" + auctionId;
+ if (Constant.IS_OUTNET) {
+ if (!StringUtil.isNullOrEmpty(token)) {
+ // 鍙ｄ护缂撳瓨10澶�
+ cacheCommonString(key, token, 60 * 60 * 24 * 10);
+ }
+ }
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鐭繛鎺�
+ *
+ * @param uid
+ * @return
+ */
+ public String getCommonTaoToken(Long auctionId) {
+ String key = "taobao-common-token-" + auctionId;
+
+ if (Constant.IS_OUTNET) {
+ return getCommonString(key);
+ }
+ return null;
+ }
+
}
--
Gitblit v1.8.0