From f862a844ea7e212f8cc0622b858308e2b91dca2e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 16:35:50 +0800
Subject: [PATCH] 后台管理相关Controller注入系统
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 61 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
index c1db418..407550c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -117,7 +117,7 @@
if (uid != null && uid == 0L)
uid = null;
- AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
+ AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg(acceptData.getSystem());
if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST) {
appHomeFloatImg = null;
}
@@ -127,7 +127,7 @@
data.put("floatImg", appHomeFloatImg);
}
- String notifyImg = configService.getAppHomeFloatNotifyImg();
+ String notifyImg = configService.getAppHomeFloatNotifyImg(acceptData.getSystem());
if (!StringUtil.isNullOrEmpty(notifyImg)) {
data.put("floatNotifyImg", notifyImg);
}
@@ -146,13 +146,13 @@
}
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
- String couponHelp = configService.get(ConfigKeyEnum.taobaoCouponHelp.getKey());
+ String couponHelp = configService.getValue(ConfigKeyEnum.taobaoCouponHelp.getKey(),acceptData.getSystem());
data.put("couponHelpUrl", couponHelp);
// 搴曢儴缃戦〉閾炬帴
String platform = acceptData.getPlatform();
if ("android".equalsIgnoreCase(platform)) {
- data.put("htmlLink", configService.get(ConfigKeyEnum.indexHtmlLinkAndroid.getKey()));
+ data.put("htmlLink", configService.getValue(ConfigKeyEnum.indexHtmlLinkAndroid.getKey(),acceptData.getSystem()));
}
// 鍒ゆ柇鏂拌�佺敤鎴�
@@ -166,7 +166,7 @@
data.put("userTimeType", 1);
}
data.put("hotFuctionLink", configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform,
- Integer.parseInt(acceptData.getVersion())));
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
out.print(JsonUtil.loadTrueResult(data));
}
@@ -188,7 +188,7 @@
List<FloatAD> listAD = new ArrayList<FloatAD>();
List<FloatImgDetailVO> listVO = new ArrayList<FloatImgDetailVO>();
List<FloatAD> list = floatADService.getValidFloatADCache(FloatAD.POSITION_INDEX, null, platform,
- Integer.parseInt(version));
+ Integer.parseInt(version),acceptData.getSystem());
if (list != null && !list.isEmpty())
listAD.addAll(list);
@@ -226,10 +226,10 @@
JSONObject data = new JSONObject();
data.put("listAD", JsonUtil.getApiCommonGson().toJson(listVO));
- data.put("protocol", configService.get(ConfigKeyEnum.userProtocolHomeData.getKey()));
+ data.put("protocol", configService.getValue(ConfigKeyEnum.userProtocolHomeData.getKey(),acceptData.getSystem()));
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
- String couponHelp = configService.get(ConfigKeyEnum.taobaoCouponHelp.getKey());
+ String couponHelp = configService.getValue(ConfigKeyEnum.taobaoCouponHelp.getKey(),acceptData.getSystem());
data.put("couponHelpUrl", couponHelp);
// 鍒ゆ柇鏂拌�佺敤鎴� 鏄剧ず鐑棬鍔熻兘鎸夐挳婊戝姩
@@ -245,7 +245,7 @@
// 鏄惁鏄剧ず鐑棬鍔熻兘鎸夐挳
data.put("hotFuctionLink",
- configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform, Integer.parseInt(version)));
+ configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform, Integer.parseInt(version),acceptData.getSystem()));
if (StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadTrueResult(data));
else
@@ -272,7 +272,7 @@
}
// 鏄惁闇�瑕佽喘鐗╁煄杞摼
- boolean convert = "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.showTaobaoCartConvert.getKey())) ? false
+ boolean convert = "0".equalsIgnoreCase(configService.getValue(ConfigKeyEnum.showTaobaoCartConvert.getKey(),acceptData.getSystem())) ? false
: true;
if (!"cart".equalsIgnoreCase(position) && !convert) {
@@ -287,8 +287,8 @@
clientTBPid = tbPidService.getAndroidDefault();
}
- String cartJS = configService.get(ConfigKeyEnum.taobaoCartJS.getKey());
- String cartUrl = configService.get(ConfigKeyEnum.taobaoCartLink.getKey());
+ String cartJS = configService.getValue(ConfigKeyEnum.taobaoCartJS.getKey(),acceptData.getSystem());
+ String cartUrl = configService.getValue(ConfigKeyEnum.taobaoCartLink.getKey(),acceptData.getSystem());
if (!convert)// 涓嶈浆閾�
{
cartUrl = "http://";
@@ -383,7 +383,7 @@
@RequestMapping(value = "getWebJS", method = RequestMethod.POST)
public void getWebJS(AcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
- String urlIdJS = configService.get("url_extract_id");
+ String urlIdJS = configService.getValue("url_extract_id",acceptData.getSystem());
data.put("urlIdJSMD5", StringUtil.Md5(urlIdJS));
data.put("urlIdJS", AESUtil.encrypt(urlIdJS, Constant.UIDAESKEY));
out.print(JsonUtil.loadTrueResult(data));
@@ -393,14 +393,13 @@
* 鑾峰彇璐﹀彿缁戝畾涓殑閰嶇疆淇℃伅
*
* @param acceptData
- * @param uid
* @param out
*/
@RequestMapping(value = "getBindAccountConfig", method = RequestMethod.POST)
public void getBindAccountConfig(AcceptData acceptData, PrintWriter out) {
- String alipayHelpUrl = configService.get(ConfigKeyEnum.alipayHelp.getKey());// 鏀粯瀹濆府鍔�
- String alipayBindFailUrl = configService.get(ConfigKeyEnum.alipayBindFailReason.getKey());// 鏀粯瀹濈粦瀹氬け璐ュ師鍥�
+ String alipayHelpUrl = configService.getValue(ConfigKeyEnum.alipayHelp.getKey(),acceptData.getSystem());// 鏀粯瀹濆府鍔�
+ String alipayBindFailUrl = configService.getValue(ConfigKeyEnum.alipayBindFailReason.getKey(),acceptData.getSystem());// 鏀粯瀹濈粦瀹氬け璐ュ師鍥�
JSONObject data = new JSONObject();
data.put("alipayHelp", alipayHelpUrl);
data.put("alipayBindFailReason", alipayBindFailUrl);
@@ -419,7 +418,7 @@
JSONObject data = new JSONObject();
// 娴嬭瘯
data.put("showTaoBaoOrder",
- "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.showTaobaoOrder.getKey()).trim()) ? false : true);
+ "0".equalsIgnoreCase(configService.getValue(ConfigKeyEnum.showTaobaoOrder.getKey(),acceptData.getSystem()).trim()) ? false : true);
data.put("taoBaoOrderUrl", "https://main.m.taobao.com/olist/index.html");
out.print(JsonUtil.loadTrueResult(data));
}
@@ -427,7 +426,7 @@
@RequestMapping(value = "getKeFuConfig", method = RequestMethod.POST)
public void getKeFuConfig(AcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
- data.put("meiqia", "1".equalsIgnoreCase(configService.get(ConfigKeyEnum.kefuMeiqia.getKey())) ? true : false);// 鏄惁璺宠浆缇庢唇锛屼笉璺宠浆缇庢唇灏辩敤鍘熸潵鐨�
+ data.put("meiqia", "1".equalsIgnoreCase(configService.getValue(ConfigKeyEnum.kefuMeiqia.getKey(),acceptData.getSystem())) ? true : false);// 鏄惁璺宠浆缇庢唇锛屼笉璺宠浆缇庢唇灏辩敤鍘熸潵鐨�
out.print(JsonUtil.loadTrueResult(data));
// 璁剧疆娑堟伅宸茶
ThreadUtil.run(new Runnable() {
@@ -448,7 +447,7 @@
@RequestMapping(value = "getInviteCodeInputHelp", method = RequestMethod.POST)
public void getInviteCodeInputHelp(AcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
- data.put("helpUrl", configService.get(ConfigKeyEnum.inviteCodeInputHelp.getKey()));
+ data.put("helpUrl", configService.getValue(ConfigKeyEnum.inviteCodeInputHelp.getKey(),acceptData.getSystem()));
out.print(JsonUtil.loadTrueResult(data));
}
@@ -686,28 +685,38 @@
*/
@RequestMapping(value = "getShowAd")
public void showAd(AcceptData acceptData, Long uid, PrintWriter out) {
- String value = configService.get(ConfigKeyEnum.showSplashAd.getKey());
+ String value = configService.getValue(ConfigKeyEnum.showSplashAd.getKey(),acceptData.getSystem());
+ boolean huaweiShowAd = true;
+ if ("huawei".equalsIgnoreCase(acceptData.getChannel())) {
+ String version = configService.getValue(ConfigKeyEnum.huaweiOnLineVersionCode.getKey(),acceptData.getSystem());
+ if (!StringUtil.isNullOrEmpty(version)) {
+ if (Integer.parseInt(version) == Integer.parseInt(acceptData.getVersion())) {
+ huaweiShowAd = false;
+ }
+ }
+ }
+
JSONObject data = new JSONObject();
if ("0".equalsIgnoreCase(value.trim())) {
data.put("show", false);
} else {
- data.put("show", true);
+ if (huaweiShowAd)
+ data.put("show", true);
+ else
+ data.put("show", false);
}
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
* 鑾峰彇娉ㄩ攢鍗忚
* @param acceptData
- * @param uid
- * @param type
* @param out
*/
@RequestMapping(value = "getLogoutProtocol")
- public void getLogoutProtocol(String callback, AcceptData acceptData,PrintWriter out) {
+ public void getLogoutProtocol(String callback, AcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
- data.put("link", configService.get(ConfigKeyEnum.accountLogoutProtocolLink.getKey()));
+ data.put("link", configService.getValue(ConfigKeyEnum.accountLogoutProtocolLink.getKey(),acceptData.getSystem()));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
}
--
Gitblit v1.8.0