From 21f49216736c547d99ec1dd46a24c6f43f852fc5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 05 十二月 2018 10:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 ede3bef..246c199 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
@@ -90,7 +90,7 @@
String cartJS = configService.get("taobao_cart_js");
String js = null;
try {
- js = DESUtil.encode(cartJS, StringUtil.getBase64String("YeShiFANLI889*+"),
+ js = DESUtil.encode(cartJS, StringUtil.getBase64String("YeShiFANLI889*+"),
StringUtil.getBase64String("*M#34f?,"));
} catch (Exception e) {
e.printStackTrace();
@@ -101,4 +101,22 @@
out.print(JsonUtil.loadTrueResult(data));
}
+ /**
+ * 鑾峰彇璐﹀彿缁戝畾涓殑閰嶇疆淇℃伅
+ *
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+
+ @RequestMapping(value = "getBindAccountConfig", method = RequestMethod.POST)
+ public void getBindAccountConfig(AcceptData acceptData, PrintWriter out) {
+ String alipayHelpUrl = configService.get("alipay_help");// 鏀粯瀹濆府鍔�
+ String alipayBindFailUrl = configService.get("alipay_bind_fail_reason");// 鏀粯瀹濈粦瀹氬け璐ュ師鍥�
+ JSONObject data = new JSONObject();
+ data.put("alipayHelp", alipayHelpUrl);
+ data.put("alipayBindFailReason", alipayBindFailUrl);
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
}
--
Gitblit v1.8.0