From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java | 19 ++++++++++++++++++-
1 files changed, 18 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 996e214..a7dbf48 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
@@ -20,12 +20,14 @@
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.CustomerContent;
import com.yeshi.fanli.entity.system.SystemClientParams;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.CustomerContentService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.util.ThreadUtil;
import net.sf.json.JSONObject;
@@ -52,8 +54,12 @@
@Resource
private CustomerContentService customerContentService;
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
@RequestMapping("getsystemclientparams")
- public void getSystemClientParams(AcceptData acceptData, 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) {
@@ -110,8 +116,19 @@
: DeviceActive.PLATFORM_IOS);
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);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
}
}
});
--
Gitblit v1.8.0