From d5791b118415570ef19b5683acf7989fa5ea3540 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Tue, 21 Feb 2023 11:08:04 +0800 Subject: [PATCH] =?UTF-8?q?2.21=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=87=BA=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GlobalHeader/RightContent.tsx | 8 ++++---- src/components/GlobalHeader/services.ts | 6 +++--- src/pages/401.tsx | 4 ++-- src/services/login.ts | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/GlobalHeader/RightContent.tsx b/src/components/GlobalHeader/RightContent.tsx index 070cf13..626b26b 100644 --- a/src/components/GlobalHeader/RightContent.tsx +++ b/src/components/GlobalHeader/RightContent.tsx @@ -31,14 +31,14 @@ const GlobalHeaderRight: React.FC<{}> = (props) => { } //角色退出登录 const toLogout = () => { - let _data = { - mall3_token: sessionStorage.getItem('Authorization') - } + // let _data = { + // mall3_token: sessionStorage.getItem('Authorization') + // } Modal.info({ title: '请确认是否退出?', content: false, onOk() { - getLogout({ ..._data }).then((res) => { + getLogout().then((res) => { if (res?.success) { if (data?.userType == "0") {//联通智慧门户 window.close(); diff --git a/src/components/GlobalHeader/services.ts b/src/components/GlobalHeader/services.ts index 05b743c..171b0b3 100644 --- a/src/components/GlobalHeader/services.ts +++ b/src/components/GlobalHeader/services.ts @@ -16,9 +16,9 @@ export async function fgetUserMsg(params: any) { }); } -export async function getLogout(params: any) { // 退出登录,注销 - return request('/api/auth/logout', { +export async function getLogout() { // 退出登录,注销 + return request('/api/core-service-ebtp-userinfo/v1/userinfo/logout', { method: 'get', - params + // params }); } diff --git a/src/pages/401.tsx b/src/pages/401.tsx index 376be42..9810220 100644 --- a/src/pages/401.tsx +++ b/src/pages/401.tsx @@ -19,7 +19,7 @@ const RequestTimeoutPage: React.FC<{}> = () => { const { Text } = Typography; const [time, setTime] = useState(10); const roleData = getSessionRoleData(); - const token = sessionStorage.getItem('Authorization'); + // const token = sessionStorage.getItem('Authorization'); useEffect(() => { let timeInteval: any @@ -49,7 +49,7 @@ const RequestTimeoutPage: React.FC<{}> = () => { } } const redirectLogin = () => { - logoutTokenApi({ mall3_token: token }).then(res => { + logoutTokenApi().then(res => { history.replace({ pathname: '/userformal/login', }) diff --git a/src/services/login.ts b/src/services/login.ts index 2ebd238..d1c2a08 100644 --- a/src/services/login.ts +++ b/src/services/login.ts @@ -60,15 +60,15 @@ export async function ZjfakeAccountLogin(params: LoginParamsType) { } // 专家人脸登录 -export async function ZjfakeFaceLogin(params: FaceLoginParamsType){ +export async function ZjfakeFaceLogin(params: FaceLoginParamsType) { var formData = new FormData(); formData.append('idNo', params.userName); formData.append('multipartFiles', params.multipartFiles, 'upload_face.jpeg'); return request('/api/core-service-ebtp-userinfo/outer/v1/ebtp/face/faceCompare', { method: 'POST', requestType: 'form', - mode:'cors', - body:formData + mode: 'cors', + body: formData }); } @@ -130,9 +130,9 @@ export async function getFakeCaptcha(params: any) { * @param params * @returns */ -export async function logoutTokenApi(params: any) { - return request('/api/auth/logout', { +export async function logoutTokenApi() { + return request('/api/core-service-ebtp-userinfo/v1/userinfo/logout', { method: 'GET', - params: params + // params: params }); }