From e6d1561133708772a1a5ccffc49a4722e4f74894 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 26 二月 2024 14:56:26 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java | 2 +-
zy-asrs-flow/src/components/RightContent/index.jsx | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserLoginService.java | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java | 9 +++++----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-flow/src/components/RightContent/index.jsx b/zy-asrs-flow/src/components/RightContent/index.jsx
index 7357063..fb0b71f 100644
--- a/zy-asrs-flow/src/components/RightContent/index.jsx
+++ b/zy-asrs-flow/src/components/RightContent/index.jsx
@@ -65,7 +65,7 @@
}}
onClick={handleClick}
>
- {layoutMode ? <InsertRowAboveOutlined /> : <InsertRowLeftOutlined />}
+ {layoutMode ? <InsertRowLeftOutlined /> : <InsertRowAboveOutlined />}
</div>
);
};
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java
index accf7d8..96e5f05 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java
@@ -93,7 +93,7 @@
String token = JwtUtil.buildToken(jwtSubject, configProperties.getTokenExpireTime(),
configProperties.getTokenKey());
response.addHeader(Constants.TOKEN_HEADER_NAME, token);
- userLoginService.saveAsync(user.getId(), UserLogin.TYPE_REFRESH, null, user.getHostId(), request);
+ userLoginService.saveAsync(user.getId(), token, UserLogin.TYPE_REFRESH, null, request);
}
}
} catch (ExpiredJwtException e) {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
index d2806d5..e5d6e72 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
@@ -55,9 +55,9 @@
if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
return R.error("瀵嗙爜閿欒");
}
- userLoginService.saveAsync(user.getId(), UserLogin.TYPE_LOGIN, null, hostId, request);
String accessToken = JwtUtil.buildToken(new JwtSubject(username, user.getHostId()),
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
+ userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, null, request);
return R.ok("鐧诲綍鎴愬姛").add(new LoginResult(accessToken, user));
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserLoginService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserLoginService.java
index 8e18fd7..d7f7834 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserLoginService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserLoginService.java
@@ -7,6 +7,6 @@
public interface UserLoginService extends IService<UserLogin> {
- void saveAsync(Long userId, Integer type, String comments, Long hostId, HttpServletRequest request);
+ void saveAsync(Long userId, String token, Integer type, String memo, HttpServletRequest request);
}
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..6eec427 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, 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