From 8f7f2515576a889ac57e84b9d596055ee336a388 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 07 二月 2024 22:54:34 +0800
Subject: [PATCH] ##
---
zy-asrs-flow/src/App.jsx | 3 ++-
zy-asrs-flow/src/components/RightContent/AvatarDropdown.tsx | 34 +++++++++++++++++++---------------
zy-asrs-flow/src/pages/User/Login/index.jsx | 1 -
zy-asrs-flow/src/config/setting.ts | 2 +-
zy-asrs-flow/tsconfig.json | 2 +-
zy-asrs-flow/src/services/route.js | 2 --
6 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/zy-asrs-flow/src/App.jsx b/zy-asrs-flow/src/App.jsx
index 79b7cc6..1788b6b 100644
--- a/zy-asrs-flow/src/App.jsx
+++ b/zy-asrs-flow/src/App.jsx
@@ -9,6 +9,7 @@
import { getRemoteMenu, getRoutersInfo, getUserInfo, setRemoteMenu, patchRouteWithRemoteMenus } from './services/route';
import { getToken } from '@/utils/token-util'
import { TOKEN_HEADER_NAME, TOKEN_STORE_NAME } from '@/config/setting';
+import { API_BASE_URL } from '@/config/setting'
const isDev = process.env.NODE_ENV === 'development';
const loginPath = '/user/login';
@@ -182,7 +183,7 @@
* @doc https://umijs.org/docs/max/request#閰嶇疆
*/
export const request = {
- // baseURL: 'http://localhost:9999',
+ baseURL: API_BASE_URL,
...errorConfig,
timeout: 60000,
// 鍓嶇疆瀹堝崼
diff --git a/zy-asrs-flow/src/components/RightContent/AvatarDropdown.tsx b/zy-asrs-flow/src/components/RightContent/AvatarDropdown.tsx
index 766a5d3..d5324f8 100644
--- a/zy-asrs-flow/src/components/RightContent/AvatarDropdown.tsx
+++ b/zy-asrs-flow/src/components/RightContent/AvatarDropdown.tsx
@@ -8,6 +8,8 @@
import React, { useCallback } from 'react';
import { flushSync } from 'react-dom';
import HeaderDropdown from '../HeaderDropdown';
+import { setRemoteMenu } from '@/services/route'
+import { removeToken } from '@/utils/token-util'
export type GlobalHeaderRightProps = {
menu?: boolean;
@@ -43,7 +45,9 @@
* 閫�鍑虹櫥褰曪紝骞朵笖灏嗗綋鍓嶇殑 url 淇濆瓨
*/
const loginOut = async () => {
- await outLogin();
+ // await outLogin();
+ removeToken();
+ setRemoteMenu(null);
const { search, pathname } = window.location;
const urlParams = new URL(window.location.href).searchParams;
/** 姝ゆ柟娉曚細璺宠浆鍒� redirect 鍙傛暟鎵�鍦ㄧ殑浣嶇疆 */
@@ -102,20 +106,20 @@
const menuItems = [
...(menu
? [
- {
- key: 'center',
- icon: <UserOutlined />,
- label: '涓汉涓績',
- },
- {
- key: 'settings',
- icon: <SettingOutlined />,
- label: '涓汉璁剧疆',
- },
- {
- type: 'divider' as const,
- },
- ]
+ {
+ key: 'center',
+ icon: <UserOutlined />,
+ label: '涓汉涓績',
+ },
+ {
+ key: 'settings',
+ icon: <SettingOutlined />,
+ label: '涓汉璁剧疆',
+ },
+ {
+ type: 'divider' as const,
+ },
+ ]
: []),
{
key: 'logout',
diff --git a/zy-asrs-flow/src/config/setting.ts b/zy-asrs-flow/src/config/setting.ts
index e638e2c..1882270 100644
--- a/zy-asrs-flow/src/config/setting.ts
+++ b/zy-asrs-flow/src/config/setting.ts
@@ -1,5 +1,5 @@
// 鎺ュ彛鍦板潃
-export const API_BASE_URL: string = '';
+export const API_BASE_URL: string = 'http://localhost:9090/wcs';
// 椤圭洰鍚嶇О
export const PROJECT_NAME: string = '';
diff --git a/zy-asrs-flow/src/pages/User/Login/index.jsx b/zy-asrs-flow/src/pages/User/Login/index.jsx
index 93bb913..b58c0f6 100644
--- a/zy-asrs-flow/src/pages/User/Login/index.jsx
+++ b/zy-asrs-flow/src/pages/User/Login/index.jsx
@@ -104,7 +104,6 @@
const handleSubmit = async (values) => {
try {
const r = await request('/api/login', {
- baseURL: 'http://localhost:9090/wcs',
method: 'POST',
headers: {
'Content-Type': 'application/json'
diff --git a/zy-asrs-flow/src/services/route.js b/zy-asrs-flow/src/services/route.js
index 3daa1bd..0d77554 100644
--- a/zy-asrs-flow/src/services/route.js
+++ b/zy-asrs-flow/src/services/route.js
@@ -14,7 +14,6 @@
export async function getUserInfo(options) {
return request('/api/auth/user', {
- baseURL: 'http://localhost:9090/wcs',
method: 'GET',
...(options || {}),
});
@@ -22,7 +21,6 @@
export async function getRouters() {
return request('/api/auth/menu', {
- baseURL: 'http://localhost:9090/wcs'
});
}
diff --git a/zy-asrs-flow/tsconfig.json b/zy-asrs-flow/tsconfig.json
index 8b087b1..3eb7f00 100644
--- a/zy-asrs-flow/tsconfig.json
+++ b/zy-asrs-flow/tsconfig.json
@@ -19,5 +19,5 @@
"@@test/*": ["./src/.umi-test/*"]
}
},
- "include": ["./**/*.d.ts", "./**/*.ts", "./**/*.tsx", "src/app.tsx", "src/utils/icon-util.js", "src/pages/User/Login/index.jsx", "src/components/Footer/index.jsx"]
+ "include": ["./**/*.d.ts", "./**/*.ts", "./**/*.tsx", "src/app.tsx", "src/utils/icon-util.js", "src/pages/User/Login/index.jsx", "src/components/Footer/index.jsx", "src/components/HeaderDropdown/index.jsx"]
}
--
Gitblit v1.9.1