From 540d17e0d21a252162e9eccf021d223cdb331119 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 06 十二月 2019 17:46:14 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/S11Controller.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/S11Controller.java
index fbe0cc3..7723e90 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/S11Controller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/S11Controller.java
@@ -60,7 +60,7 @@
 		String token = redisManager.getCommonString(key);
 		if (StringUtil.isNullOrEmpty(token)) {
 			try {
-				String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1574664919372",
+				String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1574926757600",
 						info.getRelationId());
 				if (!StringUtil.isNullOrEmpty(link)) {
 					token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s12/banner.jpg", "銆愬ぉ鐚弻12銆戜笂浜跨孩鍖呯瓑浣犳潵鎷嗭紒---鏉挎牀蹇渷", link);

--
Gitblit v1.8.0