Parcourir la source

fix bing terminal field null and log error

huodongdong il y a 7 ans
Parent
commit
190f0e601b

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

@@ -28,7 +28,7 @@ public class LoginController {
     public APIResult<UserInfoVo> login(HttpServletRequest request, @Valid @RequestBody LoginInfoDTO loginInfoDTO) {
         String ip = HttpUtil.getClientIp(request);
         loginInfoDTO.setIp(ip);
-        loginInfoDTO.setTerminal((String) request.getAttribute("terminal"));
+        loginInfoDTO.setTerminal(request.getHeader("terminal"));
         return userService.login(loginInfoDTO);
     }
 

+ 0 - 1
rankin-api-web/src/main/java/cn/rankin/apiweb/intercepter/RequestSignatureInterceptor.java

@@ -87,7 +87,6 @@ public class RequestSignatureInterceptor implements HandlerInterceptor {
             return false;
         }
 
-        request.setAttribute("terminal", headers.getTerminal());
         request.setAttribute("RANKIN_DEVICE_USER_INFO", du);
 //        if (true) {
 //            return true;

+ 1 - 1
rankin-user-service/src/main/java/cn/rankin/userservice/service/TerminalDeviceBindLogService.java

@@ -19,7 +19,7 @@ public class TerminalDeviceBindLogService {
         deviceBindLog.setDeviceCode(deviceCode);
         deviceBindLog.setUserId(userId);
         deviceBindLog.setBrand(brand);
-        deviceBindLog.setId(ip);
+        deviceBindLog.setIp(ip);
         deviceBindLog.setModelNo(modelNo);
         deviceBindLog.setTerminal(terminal);
         return terminalDeviceBindLogRepository.save(deviceBindLog);