From dd24286b6da752433ba5b2360929a04e5040936c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 29 五月 2019 10:57:15 +0800
Subject: [PATCH] 叮咚呛修改

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeBaseUtil.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 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 eb562d1..6513ad7 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;
@@ -59,6 +60,7 @@
 			}
 		} else
 			throw new TaoKeApiException(TaoKeApiException.CODE_OTHER, ":" + result, params);
+		reValid(app.getAppKey());
 		return data;
 	}
 
@@ -82,7 +84,8 @@
 		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);
@@ -96,6 +99,7 @@
 			}
 		} else
 			throw new TaoKeApiException(TaoKeApiException.CODE_OTHER, ":" + result, params);
+		reValid(app.getAppKey());
 		return data;
 	}
 
@@ -118,6 +122,13 @@
 				TaoKeLogHelper.error(e.getParams(), e.getMsg());
 				if (e.getCode() == TaoKeApiException.CODE_API_ERROR) {
 					result = e.getMsg();
+				} else if (e.getCode() == TaoKeApiException.CODE_APPKEY_LIMIT) {
+					try {
+						EmergencyUtil.baoJin("monitor-error-tb-app-limit-" + params.get("app_key"),
+								"娣樺疂APPKey璇锋眰闄愬埗銆�" + params.get("app_key") + "銆�", new String[] { "18581318252" });
+					} catch (Exception e1) {
+
+					}
 				}
 			}
 		}
@@ -255,6 +266,8 @@
 	 * @param appkey
 	 */
 	static void reportAppInvalid(String appkey) {
+		if (invalidMap == null)
+			return;
 		// 閿欒涓夋鍚庡啀鐪熸涓婃姤
 		if (invalidMap.get(appkey) == null)
 			invalidMap.put(appkey, 1);
@@ -268,6 +281,19 @@
 		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