|
@@ -46,9 +46,9 @@ public class LoginController
|
|
|
loginInfoDTO.setMerchant(merchant);
|
|
|
|
|
|
//填充设备信息
|
|
|
- fillDeviceInfo(userAgent,loginInfoDTO);
|
|
|
+ fillDeviceInfo(userAgent, loginInfoDTO);
|
|
|
|
|
|
- log.info("login request header : ip={},terminal={},merchant={},user-agent={}", ip, terminal, merchant,userAgent);
|
|
|
+ log.info("login request header : ip={},terminal={},merchant={},user-agent={}", ip, terminal, merchant, userAgent);
|
|
|
|
|
|
|
|
|
return userService.login(loginInfoDTO);
|
|
@@ -113,6 +113,10 @@ public class LoginController
|
|
|
loginInfoDTO.setDeviceModel(model);
|
|
|
}
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ loginInfoDTO.setDeviceModel(osName);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
}
|