From c9cbdfa41d645d42eeaa7e06d550d4ef8ac328e7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 12:15:08 +0800
Subject: [PATCH] redis关键词
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
index dafb369..6f11aba 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.config.AppHomeFloatImg;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.homemodule.FloatADService;
@@ -34,6 +35,7 @@
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -161,8 +163,8 @@
* @param acceptData
* @param out
*/
- @RequestMapping(value = "getHomeConfigNew", method = RequestMethod.POST)
- public void getHomeConfigNew(AcceptData acceptData, Long uid, PrintWriter out) {
+ @RequestMapping(value = "getHomeConfigNew")
+ public void getHomeConfigNew(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
if (uid != null && uid == 0L)
uid = null;
@@ -178,7 +180,9 @@
FloatAD floatAD = listAD.get(i);
FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
if (typeEnum == FloatADTypeEnum.newUserRedPack
- && !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice())) {
+ && (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())
+ || !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice()))) {
+
listAD.remove(i);
i--;
continue;
@@ -228,7 +232,10 @@
String platform = acceptData.getPlatform();
data.put("hotFuctionLink",
configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));
- out.print(JsonUtil.loadTrueResult(data));
+ if (StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadTrueResult(data));
+ else
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
}
/**
@@ -495,12 +502,13 @@
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1001, "璇风粦瀹氭窐瀹�")));
return;
}
- String elmeLink = redisManager.getCommonString("elme-link-" + uid);
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.elmeLink, uid + "");
+ String elmeLink = redisManager.getCommonString(key);
if (StringUtil.isNullOrEmpty(elmeLink)) {
elmeLink = TaoKeApiUtil.officialActivityConvert(TaoBaoConstant.TAOBAO_ELEME_PID.split("_")[3],
"1571715733668", userInfoExtra.getRelationId());
if (!StringUtil.isNullOrEmpty(elmeLink)) {
- redisManager.cacheCommonString("elme-link-" + uid, elmeLink, 60 * 60);// 缂撳瓨1涓皬鏃�
+ redisManager.cacheCommonString(key, elmeLink, 60 * 60);// 缂撳瓨1涓皬鏃�
}
}
@@ -523,4 +531,19 @@
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
}
+ /**
+ * 鑾峰彇楗夸簡涔堢殑鎺ㄥ箍閾炬帴
+ *
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "userProtocolListen")
+ public void userProtocolListen(AcceptData acceptData, Long uid, int type, PrintWriter out) {
+ LogHelper.userProtocolListen(String.format("%s#%s#%s", acceptData.getDevice(), uid, type));
+ out.print(JsonUtil.loadTrueResult(""));
+
+
+ }
+
}
--
Gitblit v1.8.0