From 69b43a3a8502d14039f544885ff037ef3f5b89e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 五月 2019 17:32:39 +0800
Subject: [PATCH] 增加接口监控报警，增加违规订单处理，增加接口请求时间大于2s的统计
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index e7efbd2..cba5f35 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -104,9 +104,17 @@
}
@RequestMapping(value = "getTaoBaoCartConfig", method = RequestMethod.POST)
- public void getTaoBaoCartConfig(AcceptData acceptData, Long uid, PrintWriter out) {
+ public void getTaoBaoCartConfig(AcceptData acceptData, String position, Long uid, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛灏氭湭鐧诲綍"));
+ return;
+ }
+
+ // 鏄惁闇�瑕佽喘鐗╁煄杞摼
+ boolean convert = "0".equalsIgnoreCase(configService.get("show_taobao_cart_convert")) ? false : true;
+
+ if (!"cart".equalsIgnoreCase(position) && !convert) {
+ out.print(JsonUtil.loadFalseResult(""));
return;
}
@@ -119,6 +127,11 @@
String cartJS = configService.get("taobao_cart_js");
String cartUrl = configService.get("taobao_cart_link");
+ if (!convert)// 涓嶈浆閾�
+ {
+ cartUrl = "http://";
+ cartJS = "-";
+ }
String js = null;
String link = null;
try {
@@ -198,18 +211,36 @@
*/
@RequestMapping(value = "getOrderParseConfig", method = RequestMethod.POST)
public void getOrderParseConfig(AcceptData acceptData, PrintWriter out) {
- out.print(JsonUtil.loadFalseResult(1, "鏆備笉鏀寔"));
-
-// String orderJS = configService.get("taobao_order_parse_js");
-// JSONObject data = new JSONObject();
-// try {
-// data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"),
-// StringUtil.getBase64String("*M#34f?,")));
-// data.put("orderUrl", DESUtil.encode("https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm",
-// StringUtil.getBase64String("YeShiFANLI889*+"), StringUtil.getBase64String("*M#34f?,")));
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// out.print(JsonUtil.loadTrueResult(data));
+
+ if ("0".equalsIgnoreCase(configService.get("auto_find_taobao_order")))
+ out.print(JsonUtil.loadFalseResult(1, "鏆備笉鏀寔"));
+ else {
+ String orderJS = configService.get("taobao_order_parse_js");
+ JSONObject data = new JSONObject();
+ try {
+ data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"),
+ StringUtil.getBase64String("*M#34f?,")));
+ data.put("orderUrl",
+ DESUtil.encode("https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm",
+ StringUtil.getBase64String("YeShiFANLI889*+"), StringUtil.getBase64String("*M#34f?,")));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+ }
+
+ /**
+ * 鑾峰彇璁㈠崟閰嶇疆
+ *
+ * @param acceptData
+ * @param out
+ */
+
+ @RequestMapping(value = "getOrderConfig", method = RequestMethod.POST)
+ public void getOrderConfig(AcceptData acceptData, PrintWriter out) {
+ JSONObject data = new JSONObject();
+ data.put("showTaoBaoOrder", "0".equalsIgnoreCase(configService.get("show_taobao_order").trim()) ? false : true);
+ out.print(JsonUtil.loadTrueResult(data));
}
}
--
Gitblit v1.8.0