添加 Logout func

src/app.tsx

@@ -97,7 +97,7 @@ export function render(oldRender: Function) {
     isAuthenticated()
 
     setAuthInfo()
-
+      .finally(() => {
         const { pathname } = history.location
 
         // 白名单页面不进行权限校验
@@ -135,6 +135,9 @@ export function render(oldRender: Function) {
           removeEnableMultiTenancy()
           oldRender()
         }
+      })
+
+
 
   })
 

src/layouts/components/AvatarDropdown.tsx

@@ -8,6 +8,7 @@ import { removeAuth, removeRouters, getAuth } from '@/utils/auth';
 import { inject, observer } from 'mobx-react'
 import Icon from '@ant-design/icons';
 import { ReactComponent as DefaultAvatar } from '@/assets/imgs/default_avatar.svg';
+import { SpaLogout } from '@/utils/keycloak-js';
 
 
 const AvatarDropdown = (props) => {
@@ -16,11 +17,12 @@ const AvatarDropdown = (props) => {
   const logout = () => {
     removeAuth()
     removeRouters()
+    SpaLogout()
     history.replace('/user/login')
   }
 
   const currentUser = {
-    name: userAuth.name || userAuth?.company || intl.formatMessage({id: 'common.weizhiyonghu'}),
+    name: userAuth.name || userAuth?.company || intl.formatMessage({ id: 'common.weizhiyonghu' }),
     avatar: props.UserStore.avatar || '',
   }
 
@@ -36,11 +38,11 @@ const AvatarDropdown = (props) => {
         </Menu.Item>
       <Menu.Divider /> */}
       <Menu.Item key="changePwd">
-        <Link to="/memberCenter/systemSetting/accountSetting"><LockOutlined />{intl.formatMessage({id: 'common.xiugaimima'})}</Link>
+        <Link to="/memberCenter/systemSetting/accountSetting"><LockOutlined />{intl.formatMessage({ id: 'common.xiugaimima' })}</Link>
       </Menu.Item>
       <Menu.Item onClick={logout} key="logout">
         <LogoutOutlined />
-        {intl.formatMessage({id: 'common.tuichudenglu'})}
+        {intl.formatMessage({ id: 'common.tuichudenglu' })}
       </Menu.Item>
     </Menu>
   )

src/utils/keycloak-js.ts

 import { getMemberInReturnForToken } from '@/services/MemberV2Api';
+import { message } from 'antd';
 import Keycloak from 'keycloak-js';
 
 let _keycloak = null;
@@ -35,17 +36,28 @@ export function getKeycloakToken(): string {
   return getKeycloak().token
 }
 
-export function setAuthInfo() {
-  getMemberInReturnForToken({}, {
+export function setAuthInfo(): Promise<any> {
+  return getMemberInReturnForToken({}, {
     headers: {
       keycloakToken: getKeycloakToken()
     }
-  }).then(res => res.data)
-    .then(res => {
+  }).then(res => {
+    if (res.code !== 1000) {
+      message.error(res.message);
+      return
+    }
+    return res.data;
+  }).then(res => {
+    if (undefined != res) {
       localStorage.setItem('AUTH', JSON.stringify(res))
+    }
   })
 }
 
 export function SpaLogin() {
   getKeycloak().login({ redirectUri: window.location.origin })
 }
+
+export function SpaLogout() {
+  getKeycloak().logout()
+}
\ No newline at end of file