瀏覽代碼

fix: 优化token失效问题;优化多余菜单显示问题 (#805)

XieYongHong 2 年之前
父節點
當前提交
0c0670c3dd
共有 4 個文件被更改,包括 12 次插入6 次删除
  1. 8 3
      src/app.tsx
  2. 2 1
      src/pages/oauth/index.less
  3. 1 1
      src/pages/system/Menu/index.tsx
  4. 1 1
      src/utils/menu/index.ts

+ 8 - 3
src/app.tsx

@@ -152,16 +152,21 @@ export async function getInitialState(): Promise<{
  * @param options
  */
 const filterUrl = [
+  '/system/version',
+  '/system/config/front',
   '/authorize/captcha/config',
   '/authorize/login',
   '/sso/bind-code/',
   '/sso/providers',
+  '/application/',
 ];
 const requestInterceptor = (url: string, options: RequestOptionsInit) => {
   // const {params} = options;
-  let authHeader = {};
-  if (!filterUrl.some((fUrl) => url.includes(fUrl))) {
-    authHeader = { 'X-Access-Token': Token.get() || '' };
+  const authHeader = { 'X-Access-Token': Token.get() || '' };
+  const token = Token.get()
+  if (!token && !filterUrl.some((fUrl) => url.includes(fUrl))) {
+    location.href = loginPath
+    return
   }
   return {
     url: `${url}`,

+ 2 - 1
src/pages/oauth/index.less

@@ -32,12 +32,13 @@
     flex-direction: column;
     align-items: center;
     justify-content: space-evenly;
-    width: 370px;
+    width: 420px;
     height: 380px;
     margin: 0 auto;
     margin-top: 5%;
     background: #fff;
     box-shadow: 0 5px 5px #d4d4d4;
+    padding: 24px;
 
     .oauth-content-header {
       width: 60px;

+ 1 - 1
src/pages/system/Menu/index.tsx

@@ -314,7 +314,7 @@ export default observer(() => {
           return {
             code: response.message,
             result: {
-              data: response.result,
+              data: response.result?.filter(item => !(['message-subscribe','account-center'].includes(item.code))),
               pageIndex: 0,
               pageSize: 0,
               total: 0,

+ 1 - 1
src/utils/menu/index.ts

@@ -328,7 +328,7 @@ export const getMenus = (extraRoutes: IRouteProps[]): any[] => {
       name: route.name,
       path: route.url,
       icon: route.icon,
-      hideInMenu: !!route.hideInMenu,
+      hideInMenu: !!route.hideInMenu || ['message-subscribe','account-center'].includes(route.code),
       exact: route.level !== 1,
       children: getMenus(children),
     };