From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeBaseUtil.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeBaseUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeBaseUtil.java
index 38287d4..bd21e29 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeBaseUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeBaseUtil.java
@@ -52,12 +52,14 @@
if (data.optJSONObject("error_response") != null
&& data.optJSONObject("error_response").optInt("code") == 7) {
reportAppInvalid(app.getAppKey());
+ TaoKeLogHelper.error(params, result);
throw new TaoKeApiException(TaoKeApiException.CODE_APPKEY_LIMIT, "娣樺疂璇锋眰闄愬埗:" + result, params);
} else if (data.optJSONObject("error_response") != null) {
throw new TaoKeApiException(TaoKeApiException.CODE_API_ERROR, result, params);
}
} else
throw new TaoKeApiException(TaoKeApiException.CODE_OTHER, ":" + result, params);
+ reValid(app.getAppKey());
return data;
}
@@ -95,6 +97,7 @@
}
} else
throw new TaoKeApiException(TaoKeApiException.CODE_OTHER, ":" + result, params);
+ reValid(app.getAppKey());
return data;
}
@@ -125,7 +128,7 @@
data = JSONObject.fromObject(result);
} catch (Exception e) {
}
-
+
}
if (data != null)
@@ -192,13 +195,13 @@
} catch (Exception e) {
}
- // 鎺ュ彛璇锋眰澶辫触,榛樿璁剧疆鎴愯繑鍒╁埜Android鐨勫獟浣撲俊鎭�
+ // 鎺ュ彛璇锋眰澶辫触,榛樿璁剧疆鎴愬奖瑙嗗ぇ鍏↖OS鐨勫獟浣撲俊鎭�
if (StringUtil.isNullOrEmpty(result)) {
taoKeAppInfo = new TaoKeAppInfo();
- taoKeAppInfo.setAdzoneId("10647300249");
- taoKeAppInfo.setAppKey("24980167");
- taoKeAppInfo.setAppSecret("e0a2e05deabf5ce039b52e5b492d5382");
- taoKeAppInfo.setPid("mm_124933865_56750082_10647300249");
+ taoKeAppInfo.setAdzoneId("381938426");
+ taoKeAppInfo.setAppKey("24838852");
+ taoKeAppInfo.setAppSecret("bc8265e2bf8d8115329d652f9d3d4cd8");
+ taoKeAppInfo.setPid("mm_124933865_43788020_381938426");
lastTime = System.currentTimeMillis();
return taoKeAppInfo;
}
@@ -213,6 +216,13 @@
info.setAdzoneId(sts[sts.length - 1]);
taoKeAppInfo = info;
lastTime = System.currentTimeMillis();
+ } else {// 闃叉鎵�鏈夌殑澶辨晥
+ taoKeAppInfo = new TaoKeAppInfo();
+ taoKeAppInfo.setAdzoneId("381938426");
+ taoKeAppInfo.setAppKey("24838852");
+ taoKeAppInfo.setAppSecret("bc8265e2bf8d8115329d652f9d3d4cd8");
+ taoKeAppInfo.setPid("mm_124933865_43788020_381938426");
+ return taoKeAppInfo;
}
}
return taoKeAppInfo;
@@ -239,16 +249,42 @@
}
}
+ static Map<String, Integer> invalidMap = new HashMap<>();
+
/**
* 鎶ュ憡璇PPKey涓嶈兘鐢�
*
* @param appkey
*/
static void reportAppInvalid(String appkey) {
+ if (invalidMap == null)
+ return;
+ // 閿欒涓夋鍚庡啀鐪熸涓婃姤
+ if (invalidMap.get(appkey) == null)
+ invalidMap.put(appkey, 1);
+ else
+ invalidMap.put(appkey, invalidMap.get(appkey) + 1);
+
+ if (invalidMap.get(appkey) < 4)
+ return;
+ invalidMap.put(appkey, 0);
HttpUtil.get("http://193.112.35.168:8091/tb/taoke/reportappcannotuse?appkey=" + appkey);
lastTime = 0;
}
+ /**
+ * APPKey鎭㈠鍙敤
+ *
+ * @param appKey
+ */
+ static void reValid(String appKey) {
+ if (invalidMap == null)
+ return;
+ Integer count = invalidMap.get(appKey);
+ if (count != null && count > 0)
+ invalidMap.put(appKey, count - 1);
+ }
+
public static void setAppValid() {
HttpUtil.get("http://193.112.35.168:8091/tb/taoke/setappcanuse");
}
--
Gitblit v1.8.0