From f267e5e0426016adfb6c868de9311df773552329 Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Sun, 1 Sep 2024 16:51:02 +0800 Subject: [PATCH] =?UTF-8?q?optimize:=20=E2=99=BB=EF=B8=8F=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9http=E8=AF=B7=E6=B1=82=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/{utils/http => api/service}/index.ts | 4 ++-- .../http => api/service}/mockRequest.ts | 4 ++-- src/{utils/http => api/service}/types.d.ts | 0 src/api/{ => v1}/routes.ts | 2 +- src/api/{ => v1}/user.ts | 2 +- src/router/utils.ts | 24 +++++++++---------- src/store/modules/user.ts | 18 +++++++------- src/utils/auth.ts | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) rename src/{utils/http => api/service}/index.ts (99%) rename src/{utils/http => api/service}/mockRequest.ts (98%) rename src/{utils/http => api/service}/types.d.ts (100%) rename src/api/{ => v1}/routes.ts (76%) rename src/api/{ => v1}/user.ts (95%) diff --git a/src/utils/http/index.ts b/src/api/service/index.ts similarity index 99% rename from src/utils/http/index.ts rename to src/api/service/index.ts index a4ea3db..d07cad6 100644 --- a/src/utils/http/index.ts +++ b/src/api/service/index.ts @@ -8,9 +8,9 @@ import type { PureHttpRequestConfig, PureHttpResponse, RequestMethods -} from "./types.d"; +} from "./types"; import { stringify } from "qs"; -import NProgress from "../progress"; +import NProgress from "../../utils/progress"; import { formatToken, getToken } from "@/utils/auth"; import { useUserStoreHook } from "@/store/modules/user"; diff --git a/src/utils/http/mockRequest.ts b/src/api/service/mockRequest.ts similarity index 98% rename from src/utils/http/mockRequest.ts rename to src/api/service/mockRequest.ts index fb5f196..8eebe92 100644 --- a/src/utils/http/mockRequest.ts +++ b/src/api/service/mockRequest.ts @@ -8,9 +8,9 @@ import type { PureHttpRequestConfig, PureHttpResponse, RequestMethods -} from "./types.d"; +} from "./types"; import { stringify } from "qs"; -import NProgress from "../progress"; +import NProgress from "../../utils/progress"; import { formatToken, getToken } from "@/utils/auth"; import { useUserStoreHook } from "@/store/modules/user"; diff --git a/src/utils/http/types.d.ts b/src/api/service/types.d.ts similarity index 100% rename from src/utils/http/types.d.ts rename to src/api/service/types.d.ts diff --git a/src/api/routes.ts b/src/api/v1/routes.ts similarity index 76% rename from src/api/routes.ts rename to src/api/v1/routes.ts index eadbaf7..58b1699 100644 --- a/src/api/routes.ts +++ b/src/api/v1/routes.ts @@ -1,4 +1,4 @@ -import { http } from "@/utils/http/mockRequest"; +import { http } from "@/api/service/mockRequest"; type Result = { success: boolean; diff --git a/src/api/user.ts b/src/api/v1/user.ts similarity index 95% rename from src/api/user.ts rename to src/api/v1/user.ts index 7164758..3d044a9 100644 --- a/src/api/user.ts +++ b/src/api/v1/user.ts @@ -1,4 +1,4 @@ -import { http } from "@/utils/http/mockRequest"; +import { http } from "@/api/service/mockRequest"; export type UserResult = { success: boolean; diff --git a/src/router/utils.ts b/src/router/utils.ts index dd6df9a..435b0d3 100644 --- a/src/router/utils.ts +++ b/src/router/utils.ts @@ -1,34 +1,34 @@ import { - type RouterHistory, - type RouteRecordRaw, - type RouteComponent, + createWebHashHistory, createWebHistory, - createWebHashHistory + type RouteComponent, + type RouteRecordRaw, + type RouterHistory } from "vue-router"; import { router } from "./index"; import { isProxy, toRaw } from "vue"; import { useTimeoutFn } from "@vueuse/core"; import { - isString, cloneDeep, - isAllEmpty, intersection, - storageLocal, - isIncludeAllChildren + isAllEmpty, + isIncludeAllChildren, + isString, + storageLocal } from "@pureadmin/utils"; import { getConfig } from "@/config"; import { buildHierarchyTree } from "@/utils/tree"; -import { userKey, type DataInfo } from "@/utils/auth"; +import { type DataInfo, userKey } from "@/utils/auth"; import { type menuType, routerArrays } from "@/layout/types"; import { useMultiTagsStoreHook } from "@/store/modules/multiTags"; import { usePermissionStoreHook } from "@/store/modules/permission"; +// 动态路由 +import { getAsyncRoutes } from "@/api/v1/routes"; + const IFrame = () => import("@/layout/frame.vue"); // https://cn.vitejs.dev/guide/features.html#glob-import const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}"); -// 动态路由 -import { getAsyncRoutes } from "@/api/routes"; - function handRank(routeInfo: any) { const { name, path, parentId, meta } = routeInfo; return isAllEmpty(parentId) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 9d0430e..7ed0ef1 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -1,20 +1,20 @@ import { defineStore } from "pinia"; import { - type userType, - store, - router, resetRouter, + router, routerArrays, - storageLocal + storageLocal, + store, + type userType } from "../utils"; import { - type UserResult, - type RefreshTokenResult, getLogin, - refreshTokenApi -} from "@/api/user"; + refreshTokenApi, + type RefreshTokenResult, + type UserResult +} from "@/api/v1/user"; import { useMultiTagsStoreHook } from "./multiTags"; -import { type DataInfo, setToken, removeToken, userKey } from "@/utils/auth"; +import { type DataInfo, removeToken, setToken, userKey } from "@/utils/auth"; export const useUserStore = defineStore({ id: "pure-user", diff --git a/src/utils/auth.ts b/src/utils/auth.ts index f2b28cb..f5eba7d 100644 --- a/src/utils/auth.ts +++ b/src/utils/auth.ts @@ -1,6 +1,6 @@ import Cookies from "js-cookie"; import { useUserStoreHook } from "@/store/modules/user"; -import { storageLocal, isString, isIncludeAllChildren } from "@pureadmin/utils"; +import { isIncludeAllChildren, isString, storageLocal } from "@pureadmin/utils"; export interface DataInfo { /** token */