From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 11 ++++++++---
1 files changed, 8 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 2d528d2..0537762 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
@@ -33,7 +33,6 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.VersionUtil;
-import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
import net.sf.json.JSONObject;
@@ -244,7 +243,11 @@
@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?")) {
+ 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
data.put("goodsDetail", true);// 闇�瑕佹嫤鎴晢鍝佽鎯�
@@ -261,7 +264,9 @@
data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
- } else if (url != null && (url.contains("yangkeduo.com")) && !url.contains("yangkeduo.com/goods.html?")) {
+ } 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 {
--
Gitblit v1.8.0