From 15047d62d27fbe4f99b7f93292c2cf9709b7cc97 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 08:53:39 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java
index cff83bb..2c19ebd 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.wcs.system.service.impl;
+import com.zy.asrs.common.utils.IpTools;
import com.zy.asrs.wcs.system.mapper.UserLoginMapper;
import com.zy.asrs.wcs.system.entity.UserLogin;
import com.zy.asrs.wcs.system.service.UserLoginService;
@@ -14,16 +15,16 @@
@Async
@Override
- public void saveAsync(Long userId, Integer type, String comments, Long hostId, HttpServletRequest request) {
+ public void saveAsync(Long userId, String token, Integer type, Long hostId, String memo, HttpServletRequest request) {
if (userId == null) {
return;
}
UserLogin userLogin = new UserLogin();
userLogin.setUserId(userId);
+ userLogin.setToken(token);
userLogin.setType(type);
- userLogin.setMemo(comments);
- userLogin.setHostId(hostId);
- userLogin.setIp(request.getRequestURI());
+ userLogin.setIp(IpTools.gainRealIp(request));
+ userLogin.setMemo(memo);
baseMapper.insert(userLogin);
}
--
Gitblit v1.9.1