From 1a2892aa45de9de5d8f145062938102144eaa6fe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 九月 2019 11:28:33 +0800
Subject: [PATCH] 解决华为并发问题
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
index 225b9e2..a6c2ac2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
@@ -32,6 +33,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.jd.JDUtil;
import net.sf.json.JSONObject;
@@ -41,6 +43,7 @@
* @author Administrator
*
*/
+@Controller
@RequestMapping("api/v2/config")
public class ConfigControllerV2 {
@@ -152,7 +155,7 @@
} else {// 鑰佷汉
data.put("userTimeType", 1);
}
- data.put("hotFuctionLink", configService.get("hot_function_url"));
+ data.put("hotFuctionLink",configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));
out.print(JsonUtil.loadTrueResult(data));
}
@@ -240,14 +243,43 @@
@RequestMapping(value = "getWebConfig", method = RequestMethod.POST)
public void getWebConfig(AcceptData acceptData, String url, PrintWriter out) {
JSONObject data = new JSONObject();
- if (url != null && (url.contains("s.click") || url.contains("taobao.com") || url.contains("tmall.com")
+
+ if (url != null && url.contains("ifeeds.tmall.com/article.html?")) {
+ if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()))
+ data.put("baichuan", false);
+ else
+ data.put("baichuan", true);
+ data.put("goodsDetail", false);
+ } else if (url != null && (url.contains("s.click") || url.contains("taobao.com") || url.contains("tmall.com")
|| url.contains("m.tb.cn"))) {
- data.put("baichuan", true);// 閲囩敤闃块噷鐧惧窛鐨勬柟寮忓姞杞絯ebview
+ if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()))
+ data.put("baichuan", false);
+ else
+ data.put("baichuan", true);
data.put("goodsDetail", true);// 闇�瑕佹嫤鎴晢鍝佽鎯�
+ } else if (url != null && (url.contains("jd.com"))) {
+ // 涓嶈兘鍖呭惈璇︽儏椤�
+ String skuId = JDUtil.parseJDSkuIdByUrl(url);
+ if (StringUtil.isNullOrEmpty(skuId))// 涓嶈兘鎷︽埅璇︽儏椤甸潰锛岄槻姝㈠墠绔繘鍏ユ寰幆
+ if (url.startsWith("https://union-click.jd.com/jdc?"))
+ data.put("goodsDetail", false);
+ else
+ data.put("goodsDetail", true);
+ else
+ data.put("goodsDetail", false);
+
+ data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
+
+ } else if (url != null && ((url.contains("yangkeduo.com") && !url.contains("yangkeduo.com/goods.html?")
+ && !url.contains("yangkeduo.com/duo_coupon_landing.html?"))
+ || (url.startsWith("https://p.pinduoduo.com/")))) {
+ data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
+ data.put("goodsDetail", true);// 涓嶉渶瑕佹嫤鎴晢鍝佽鎯�
} else {
data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
data.put("goodsDetail", false);// 涓嶉渶瑕佹嫤鎴晢鍝佽鎯�
}
+
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0