From 979984ca491fd2299607d24f9da1cc945fb020d5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 04 二月 2024 16:30:48 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java | 1 -
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java | 4 +++-
zy-asrs-wcs/src/main/resources/mapper/sys/UserRoleMapper.xml | 2 +-
zy-asrs-flow/src/pages/Admin.jsx | 27 +++++++++++++++++++++++++--
4 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-flow/src/pages/Admin.jsx b/zy-asrs-flow/src/pages/Admin.jsx
index 2eba4ec..0d74f04 100644
--- a/zy-asrs-flow/src/pages/Admin.jsx
+++ b/zy-asrs-flow/src/pages/Admin.jsx
@@ -85,6 +85,29 @@
},
],
},
+ {
+ name: '鍒楄〃椤�',
+ path: '/list',
+ component: './ListTableList',
+ routes: [
+ {
+ path: '/list/sub-page',
+ name: '鍒楄〃椤甸潰',
+ routes: [
+ {
+ path: '/list/sub-page/sub-sub-page1',
+ name: '涓�绾у垪琛ㄩ〉闈�',
+ component: './G6',
+ },
+ {
+ path: '/list/sub-page/hello',
+ name: '浣犲ソ涓栫晫',
+ component: './Hello',
+ },
+ ],
+ },
+ ],
+ },
]
},
}
@@ -241,7 +264,7 @@
</Routes>
- {/* <SettingDrawer
+ <SettingDrawer
pathname={pathname}
enableDarkTheme
getContainer={(e) => {
@@ -253,7 +276,7 @@
setSetting(changeSetting);
}}
disableUrlParams={false}
- /> */}
+ />
</ProLayout>
</ConfigProvider>
</ProConfigProvider>
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 efba12c..91b8954 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
@@ -65,7 +65,7 @@
User user;
// 鐧藉悕鍗�
if (WHITE_LIST.contains(access_token)) {
- user = userService.getByUsername("super", null);
+ user = userService.getByUsername("root", 1L);
if (user == null) {
throw new UsernameNotFoundException("Username not found");
}
@@ -97,10 +97,12 @@
}
}
} catch (ExpiredJwtException e) {
+ e.printStackTrace();
HttpUtils.responseError(response, Constants.TOKEN_EXPIRED_CODE, Constants.TOKEN_EXPIRED_MSG,
e.getMessage());
return;
} catch (Exception e) {
+ e.printStackTrace();
HttpUtils.responseError(response, Constants.BAD_CREDENTIALS_CODE, Constants.BAD_CREDENTIALS_MSG,
e.toString());
return;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
index 5b15f62..bebf245 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityConfig.java
@@ -32,7 +32,6 @@
public class SecurityConfig extends WebSecurityConfigurerAdapter {
public static final String[] FILTER_PATH = new String[]{
- "/api/**",
"/test/**",
"/api/login",
"/druid/**",
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/UserRoleMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/sys/UserRoleMapper.xml
index a349b5e..69375fc 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/UserRoleMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/sys/UserRoleMapper.xml
@@ -6,7 +6,7 @@
select *
from sys_role
where 1=1
- and role_id in (
+ and id in (
select role_id
from sys_user_role
where user_id = #{userId}
--
Gitblit v1.9.1