修改用户设备信息

rankin-api-web/src/main/java/cn/rankin/apiweb/controller/LoginController.java

@@ -40,7 +40,6 @@ public class LoginController
         String terminal = request.getHeader("terminal");
         String merchant = request.getHeader("merchant");
         String userAgent = request.getHeader("User-Agent");
-        log.info("request.getRemoteUser()"+request.getRemoteUser());
 
         String ip = HttpUtil.getClientIp(request);
         loginInfoDTO.setIp(ip);

rankin-api-web/src/main/java/cn/rankin/apiweb/helper/MacAddressHelper.java

@@ -136,8 +136,10 @@ public class MacAddressHelper
         return macAddress;
     }
     public static void main(String[] args) {
-        String mac=getMacInLinux("47.95.197.36");
-        System.out.println("mac:"+mac);
+
+
+        String mac1=getMacInLinux("127.0.0.1");
+        System.out.println("mac:"+mac1);
     }
 
 }

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserClient.java

@@ -4,6 +4,7 @@ import cn.rankin.apiweb.code.ApiWebCode;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.data.api.user.dto.TerminalDeviceDTO;
+import cn.rankin.data.api.user.dto.UserDeviceDTO;
 import cn.rankin.data.api.user.entity.UserRecommend;
 import cn.rankin.data.api.user.entity.UserTag;
 import cn.rankin.data.api.user.entity.UserTagProductRelation;
@@ -61,11 +62,7 @@ public interface UserClient
 
     @RequestMapping(value = "/userDevice/op/{uid}", method = RequestMethod.GET)
     int opUserDevice(@PathVariable("uid") String uid,
-                          @RequestParam("deviceCode") String deviceCode,
-                          @RequestParam("deviceMode") String deviceMode,
-                          @RequestParam("deviceMfrs") String deviceMfrs,
-                          @RequestParam("deviceName") String deviceName,
-                          @RequestParam("deviceType") String deviceType);
+                     @RequestBody UserDeviceDTO userDeviceDTO);
 
 
     @RequestMapping(value = "/userTagProductRelation/page/pids", method = RequestMethod.POST)
@@ -151,7 +148,7 @@ public interface UserClient
         }
 
         @Override
-        public int opUserDevice(String uid, String deviceCode, String deviceMode, String deviceMfrs, String deviceName,String deviceType)
+        public int opUserDevice(String uid, UserDeviceDTO userDeviceDTO)
         {
             return 0;
         }

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserService.java

@@ -14,6 +14,7 @@ import cn.rankin.data.api.app.vo.DeviceUserVo;
 import cn.rankin.data.api.app.vo.ItemVo;
 import cn.rankin.data.api.app.vo.UserInfoVo;
 import cn.rankin.data.api.user.dto.TerminalDeviceDTO;
+import cn.rankin.data.api.user.dto.UserDeviceDTO;
 import cn.rankin.data.api.user.entity.UserRecommend;
 import cn.rankin.data.api.user.entity.UserTag;
 import cn.rankin.data.api.user.entity.UserTagProductRelation;
@@ -82,7 +83,14 @@ public class UserService
         if (deviceName != null && !"".equals(deviceName.trim()))
         {
             String uid = userVo.getId();
-            int opRet = userClient.opUserDevice(uid, deviceCode, deviceModel, deviceMfrs, deviceName, deviceType);
+            UserDeviceDTO dto = new UserDeviceDTO();
+            dto.setDeviceCode(deviceCode);
+            dto.setDeviceModel(deviceModel);
+            dto.setDeviceType(deviceType);
+            dto.setDeviceMfrs(deviceMfrs);
+            dto.setDeviceMfrs(deviceName);
+
+            int opRet = userClient.opUserDevice(uid,dto);
             if (opRet == 0)
             {
                 log.error("Failed to operated user device with[uid={},deviceCode={},deviceModel={},deviceName={}]", uid, deviceCode, deviceModel, deviceName);