From 1bcfd2d6949bff749cec105f2f56d107edb519e5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 10:48:19 +0800
Subject: [PATCH] 增加配置信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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/ConfigController.java
index 28c2f04..df7027d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
@@ -74,6 +74,10 @@
} else
data.put("floatImgDetail", config);
}
+ // 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
+ String couponHelp = configService.get("taobao_coupon_help");
+ data.put("couponHelpUrl", couponHelp);
+
out.print(JsonUtil.loadTrueResult(data));
}
@@ -108,16 +112,16 @@
}
String cartJS = configService.get("taobao_cart_js");
- String cartUrl=configService.get("taobao_cart_link");
+ String cartUrl = configService.get("taobao_cart_link");
String js = null;
- String link=null;
+ String link = null;
try {
js = DESUtil.encode(cartJS, StringUtil.getBase64String("YeShiFANLI889*+"),
StringUtil.getBase64String("*M#34f?,"));
} catch (Exception e) {
e.printStackTrace();
}
-
+
try {
link = DESUtil.encode(cartUrl, StringUtil.getBase64String("YeShiFANLI889*+"),
StringUtil.getBase64String("*M#34f?,"));
@@ -131,6 +135,18 @@
out.print(JsonUtil.loadTrueResult(data));
}
+ @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"))) {
+ data.put("baichuan", true);// 閲囩敤闃块噷鐧惧窛鐨勬柟寮忓姞杞絯ebview
+ data.put("goodsDetail", true);// 闇�瑕佹嫤鎴晢鍝佽鎯�
+ } else {
+ data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
+ data.put("goodsDetail", false);// 涓嶉渶瑕佹嫤鎴晢鍝佽鎯�
+ }
+ }
+
/**
* 鑾峰彇璐﹀彿缁戝畾涓殑閰嶇疆淇℃伅
*
--
Gitblit v1.8.0