From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeBaseUtil.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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 d4de472..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,10 +50,16 @@
 		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);
@@ -89,8 +96,9 @@
 		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) {

--
Gitblit v1.8.0