From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index 05f36b2..54a979e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -77,13 +77,16 @@
private UserActiveLogService userActiveLogService;
/**
- * 棣栭〉閰嶇疆淇℃伅
+ * s 棣栭〉閰嶇疆淇℃伅
*
* @param acceptData
* @param out
*/
@RequestMapping(value = "getHomeConfig", method = RequestMethod.POST)
public void getHomeConfig(AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid != null && uid == 0L)
+ uid = null;
+
AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST) {
appHomeFloatImg = null;
@@ -345,7 +348,19 @@
"android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2);
}
});
+ }
+ /**
+ * 鑾峰彇閭�璇风爜甯姪閾炬帴
+ *
+ * @param acceptData
+ * @param out
+ */
+ @RequestMapping(value = "getInviteCodeInputHelp", method = RequestMethod.POST)
+ public void getInviteCodeInputHelp(AcceptData acceptData, PrintWriter out) {
+ JSONObject data = new JSONObject();
+ data.put("helpUrl", configService.get("invite_code_input_help"));
+ out.print(JsonUtil.loadTrueResult(data));
}
}
--
Gitblit v1.8.0