From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 4c6aaac..fa63cfe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
@@ -384,8 +384,6 @@
*/
public void saveSMSVCode(String phone, int type, String code) {
- if (!Constant.IS_OUTNET)
- return;
String key = "smscode-" + phone + "-" + type;
// 淇濆瓨2鍒嗛挓
setString(key, code, 120);
@@ -398,8 +396,8 @@
* @return
*/
public String getSMSVCode(String phone, int type) {
- if (!Constant.IS_OUTNET)
- return "";
+// if (!Constant.IS_OUTNET)
+// return "";
String key = "smscode-" + phone + "-" + type;
// 淇濆瓨2鍒嗛挓
return getString(key);
@@ -413,8 +411,8 @@
* @param code
*/
public void clearSMSVCode(String phone, int type) {
- if (!Constant.IS_OUTNET)
- return;
+// if (!Constant.IS_OUTNET)
+// return;
String key = "smscode-" + phone + "-" + type;
removeKey(key);
}
@@ -510,6 +508,37 @@
}
/**
+ * 淇濆瓨娣樼ぜ閲戠殑鍙ｄ护
+ *
+ * @param url
+ * @param token
+ */
+ public void saveTLJToken(String url, String token) {
+ String key = "taobao-tlj-token-" + StringUtil.Md5(url);
+ if (Constant.IS_OUTNET) {
+ if (!StringUtil.isNullOrEmpty(token)) {
+ // 鍙ｄ护缂撳瓨10澶�
+ cacheCommonString(key, token, 60 * 60 * 24 * 10);
+ }
+ }
+ }
+
+ /**
+ * 鑾峰彇娣樼ぜ閲戝彛浠�
+ *
+ * @param url
+ * @return
+ */
+ public String getTLJToken(String url) {
+ String key = "taobao-common-token-" + StringUtil.Md5(url);
+
+ if (Constant.IS_OUTNET) {
+ return getCommonString(key);
+ }
+ return null;
+ }
+
+ /**
* 淇濆瓨瀵硅薄
*
* @param T
@@ -553,7 +582,7 @@
*/
public Class<?> getObj(Class<?> clazz, String key) {
String value = getCommonString(key);
- return new Gson().fromJson(value, clazz);
+ return (Class<?>) new Gson().fromJson(value, clazz);
}
/**
--
Gitblit v1.8.0