diff --git a/ui/src/api/user/login.ts b/ui/src/api/user/login.ts index 5ca2ab99f..b6cce715d 100644 --- a/ui/src/api/user/login.ts +++ b/ui/src/api/user/login.ts @@ -2,14 +2,13 @@ import { Result } from '@/request/Result' import { get, post } from '@/request/index' import type { LoginRequest } from '@/api/type/login' import type { Ref } from 'vue' - /** * 登录 * @param request 登录接口请求表单 * @param loading 接口加载器 * @returns 认证数据 */ -const login: (request: LoginRequest, loading?: Ref) => Promise> = ( +const login: (request: LoginRequest, loading?: Ref) => Promise> = ( request, loading, ) => { @@ -20,7 +19,7 @@ const login: (request: LoginRequest, loading?: Ref) => Promise) => Promise> = (loading) => { +const getCaptcha: (loading?: Ref) => Promise> = (loading) => { return get('/user/captcha', undefined, loading) } diff --git a/ui/src/request/index.ts b/ui/src/request/index.ts index 77b8bc3e2..b7073e2f6 100644 --- a/ui/src/request/index.ts +++ b/ui/src/request/index.ts @@ -28,7 +28,7 @@ instance.interceptors.request.use( const language = user.getLanguage() config.headers['Accept-Language'] = `${language}` if (token) { - config.headers['AUTHORIZATION'] = `${token}` + config.headers['AUTHORIZATION'] = `Bearer ${token}` } return config }, @@ -43,14 +43,14 @@ instance.interceptors.response.use( if (response.data) { if (response.data.code !== 200 && !(response.data instanceof Blob)) { if (response.config.url.includes('/application/authentication')) { - return Promise.reject(response.data) + return Promise.reject(response.data.data) } if ( !response.config.url.includes('/valid') && !response.config.url.includes('/function_lib/debug') ) { MsgError(response.data.message) - return Promise.reject(response.data) + return Promise.reject(response.data.data) } } } @@ -99,11 +99,12 @@ const promise: ( } request .then((response) => { + console.log(response) // blob类型的返回状态是response.status if (response.status === 200) { - resolve(response?.data || response) + resolve(response?.data?.data || response) } else { - reject(response?.data || response) + reject(response?.data?.data || response) } }) .catch((error) => { diff --git a/ui/src/stores/modules/login.ts b/ui/src/stores/modules/login.ts index 94628ada5..4cb12cb9b 100644 --- a/ui/src/stores/modules/login.ts +++ b/ui/src/stores/modules/login.ts @@ -30,9 +30,9 @@ const useLoginStore = defineStore('login', { }, async asyncLogin(data: LoginRequest, loading?: Ref) { - return loginApi.login(data).then((ok) => { - this.token = ok.data - localStorage.setItem('token', ok.data) + return loginApi.login(data).then((ok: any) => { + this.token = ok.token + localStorage.setItem('token', ok.token) const user = useUserStore() return user.profile() }) diff --git a/ui/src/views/login/index.vue b/ui/src/views/login/index.vue index 10f6cb713..8aab13ab3 100644 --- a/ui/src/views/login/index.vue +++ b/ui/src/views/login/index.vue @@ -58,7 +58,7 @@ @click="loginHandle" :loading="loading" > - >{{ $t('views.login.buttons.login') }} + {{ $t('views.login.buttons.login') }}
{ } function makeCode() { loginApi.getCaptcha().then((res: any) => { - identifyCode.value = res.data.captcha + identifyCode.value = res.captcha }) } onBeforeMount(() => {