From 0392154afd78f314386c2e6669ead9a2c89c79b4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 23 九月 2019 10:44:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java |    4 +++-
 1 files changed, 3 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 1603417..b16c4a7 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
@@ -58,7 +58,8 @@
 	private UserInfoExtraService userInfoExtraService;
 
 	@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) {
@@ -117,6 +118,7 @@
 					da.setIpInfo(ipInfo);
 					da.setChannel(acceptData.getChannel());
 					da.setImei(acceptData.getImei());
+					da.setMac(mac);
 					deviceActiveService.addDeviceActive(da);
 				} catch (Exception e) {
 				}

--
Gitblit v1.8.0