From 1b3856e8f5431508d944a3b9c7a444dac3536bb6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 07 一月 2020 18:14:18 +0800
Subject: [PATCH] cofig
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 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 6f11aba..c76cf2b 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
@@ -20,6 +20,7 @@
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.config.AppHomeFloatImg;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
@@ -133,13 +134,13 @@
}
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
- String couponHelp = configService.get("taobao_coupon_help");
+ String couponHelp = configService.get(ConfigKeyEnum.taobaoCouponHelp.getKey());
data.put("couponHelpUrl", couponHelp);
// 搴曢儴缃戦〉閾炬帴
String platform = acceptData.getPlatform();
if ("android".equalsIgnoreCase(platform)) {
- data.put("htmlLink", configService.get("index_html_link_android"));
+ data.put("htmlLink", configService.get(ConfigKeyEnum.indexHtmlLinkAndroid.getKey()));
}
// 鍒ゆ柇鏂拌�佺敤鎴�
@@ -153,7 +154,7 @@
data.put("userTimeType", 1);
}
data.put("hotFuctionLink",
- configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));
+ configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform, Integer.parseInt(acceptData.getVersion())));
out.print(JsonUtil.loadTrueResult(data));
}
@@ -211,10 +212,10 @@
JSONObject data = new JSONObject();
data.put("listAD", JsonUtil.getApiCommonGson().toJson(listVO));
- data.put("protocol", configService.get("user_protocol_home_data"));
+ data.put("protocol", configService.get(ConfigKeyEnum.userProtocolHomeData.getKey()));
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
- String couponHelp = configService.get("taobao_coupon_help");
+ String couponHelp = configService.get(ConfigKeyEnum.taobaoCouponHelp.getKey());
data.put("couponHelpUrl", couponHelp);
// 鍒ゆ柇鏂拌�佺敤鎴� 鏄剧ず鐑棬鍔熻兘鎸夐挳婊戝姩
@@ -231,7 +232,7 @@
// 鏄惁鏄剧ず鐑棬鍔熻兘鎸夐挳
String platform = acceptData.getPlatform();
data.put("hotFuctionLink",
- configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));
+ configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform, Integer.parseInt(acceptData.getVersion())));
if (StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadTrueResult(data));
else
@@ -258,7 +259,7 @@
}
// 鏄惁闇�瑕佽喘鐗╁煄杞摼
- boolean convert = "0".equalsIgnoreCase(configService.get("show_taobao_cart_convert")) ? false : true;
+ boolean convert = "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.showTaobaoCartConvert.getKey())) ? false : true;
if (!"cart".equalsIgnoreCase(position) && !convert) {
out.print(JsonUtil.loadFalseResult(""));
@@ -272,8 +273,8 @@
clientTBPid = tbPidService.getAndroidDefault();
}
- String cartJS = configService.get("taobao_cart_js");
- String cartUrl = configService.get("taobao_cart_link");
+ String cartJS = configService.get(ConfigKeyEnum.taobaoCartJS.getKey());
+ String cartUrl = configService.get(ConfigKeyEnum.taobaoCartLink.getKey());
if (!convert)// 涓嶈浆閾�
{
cartUrl = "http://";
@@ -372,8 +373,8 @@
@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");// 鏀粯瀹濈粦瀹氬け璐ュ師鍥�
+ String alipayHelpUrl = configService.get(ConfigKeyEnum.alipayHelp.getKey());// 鏀粯瀹濆府鍔�
+ String alipayBindFailUrl = configService.get(ConfigKeyEnum.alipayBindFailReason.getKey());// 鏀粯瀹濈粦瀹氬け璐ュ師鍥�
JSONObject data = new JSONObject();
data.put("alipayHelp", alipayHelpUrl);
data.put("alipayBindFailReason", alipayBindFailUrl);
@@ -384,14 +385,14 @@
public void getUserConfig(AcceptData acceptData, PrintWriter out) {
try {
// 鐢ㄦ埛鍗忚閾炬帴
- String serviceProtocol = configService.get("service_protocol_link");
+ String serviceProtocol = configService.get(ConfigKeyEnum.serviceProtocolLink.getKey());
// 闅愮鏉℃閾炬帴
- String privacyProtocol = configService.get("privacy_protocol_link");
+ String privacyProtocol = configService.get(ConfigKeyEnum.privacyProtocolLink.getKey());
JSONObject data = new JSONObject();
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.get(ConfigKeyEnum.taobaoCartJumpDetail.getKey()));
data.put("taoBaoCart", source);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -412,10 +413,10 @@
switch (type) {
case Constant.SOURCE_TYPE_TAOBAO:
- if ("0".equalsIgnoreCase(configService.get("auto_find_taobao_order")))
+ if ("0".equalsIgnoreCase(configService.get(ConfigKeyEnum.autoFindTaobaoOrder.getKey())))
out.print(JsonUtil.loadFalseResult(1, "鏆備笉鏀寔"));
else {
- String orderJS = configService.get("taobao_order_parse_js");
+ String orderJS = configService.get(ConfigKeyEnum.taobaoOrderParseJS.getKey());
JSONObject data = new JSONObject();
try {
data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"),
@@ -454,7 +455,7 @@
public void getOrderConfig(AcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
// 娴嬭瘯
- data.put("showTaoBaoOrder", "0".equalsIgnoreCase(configService.get("show_taobao_order").trim()) ? false : true);
+ data.put("showTaoBaoOrder", "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.showTaobaoOrder.getKey()).trim()) ? false : true);
data.put("taoBaoOrderUrl", "https://main.m.taobao.com/olist/index.html");
out.print(JsonUtil.loadTrueResult(data));
}
@@ -462,7 +463,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("kefu_meiqia")) ? true : false);// 鏄惁璺宠浆缇庢唇锛屼笉璺宠浆缇庢唇灏辩敤鍘熸潵鐨�
+ data.put("meiqia", "1".equalsIgnoreCase(configService.get(ConfigKeyEnum.kefuMeiqia.getKey())) ? true : false);// 鏄惁璺宠浆缇庢唇锛屼笉璺宠浆缇庢唇灏辩敤鍘熸潵鐨�
out.print(JsonUtil.loadTrueResult(data));
// 璁剧疆娑堟伅宸茶
ThreadUtil.run(new Runnable() {
@@ -483,7 +484,7 @@
@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"));
+ data.put("helpUrl", configService.get(ConfigKeyEnum.inviteCodeInputHelp.getKey()));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0