From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java
index 777c35a..0c3fd57 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java
@@ -130,7 +130,7 @@
data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",
Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));
List<BannerVO> pictureList = swiperPictureService.getByBannerCardAndVersion("invite_top_banner",
- acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
if (pictureList != null && pictureList.size() > 0) {
BannerVO picture = pictureList.get(0);
com.alibaba.fastjson.JSONObject pictureJson = new com.alibaba.fastjson.JSONObject();
@@ -140,7 +140,7 @@
data.put("topBanner", pictureJson);
}
- data.put("desc", configService.get(ConfigKeyEnum.inviteDesc.getKey()));
+ data.put("desc", configService.getValue(ConfigKeyEnum.inviteDesc.getKey(),acceptData.getSystem()));
boolean hasCode = false;
if (uid != null && uid.trim().length() > 0) {
@@ -152,7 +152,7 @@
// 閭�璇锋縺娲婚摼鎺�
if (!hasCode) {
- data.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
+ data.put("activationlink", configService.getValue(ConfigKeyEnum.inviteActivationUrl.getKey(),acceptData.getSystem()));
}
data.put("hasCode", hasCode);
@@ -168,7 +168,6 @@
* 鏂规硶璇存槑: 鍒嗕韩濂藉弸閭�璇峰浘鐗�
*
* @author mawurui createTime 2018骞�4鏈�3鏃� 涓嬪崍3:49:05
- * @param pageIndex
* @param out
* @param uid
* @throws NotExistObjectException
@@ -207,7 +206,7 @@
String valueN = values.getValue();
String valueBr = valueN.replace("\n", "<br><br>");
- data.put("helpLink", configService.get(ConfigKeyEnum.inviteHelpLink.getKey()));
+ data.put("helpLink", configService.getValue(ConfigKeyEnum.inviteHelpLink.getKey(),acceptData.getSystem()));
data.put("inviteRules", valueBr);
out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛"));
@@ -222,7 +221,7 @@
@RequestMapping(value = "getActivationTip")
public void getActivationTip(AcceptData acceptData, String callback, PrintWriter out) {
try {
- String tip = configService.get(ConfigKeyEnum.inviteActivationTip.getKey());
+ String tip = configService.getValue(ConfigKeyEnum.inviteActivationTip.getKey(),acceptData.getSystem());
if (tip == null || tip.trim().length() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鎻愰啋"));
return;
@@ -283,10 +282,8 @@
/**
* 婵�娲婚個璇�
*
- * @param callback
* @param uid
* 鐢ㄦ埛id
- * @param inviteCode
* 閭�璇峰槢
* @param out
*/
@@ -334,7 +331,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("閭�璇风爜涓嶅瓨鍦�"));
return;
}
- String tip = configService.get(ConfigKeyEnum.inviteActivationSuccessTip.getKey());
+ String tip = configService.getValue(ConfigKeyEnum.inviteActivationSuccessTip.getKey(),acceptData.getSystem());
JSONObject data = new JSONObject();
data.put("inviteCode", inviteCode);
--
Gitblit v1.8.0