diff --git a/src/hooks/index.ts b/src/hooks/index.ts index 2d9528c..e78b4c1 100644 --- a/src/hooks/index.ts +++ b/src/hooks/index.ts @@ -1,4 +1,4 @@ export * from './useBoolean' export * from './useLoading' export * from './useEcharts' -export * from './useSystem' +export * from './usePermission' diff --git a/src/hooks/useSystem.ts b/src/hooks/usePermission.ts similarity index 100% rename from src/hooks/useSystem.ts rename to src/hooks/usePermission.ts diff --git a/src/service/api/list.ts b/src/service/api/list.ts index ce33ebc..dca2205 100644 --- a/src/service/api/list.ts +++ b/src/service/api/list.ts @@ -1,5 +1,5 @@ -import { alovaInstance } from '../http' +import { request } from '../http' export function fetchUserList() { - return alovaInstance.Get('/userList') + return request.Get('/userList') } diff --git a/src/service/api/login.ts b/src/service/api/login.ts index a877601..595d923 100644 --- a/src/service/api/login.ts +++ b/src/service/api/login.ts @@ -1,4 +1,4 @@ -import { alovaInstance } from '../http' +import { request } from '../http' interface Ilogin { username: string @@ -6,14 +6,14 @@ interface Ilogin { } export function fetchLogin(params: Ilogin) { - const methodInstance = alovaInstance.Post>('/login', params) + const methodInstance = request.Post>('/login', params) methodInstance.meta = { authRole: null, } return methodInstance } export function fetchUpdateToken(params: any) { - const method = alovaInstance.Post>('/updateToken', params) + const method = request.Post>('/updateToken', params) method.meta = { authRole: 'refreshToken', } @@ -21,5 +21,5 @@ export function fetchUpdateToken(params: any) { } export function fetchUserRoutes(params: { id: number }) { - return alovaInstance.Get >('/getUserRoutes', { params }) + return request.Get >('/getUserRoutes', { params }) } diff --git a/src/service/api/test.ts b/src/service/api/test.ts index 9e9ab3c..b544c89 100644 --- a/src/service/api/test.ts +++ b/src/service/api/test.ts @@ -1,17 +1,17 @@ -import { alovaInstance, blankInstance } from '../http' +import { blankInstance, request } from '../http' /* get方法测试 */ export function fetachGet(params?: any) { - return alovaInstance.Get('/getAPI', { params }) + return request.Get('/getAPI', { params }) } /* post方法测试 */ export function fetchPost(data: any) { - return alovaInstance.Post('/postAPI', data) + return request.Post('/postAPI', data) } /* formPost方法测试 */ export function fetchFormPost(data: any) { - const methodInstance = alovaInstance.Post('/postFormAPI', data) + const methodInstance = request.Post('/postFormAPI', data) methodInstance.meta = { isFormPost: true, } @@ -19,15 +19,15 @@ export function fetchFormPost(data: any) { } /* delete方法测试 */ export function fetchDelete() { - return alovaInstance.Delete('/deleteAPI') + return request.Delete('/deleteAPI') } /* put方法测试 */ export function fetchPut(data: any) { - return alovaInstance.Put('/putAPI', data) + return request.Put('/putAPI', data) } /* 不携带token的接口 */ export function withoutToken() { - const methodInstance = alovaInstance.Get('/getAPI') + const methodInstance = request.Get('/getAPI') methodInstance.meta = { authRole: null, } @@ -35,7 +35,7 @@ export function withoutToken() { } /* 接口数据转换 */ export function dictData() { - return alovaInstance.Get('/getDictData', { + return request.Get('/getDictData', { transformData(rawData, _headers) { const { data } = rawData as any return { @@ -64,22 +64,22 @@ export function downloadFile(url: string) { } /* 测试状态码500失败 */ export function FailedRequest() { - return alovaInstance.Get('/serverError') + return request.Get('/serverError') } /* 测试业务码500失败 */ export function FailedResponse() { - return alovaInstance.Post('/businessError') + return request.Post('/businessError') } /* 测试业务码10000失败,无提示 */ export function FailedResponseWithoutTip() { - return alovaInstance.Post('/businessErrorWithoutTip') + return request.Post('/businessErrorWithoutTip') } /* token失效的接口 */ export function expiredTokenRequest() { - return alovaInstance.Get('/expiredToken') + return request.Get('/expiredToken') } /* 测试token刷新接口 */ export function refreshToken() { - return alovaInstance.Get('/updataToken') + return request.Get('/updataToken') } diff --git a/src/service/http/index.ts b/src/service/http/index.ts index 988ccf4..91192d0 100644 --- a/src/service/http/index.ts +++ b/src/service/http/index.ts @@ -6,7 +6,7 @@ const isHttpProxy = import.meta.env.VITE_HTTP_PROXY === 'Y' || false const { url } = generateProxyPattern(serviceConfig[import.meta.env.MODE]) -export const alovaInstance = createAlovaInstance({ +export const request = createAlovaInstance({ baseURL: isHttpProxy ? url.proxy : url.value, }) diff --git a/src/store/route.ts b/src/store/route.ts index 75ea41d..7b4582a 100644 --- a/src/store/route.ts +++ b/src/store/route.ts @@ -135,6 +135,7 @@ export const useRouteStore = defineStore('route-store', { }) resultRouter = arrayToTree(resultRouter) as AppRoute.Route[] + console.warn('🚀 ~ createRoutes ~ resultRouter:', resultRouter) this.setRedirect(resultRouter) const appRootRoute: RouteRecordRaw = { path: '/appRoot',