From 8f84f110e635237eace24f0077e9ab8f6b53d480 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 17:33:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java
index b16c4a7..5c9f6e4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java
@@ -18,6 +18,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.CustomerContent;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.log.LogHelper;
@@ -87,7 +88,7 @@
if (ssp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
ssp.setValue("1");
- } else if (ssp.getKey().equalsIgnoreCase("home_weex_url")) {
+ } else if (ssp.getKey().equalsIgnoreCase(ConfigKeyEnum.homeWeexUrl.getKey())) {
if (("android".equalsIgnoreCase(acceptData.getPlatform())
&& Integer.parseInt(acceptData.getVersion()) < 36)) {
// 鑰佺増鏈瑆eex锛�1.5.1涔嬪墠鐨勶級
@@ -96,6 +97,12 @@
&& Integer.parseInt(acceptData.getVersion()) < 44 && system.getId().longValue() != 5L)
ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");
}
+
+ // 鍚屾绠＄悊config
+ if (ssp.getKey().equalsIgnoreCase("inviteRules")) {
+ ssp.setValue(configService.get(ConfigKeyEnum.inviteRules.getKey()) );
+ }
+
list.add(ssp);
}
@@ -121,6 +128,7 @@
da.setMac(mac);
deviceActiveService.addDeviceActive(da);
} catch (Exception e) {
+ e.printStackTrace();
}
// 鐢ㄦ埛绛夌骇鏇存柊
--
Gitblit v1.8.0