From 179b39401c406579a0d10c442a665aeb2802e931 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 20 五月 2019 09:17:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
similarity index 90%
rename from fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
rename to fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index 4024031..018b8c7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -1,4 +1,4 @@
-package com.yeshi.fanli.controller.client;
+package com.yeshi.fanli.controller.client.v1;
import java.io.PrintWriter;
@@ -48,8 +48,7 @@
@Resource
private FloatADService floatADService;
-
-
+
/**
* 棣栭〉閰嶇疆淇℃伅
*
@@ -62,18 +61,18 @@
if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST) {
appHomeFloatImg = null;
}
-
+
JSONObject data = new JSONObject();
if (appHomeFloatImg != null) {
data.put("floatImg", appHomeFloatImg);
}
-
+
String notifyImg = configService.getAppHomeFloatNotifyImg();
if (!StringUtil.isNullOrEmpty(notifyImg)) {
data.put("floatNotifyImg", notifyImg);
}
-
- // 鎮诞澶у浘 1.5.2 -2019.3.20
+
+ // 鎮诞澶у浘 1.5.2 -2019.3.20
FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX);
if (floatAD != null) {
JSONObject detail = new JSONObject();
@@ -82,7 +81,7 @@
detail.put("params", floatAD.getParams());
detail.put("showTime", floatAD.getShowMode());
detail.put("accountLogin", floatAD.isJumpNeedLogin());
-
+
if (uid != null && userInfoExtraService.isNewUser(uid)) {
// 鏂扮敤鎴�
data.put("floatImgDetail", detail);
@@ -90,11 +89,11 @@
data.put("floatImgDetail", detail);
}
}
-
+
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
String couponHelp = configService.get("taobao_coupon_help");
data.put("couponHelpUrl", couponHelp);
-
+
// 搴曢儴缃戦〉閾炬帴
String platform = acceptData.getPlatform();
if ("android".equalsIgnoreCase(platform)) {
@@ -188,24 +187,24 @@
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
e.printStackTrace();
}
-
+
}
-
+
/**
* 璁㈠崟瑙ｆ瀽閰嶇疆
+ *
* @param acceptData
* @param out
*/
@RequestMapping(value = "getOrderParseConfig", method = RequestMethod.POST)
public void getOrderParseConfig(AcceptData acceptData, PrintWriter out) {
- String orderJS = "var orderId= document.getElementById('tp-bought-root').getElementsByClassName('js-order-container')[0].getElementsByTagName('div')[0].getAttribute('data-id');";
- orderJS += "if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href='yestv://taobaoorder#'+orderId;} else {window.handle.showOrder(orderId)}";
+ 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?,")));
+ 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();
}
--
Gitblit v1.8.0