From a2e1c7d998710a6c85b5f374404e1c4873d431d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 26 二月 2024 15:14:39 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java | 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 | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java | 2 +-
zy-asrs-flow/src/pages/system/userLogin/index.jsx | 40 +++++++++++++++++++++++++++++++++++++---
5 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/userLogin/index.jsx b/zy-asrs-flow/src/pages/system/userLogin/index.jsx
index 5f796a0..75a41b5 100644
--- a/zy-asrs-flow/src/pages/system/userLogin/index.jsx
+++ b/zy-asrs-flow/src/pages/system/userLogin/index.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Modal, Tag } from 'antd';
import {
FooterToolbar,
PageContainer,
@@ -14,6 +14,25 @@
import { repairBug } from '@/utils/common-util';
const TABLE_KEY = "pro-table-userLogin";
+
+const typeMap = {
+ 0: {
+ color: '#87d068',
+ text: '鐧诲綍鎴愬姛',
+ },
+ 1: {
+ color: '#f50',
+ text: '鐧诲綍澶辫触',
+ },
+ 2: {
+ color: '',
+ text: '閫�鍑虹櫥褰�',
+ },
+ 3: {
+ color: '#3b5999',
+ text: '缁token',
+ },
+};
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -128,6 +147,7 @@
dataIndex: 'token',
valueType: 'text',
hidden: false,
+ ellipsis: true,
width: 140,
copyable: true,
filterDropdown: (props) => <TextFilter
@@ -156,12 +176,22 @@
valueType: 'text',
hidden: false,
width: 140,
- filterDropdown: (props) => <TextFilter
+ filterDropdown: (props) => <SelectFilter
name='type'
{...props}
actionRef={actionRef}
setSearchParam={setSearchParam}
+ data={[
+ { label: '鐧诲綍鎴愬姛', value: 0 },
+ { label: '鐧诲綍澶辫触', value: 1 },
+ { label: '閫�鍑虹櫥褰�', value: 2 },
+ { label: '缁token', value: 3 },
+ ]}
/>,
+ render: (_, record) => {
+ const type = typeMap[record.type]
+ return <Tag color={type.color}>{type.text}</Tag>
+ },
},
{
title: '娣诲姞鏃堕棿',
@@ -207,11 +237,13 @@
title: '鎿嶄綔',
dataIndex: 'option',
width: 140,
+ hidden: true,
valueType: 'option',
render: (_, record) => [
<Button
type="link"
key="edit"
+ hidden="true"
onClick={() => {
setModalVisible(true);
setCurrentRow(record);
@@ -222,6 +254,7 @@
<Button
type="link"
danger
+ hidden="true"
key="batchRemove"
onClick={async () => {
Modal.confirm({
@@ -283,6 +316,7 @@
<Button
type="primary"
key="save"
+ hidden="true"
onClick={async () => {
setModalVisible(true)
}}
@@ -327,7 +361,7 @@
/>
</div>
- {selectedRows?.length > 0 && (
+ {selectedRows?.length > 0 && false && (
<FooterToolbar
extra={
<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 96e5f05..c46c5bd 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(), token, UserLogin.TYPE_REFRESH, null, request);
+ userLoginService.saveAsync(user.getId(), token, UserLogin.TYPE_REFRESH, user.getHostId(), 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 e5d6e72..9af0dcb 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
@@ -57,7 +57,7 @@
}
String accessToken = JwtUtil.buildToken(new JwtSubject(username, user.getHostId()),
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
- userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, null, request);
+ userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, hostId, 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 d7f7834..3342a49 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, String token, Integer type, String memo, HttpServletRequest request);
+ void saveAsync(Long userId, String token, Integer type, Long hostId, 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 6eec427..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
@@ -15,7 +15,7 @@
@Async
@Override
- public void saveAsync(Long userId, String token, Integer type, String memo, HttpServletRequest request) {
+ public void saveAsync(Long userId, String token, Integer type, Long hostId, String memo, HttpServletRequest request) {
if (userId == null) {
return;
}
--
Gitblit v1.9.1