From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeBaseUtil.java | 67 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 11 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..e123c72 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
@@ -10,6 +10,7 @@
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.log.TaoKeLogHelper;
+import com.yeshi.fanli.util.EmergencyUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoHttpUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -49,15 +50,23 @@
String result = TaoBaoHttpUtil.taoKeGet(params);
JSONObject data = JSONObject.fromObject(result);
if (data != null) {
- if (data.optJSONObject("error_response") != null
- && data.optJSONObject("error_response").optInt("code") == 7) {
+ if (data.optJSONObject("error_response") != null && data.optJSONObject("error_response").optInt("code") == 7
+ && "accesscontrol.limited-by-app-access-count"
+ .equalsIgnoreCase(data.optJSONObject("error_response").optString("sub_code"))) {
reportAppInvalid(app.getAppKey());
+ TaoKeLogHelper.error(params, result);
+ try {
+ EmergencyUtil.baoJin("monitor-error-tb-app-limit-" + params.get("app_key"),
+ "娣樺疂APPKey璇锋眰闄愬埗銆�" + params.get("app_key") + "銆�", new String[] { "18581318252" });
+ } catch (Exception e1) {
+ }
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;
}
@@ -81,13 +90,15 @@
params.put("v", "2.0");
params.put("timestamp", TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
params.put("format", "json");
- params.put("adzone_id", app.getAdzoneId());
+ if (!StringUtil.isNullOrEmpty(app.getAdzoneId()))
+ params.put("adzone_id", app.getAdzoneId());
params.put("sign", getSign(params, "md5", app).toUpperCase());
String result = TaoBaoHttpUtil.taoKeGet(params);
JSONObject data = JSONObject.fromObject(result);
if (data != null) {
- if (data.optJSONObject("error_response") != null
- && data.optJSONObject("error_response").optInt("code") == 7) {
+ if (data.optJSONObject("error_response") != null && data.optJSONObject("error_response").optInt("code") == 7
+ && "accesscontrol.limited-by-app-access-count"
+ .equalsIgnoreCase(data.optJSONObject("error_response").optString("sub_code"))) {
reportAppInvalid(app.getAppKey());
throw new TaoKeApiException(TaoKeApiException.CODE_APPKEY_LIMIT, "娣樺疂璇锋眰闄愬埗:" + result, params);
} else if (data.optJSONObject("error_response") != null) {
@@ -95,6 +106,7 @@
}
} else
throw new TaoKeApiException(TaoKeApiException.CODE_OTHER, ":" + result, params);
+ reValid(app.getAppKey());
return data;
}
@@ -125,7 +137,7 @@
data = JSONObject.fromObject(result);
} catch (Exception e) {
}
-
+
}
if (data != null)
@@ -192,13 +204,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 +225,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 +258,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