From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 ebda991..b8744ff 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;
@@ -29,6 +30,7 @@
import com.yeshi.fanli.service.inter.push.IOSPushService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.annotation.UserActive;
import net.sf.json.JSONObject;
@@ -53,13 +55,14 @@
@Resource
private CustomerContentService customerContentService;
-
+
@Resource
private UserInfoExtraService userInfoExtraService;
-
+ @UserActive(uid="#uid")
@RequestMapping("getsystemclientparams")
- public void getSystemClientParams(AcceptData acceptData, Long uid, HttpServletRequest request, PrintWriter out) {
+ public void getSystemClientParams(AcceptData acceptData, Long uid, String mac, HttpServletRequest request,
+ PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
acceptData.getPackages());
if (system == null) {
@@ -87,7 +90,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 +99,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);
}
@@ -117,10 +126,13 @@
da.setVersionCode(Integer.parseInt(acceptData.getVersion()));
da.setIpInfo(ipInfo);
da.setChannel(acceptData.getChannel());
+ da.setImei(acceptData.getImei());
+ da.setMac(mac);
deviceActiveService.addDeviceActive(da);
} catch (Exception e) {
+ e.printStackTrace();
}
-
+
// 鐢ㄦ埛绛夌骇鏇存柊
try {
userInfoExtraService.updateUserRankByUid(uid);
--
Gitblit v1.8.0