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/h5/H5S11Controller.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java
index acf4c8e..449b674 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java
@@ -61,11 +61,11 @@
token = redisManager.getCommonString(key);
if (StringUtil.isNullOrEmpty(token)) {
try {
- String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1539329391766",
+ String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1574926757600",
info.getRelationId());
if (!StringUtil.isNullOrEmpty(link)) {
token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg",
- "銆愬ぉ鐚弻11銆戜笂浜跨孩鍖呯瓑浣犳潵鎷嗭紒", link);
+ "銆愬ぉ鐚弻12銆戜笂浜跨孩鍖呯瓑浣犳潵鎷嗭紒", link);
if (!StringUtil.isNullOrEmpty(token))
redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缂撳瓨1澶�
}
@@ -113,7 +113,7 @@
token = redisManager.getCommonString(key);
if (StringUtil.isNullOrEmpty(token)) {
try {
- String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1539329391766",
+ String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1574926757600",
info.getRelationId());
if (!StringUtil.isNullOrEmpty(link)) {
token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg",
--
Gitblit v1.8.0