From 30a6347998c58ce2c57c8074350c0e63f01c48bd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 23 九月 2019 10:43:43 +0800
Subject: [PATCH] 设备活跃增加mac地址记录
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 7a4199e..f5dc23a 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
@@ -76,8 +76,8 @@
@Resource
private UserActiveLogService userActiveLogService;
- /**s
- * 棣栭〉閰嶇疆淇℃伅
+ /**
+ * s 棣栭〉閰嶇疆淇℃伅
*
* @param acceptData
* @param out
@@ -154,7 +154,8 @@
} 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));
}
@@ -282,7 +283,8 @@
data.put("serviceProtocolLink", serviceProtocol);
data.put("privacyProtocolLink", privacyProtocol);
// 璐墿杞﹁烦杞柟寮�(鍖呭惈jumpDetail涓巔arams)
- JSONObject source = JSONObject.fromObject(configService.get("taobao_cart_jump_detail"));
+ JSONObject source = JSONObject.fromObject(configService.getByVersion("taobao_cart_jump_detail",
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())));
data.put("taoBaoCart", source);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -348,7 +350,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