Commit 54867fc13e5ee0f48d6b15d8d4f78bfb581bb1c5
Merge branch 'feat/logout-api/06-05' into 'v1.4.0_dev'
feat: 退出登录调用接口 See merge request yunteng/thingskit-front!1365
Showing
2 changed files
with
18 additions
and
2 deletions
| @@ -22,6 +22,22 @@ enum Api { | @@ -22,6 +22,22 @@ enum Api { | ||
| 22 | ResetCode = '/noauth/reset_code/', | 22 | ResetCode = '/noauth/reset_code/', |
| 23 | ResetPassword = '/noauth/reset/', | 23 | ResetPassword = '/noauth/reset/', |
| 24 | APP_GET_TOKEN = '/third/login/id/', | 24 | APP_GET_TOKEN = '/third/login/id/', |
| 25 | + AUTH_LOGOUT = '/auth/logout', | ||
| 26 | +} | ||
| 27 | + | ||
| 28 | +/** | ||
| 29 | + * @description: user logout api | ||
| 30 | + */ | ||
| 31 | +export function logoutApi(_, mode: ErrorMessageMode = 'modal') { | ||
| 32 | + return defHttp.post( | ||
| 33 | + { | ||
| 34 | + url: Api.AUTH_LOGOUT, | ||
| 35 | + }, | ||
| 36 | + { | ||
| 37 | + errorMessageMode: mode, | ||
| 38 | + joinPrefix: false, | ||
| 39 | + } | ||
| 40 | + ); | ||
| 25 | } | 41 | } |
| 26 | 42 | ||
| 27 | /** | 43 | /** |
| @@ -19,7 +19,7 @@ import { | @@ -19,7 +19,7 @@ import { | ||
| 19 | RefreshTokenParams, | 19 | RefreshTokenParams, |
| 20 | SmsLoginParams, | 20 | SmsLoginParams, |
| 21 | } from '/@/api/sys/model/userModel'; | 21 | } from '/@/api/sys/model/userModel'; |
| 22 | -import { doRefreshToken, getMyInfo, loginApi, smsCodeLoginApi } from '/@/api/sys/user'; | 22 | +import { doRefreshToken, getMyInfo, loginApi, logoutApi, smsCodeLoginApi } from '/@/api/sys/user'; |
| 23 | import { useI18n } from '/@/hooks/web/useI18n'; | 23 | import { useI18n } from '/@/hooks/web/useI18n'; |
| 24 | import { useMessage } from '/@/hooks/web/useMessage'; | 24 | import { useMessage } from '/@/hooks/web/useMessage'; |
| 25 | import { router } from '/@/router'; | 25 | import { router } from '/@/router'; |
| @@ -240,7 +240,6 @@ export const useUserStore = defineStore({ | @@ -240,7 +240,6 @@ export const useUserStore = defineStore({ | ||
| 240 | // setAuthCache(REFRESH_TOKEN_KEY, undefined); | 240 | // setAuthCache(REFRESH_TOKEN_KEY, undefined); |
| 241 | // this.setSessionTimeout(false); | 241 | // this.setSessionTimeout(false); |
| 242 | // // goLogin && router.push(PageEnum.BASE_LOGIN); | 242 | // // goLogin && router.push(PageEnum.BASE_LOGIN); |
| 243 | - | ||
| 244 | this.setToken(undefined); | 243 | this.setToken(undefined); |
| 245 | this.setSessionTimeout(false); | 244 | this.setSessionTimeout(false); |
| 246 | setAuthCache(REFRESH_TOKEN_KEY, undefined); | 245 | setAuthCache(REFRESH_TOKEN_KEY, undefined); |
| @@ -284,6 +283,7 @@ export const useUserStore = defineStore({ | @@ -284,6 +283,7 @@ export const useUserStore = defineStore({ | ||
| 284 | title: t('sys.app.logoutTip'), | 283 | title: t('sys.app.logoutTip'), |
| 285 | content: t('sys.app.logoutMessage'), | 284 | content: t('sys.app.logoutMessage'), |
| 286 | onOk: async () => { | 285 | onOk: async () => { |
| 286 | + await logoutApi(null, 'modal'); //新增退出登录接口 | ||
| 287 | await this.logout(true); | 287 | await this.logout(true); |
| 288 | }, | 288 | }, |
| 289 | }); | 289 | }); |