From 6664ae8f7bd6ce617137772229a08c4b2e4ef30f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=BC=A0=E9=BE=99?= <zclzone@outlook.com>
Date: Sun, 18 Sep 2022 20:05:40 +0800
Subject: [PATCH] refactor: folders

---
 src/api/index.js                              |  2 +-
 src/components/common/AppProvider.vue         |  2 +-
 src/components/icon/TheIcon.vue               |  2 +-
 src/components/query-bar/QueryBarItem.vue     |  2 +-
 src/composables/useCRUD.js                    |  2 +-
 src/layout/components/AppMain.vue             |  2 +-
 .../header/components/BreadCrumb.vue          |  2 +-
 .../header/components/MenuCollapse.vue        |  2 +-
 .../header/components/UserAvatar.vue          |  4 +-
 .../sidebar/components/SideLogo.vue           |  2 +-
 .../sidebar/components/SideMenu.vue           |  7 +-
 src/layout/components/tags/ContextMenu.vue    |  5 +-
 src/layout/components/tags/index.vue          |  2 +-
 src/layout/index.vue                          |  2 +-
 src/main.js                                   |  3 +-
 src/router/guard/permission-guard.js          |  3 +-
 src/router/index.js                           |  6 +-
 src/store/index.js                            |  2 +
 src/store/modules/{app.js => app/index.js}    |  0
 src/store/modules/index.js                    |  4 +
 .../{permission.js => permission/index.js}    |  0
 src/store/modules/tags/helpers.js             |  2 +-
 src/store/modules/tags/index.js               |  2 +-
 src/store/modules/{user.js => user/index.js}  |  3 +-
 src/styles/{index.scss => global.scss}        | 17 ++--
 src/styles/reset.css                          |  5 --
 src/utils/{ => auth}/auth.js                  |  0
 src/utils/auth/index.js                       |  2 +
 src/utils/{ => auth}/token.js                 |  2 +-
 src/utils/common/common.js                    | 76 ++++++++++++++++++
 src/utils/{ => common}/icon.js                |  0
 src/utils/common/index.js                     |  4 +
 src/utils/{ => common}/is.js                  |  0
 src/utils/common/naiveTools.js                |  2 +-
 src/utils/http/helpers.js                     |  6 +-
 src/utils/http/index.js                       |  2 +-
 src/utils/http/interceptors.js                |  3 +-
 src/utils/index.js                            | 80 +------------------
 src/utils/{cache => storage}/index.js         |  0
 src/utils/{cache => storage}/storage.js       |  2 +-
 src/views/demo/table/api.js                   |  2 +-
 src/views/demo/table/index.vue                |  4 +-
 src/views/login/api.js                        |  2 +-
 src/views/login/index.vue                     |  3 +-
 src/views/workbench/index.vue                 |  2 +-
 45 files changed, 138 insertions(+), 139 deletions(-)
 rename src/store/modules/{app.js => app/index.js} (100%)
 create mode 100644 src/store/modules/index.js
 rename src/store/modules/{permission.js => permission/index.js} (100%)
 rename src/store/modules/{user.js => user/index.js} (91%)
 rename src/styles/{index.scss => global.scss} (87%)
 rename src/utils/{ => auth}/auth.js (100%)
 create mode 100644 src/utils/auth/index.js
 rename src/utils/{ => auth}/token.js (95%)
 create mode 100644 src/utils/common/common.js
 rename src/utils/{ => common}/icon.js (100%)
 create mode 100644 src/utils/common/index.js
 rename src/utils/{ => common}/is.js (100%)
 rename src/utils/{cache => storage}/index.js (100%)
 rename src/utils/{cache => storage}/storage.js (96%)

diff --git a/src/api/index.js b/src/api/index.js
index bbb9df8..38843fa 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,4 +1,4 @@
-import request from '@/utils/http'
+import { request } from '@/utils'
 
 export default {
   getUser: () => request.get('/user'),
diff --git a/src/components/common/AppProvider.vue b/src/components/common/AppProvider.vue
index 718b0b7..9b7bdc7 100644
--- a/src/components/common/AppProvider.vue
+++ b/src/components/common/AppProvider.vue
@@ -18,7 +18,7 @@ import { defineComponent, h } from 'vue'
 import { useLoadingBar, useDialog, useMessage, useNotification } from 'naive-ui'
 import { useCssVar } from '@vueuse/core'
 import { kebabCase } from 'lodash-es'
-import { setupMessage, setupDialog } from '@/utils/common/naiveTools'
+import { setupMessage, setupDialog } from '@/utils'
 import { naiveThemeOverrides } from '~/settings'
 
 function setupCssVar() {
diff --git a/src/components/icon/TheIcon.vue b/src/components/icon/TheIcon.vue
index adb58c5..62edef1 100644
--- a/src/components/icon/TheIcon.vue
+++ b/src/components/icon/TheIcon.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { renderIcon, renderCustomIcon } from '@/utils/icon'
+import { renderIcon, renderCustomIcon } from '@/utils'
 
 const props = defineProps({
   icon: {
diff --git a/src/components/query-bar/QueryBarItem.vue b/src/components/query-bar/QueryBarItem.vue
index c0e03cf..f320053 100644
--- a/src/components/query-bar/QueryBarItem.vue
+++ b/src/components/query-bar/QueryBarItem.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script setup>
-import { isNullOrWhitespace } from '@/utils/is'
+import { isNullOrWhitespace } from '@/utils'
 
 defineProps({
   label: {
diff --git a/src/composables/useCRUD.js b/src/composables/useCRUD.js
index 44cb782..11fefeb 100644
--- a/src/composables/useCRUD.js
+++ b/src/composables/useCRUD.js
@@ -1,4 +1,4 @@
-import { isNullOrWhitespace } from '@/utils/is'
+import { isNullOrWhitespace } from '@/utils'
 
 const ACTIONS = {
   view: '查看',
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index aad4ef6..927aee7 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup>
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/store'
 import { useRouter } from 'vue-router'
 const appStore = useAppStore()
 const router = useRouter()
diff --git a/src/layout/components/header/components/BreadCrumb.vue b/src/layout/components/header/components/BreadCrumb.vue
index 913f2a2..07b374c 100644
--- a/src/layout/components/header/components/BreadCrumb.vue
+++ b/src/layout/components/header/components/BreadCrumb.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script setup>
-import { renderCustomIcon, renderIcon } from '@/utils/icon'
+import { renderCustomIcon, renderIcon } from '@/utils'
 
 const router = useRouter()
 const route = useRoute()
diff --git a/src/layout/components/header/components/MenuCollapse.vue b/src/layout/components/header/components/MenuCollapse.vue
index b089841..8c721fb 100644
--- a/src/layout/components/header/components/MenuCollapse.vue
+++ b/src/layout/components/header/components/MenuCollapse.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup>
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/store'
 
 const appStore = useAppStore()
 </script>
diff --git a/src/layout/components/header/components/UserAvatar.vue b/src/layout/components/header/components/UserAvatar.vue
index 9a06b2e..a8b7b67 100644
--- a/src/layout/components/header/components/UserAvatar.vue
+++ b/src/layout/components/header/components/UserAvatar.vue
@@ -8,8 +8,8 @@
 </template>
 
 <script setup>
-import { useUserStore } from '@/store/modules/user'
-import { renderIcon } from '@/utils/icon'
+import { useUserStore } from '@/store'
+import { renderIcon } from '@/utils'
 
 const userStore = useUserStore()
 
diff --git a/src/layout/components/sidebar/components/SideLogo.vue b/src/layout/components/sidebar/components/SideLogo.vue
index 7b11367..ca19142 100644
--- a/src/layout/components/sidebar/components/SideLogo.vue
+++ b/src/layout/components/sidebar/components/SideLogo.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script setup>
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/store'
 const title = import.meta.env.VITE_TITLE
 
 const appStore = useAppStore()
diff --git a/src/layout/components/sidebar/components/SideMenu.vue b/src/layout/components/sidebar/components/SideMenu.vue
index 3547169..3c36a5a 100644
--- a/src/layout/components/sidebar/components/SideMenu.vue
+++ b/src/layout/components/sidebar/components/SideMenu.vue
@@ -12,11 +12,8 @@
 </template>
 
 <script setup>
-import { usePermissionStore } from '@/store/modules/permission'
-
-import { isExternal } from '@/utils/is'
-import { useAppStore } from '@/store/modules/app'
-import { renderCustomIcon, renderIcon } from '@/utils/icon'
+import { usePermissionStore, useAppStore } from '@/store'
+import { renderCustomIcon, renderIcon, isExternal } from '@/utils'
 
 const router = useRouter()
 const curRoute = useRoute()
diff --git a/src/layout/components/tags/ContextMenu.vue b/src/layout/components/tags/ContextMenu.vue
index 03c81e4..2a5d747 100644
--- a/src/layout/components/tags/ContextMenu.vue
+++ b/src/layout/components/tags/ContextMenu.vue
@@ -11,9 +11,8 @@
 </template>
 
 <script setup>
-import { useTagsStore } from '@/store/modules/tags'
-import { renderIcon } from '@/utils/icon'
-import { useAppStore } from '@/store/modules/app'
+import { useTagsStore, useAppStore } from '@/store'
+import { renderIcon } from '@/utils'
 
 const props = defineProps({
   show: {
diff --git a/src/layout/components/tags/index.vue b/src/layout/components/tags/index.vue
index a9a4d2e..baf60db 100644
--- a/src/layout/components/tags/index.vue
+++ b/src/layout/components/tags/index.vue
@@ -24,7 +24,7 @@
 
 <script setup>
 import ContextMenu from './ContextMenu.vue'
-import { useTagsStore } from '@/store/modules/tags'
+import { useTagsStore } from '@/store'
 import ScrollX from '@/components/common/ScrollX.vue'
 
 const route = useRoute()
diff --git a/src/layout/index.vue b/src/layout/index.vue
index f289e92..3d8ab80 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -30,7 +30,7 @@ import AppHeader from './components/header/index.vue'
 import SideBar from './components/sidebar/index.vue'
 import AppMain from './components/AppMain.vue'
 import AppTags from './components/tags/index.vue'
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/store'
 import { header, tags } from '~/settings'
 
 const appStore = useAppStore()
diff --git a/src/main.js b/src/main.js
index c0a57b2..07ea602 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,7 @@
+/** 重置样式 */
 import '@/styles/reset.css'
-import '@/styles/index.scss'
 import 'uno.css'
+import '@/styles/global.scss'
 import 'virtual:svg-icons-register'
 
 import { createApp } from 'vue'
diff --git a/src/router/guard/permission-guard.js b/src/router/guard/permission-guard.js
index f1f3b5e..55b8a29 100644
--- a/src/router/guard/permission-guard.js
+++ b/src/router/guard/permission-guard.js
@@ -1,5 +1,4 @@
-import { getToken, refreshAccessToken } from '@/utils/token'
-import { isNullOrWhitespace } from '@/utils/is'
+import { getToken, refreshAccessToken, isNullOrWhitespace } from '@/utils'
 
 const WHITE_LIST = ['/login', '/404']
 export function createPermissionGuard(router) {
diff --git a/src/router/index.js b/src/router/index.js
index fa75874..5c3645d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,10 +1,8 @@
 import { createRouter, createWebHistory, createWebHashHistory } from 'vue-router'
 import { setupRouterGuard } from './guard'
 import { basicRoutes as routes, EMPTY_ROUTE, NOT_FOUND_ROUTE } from './routes'
-import { getToken } from '@/utils/token'
-import { isNullOrWhitespace } from '@/utils/is'
-import { useUserStore } from '@/store/modules/user'
-import { usePermissionStore } from '@/store/modules/permission'
+import { getToken, isNullOrWhitespace } from '@/utils'
+import { useUserStore, usePermissionStore } from '@/store'
 
 const isHash = import.meta.env.VITE_USE_HASH === 'true'
 export const router = createRouter({
diff --git a/src/store/index.js b/src/store/index.js
index cd3e62e..1dec2e9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3,3 +3,5 @@ import { createPinia } from 'pinia'
 export function setupStore(app) {
   app.use(createPinia())
 }
+
+export * from './modules'
diff --git a/src/store/modules/app.js b/src/store/modules/app/index.js
similarity index 100%
rename from src/store/modules/app.js
rename to src/store/modules/app/index.js
diff --git a/src/store/modules/index.js b/src/store/modules/index.js
new file mode 100644
index 0000000..edeeee1
--- /dev/null
+++ b/src/store/modules/index.js
@@ -0,0 +1,4 @@
+export * from './app'
+export * from './permission'
+export * from './tags'
+export * from './user'
diff --git a/src/store/modules/permission.js b/src/store/modules/permission/index.js
similarity index 100%
rename from src/store/modules/permission.js
rename to src/store/modules/permission/index.js
diff --git a/src/store/modules/tags/helpers.js b/src/store/modules/tags/helpers.js
index 3b82c1a..d7c94c9 100644
--- a/src/store/modules/tags/helpers.js
+++ b/src/store/modules/tags/helpers.js
@@ -1,4 +1,4 @@
-import { sStorage } from '@/utils/cache'
+import { sStorage } from '@/utils'
 
 export const activeTag = sStorage.get('activeTag')
 export const tags = sStorage.get('tags')
diff --git a/src/store/modules/tags/index.js b/src/store/modules/tags/index.js
index 343f3cf..7f0771c 100644
--- a/src/store/modules/tags/index.js
+++ b/src/store/modules/tags/index.js
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { activeTag, tags, WITHOUT_TAG_PATHS } from './helpers'
 import { router } from '@/router'
-import { sStorage } from '@/utils/cache'
+import { sStorage } from '@/utils'
 
 export const useTagsStore = defineStore('tag', {
   state() {
diff --git a/src/store/modules/user.js b/src/store/modules/user/index.js
similarity index 91%
rename from src/store/modules/user.js
rename to src/store/modules/user/index.js
index 1807fad..e317ae0 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user/index.js
@@ -1,6 +1,5 @@
 import { defineStore } from 'pinia'
-import { removeToken } from '@/utils/token'
-import { toLogin } from '@/utils/auth'
+import { removeToken, toLogin } from '@/utils'
 import api from '@/api'
 
 export const useUserStore = defineStore('user', {
diff --git a/src/styles/index.scss b/src/styles/global.scss
similarity index 87%
rename from src/styles/index.scss
rename to src/styles/global.scss
index 457ab52..4cbdda3 100644
--- a/src/styles/index.scss
+++ b/src/styles/global.scss
@@ -1,14 +1,16 @@
-html {
-  font-size: 4px; // * 1rem = 4px  方便unocss计算：在unocss中 1字体单位 = 0.25rem，相当于 1等份 = 1px
-}
-
 html,
 body {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  background-color: #f2f2f2;
-  font-family: 'Encode Sans Condensed', sans-serif;
+}
+
+html {
+  font-size: 4px; // * 1rem = 4px  方便unocss计算：在unocss中 1字体单位 = 0.25rem，相当于 1等份 = 1px
+}
+
+body {
+  font-size: 16px;
 }
 
 #app {
@@ -16,7 +18,7 @@ body {
   height: 100%;
 }
 
-/* router view transition fade-slide */
+/* transition fade-slide */
 .fade-slide-leave-active,
 .fade-slide-enter-active {
   transition: all 0.3s;
@@ -32,7 +34,6 @@ body {
   transform: translateX(30px);
 }
 
-/* 自定义滚动条样式 */
 /* 自定义滚动条样式 */
 .cus-scroll {
   overflow: auto;
diff --git a/src/styles/reset.css b/src/styles/reset.css
index 9909561..e27049c 100644
--- a/src/styles/reset.css
+++ b/src/styles/reset.css
@@ -33,8 +33,3 @@ textarea {
   border: none;
   resize: none;
 }
-
-body {
-  font-size: 14px;
-  font-weight: 400;
-}
diff --git a/src/utils/auth.js b/src/utils/auth/auth.js
similarity index 100%
rename from src/utils/auth.js
rename to src/utils/auth/auth.js
diff --git a/src/utils/auth/index.js b/src/utils/auth/index.js
new file mode 100644
index 0000000..8c6545d
--- /dev/null
+++ b/src/utils/auth/index.js
@@ -0,0 +1,2 @@
+export * from './auth'
+export * from './token'
diff --git a/src/utils/token.js b/src/utils/auth/token.js
similarity index 95%
rename from src/utils/token.js
rename to src/utils/auth/token.js
index 343137c..31f9701 100644
--- a/src/utils/token.js
+++ b/src/utils/auth/token.js
@@ -1,4 +1,4 @@
-import { lStorage } from './cache'
+import { lStorage } from '@/utils'
 import api from '@/api'
 
 const TOKEN_CODE = 'access_token'
diff --git a/src/utils/common/common.js b/src/utils/common/common.js
new file mode 100644
index 0000000..0978703
--- /dev/null
+++ b/src/utils/common/common.js
@@ -0,0 +1,76 @@
+import dayjs from 'dayjs'
+
+/**
+ * @desc  格式化时间
+ * @param {(Object|string|number)} time
+ * @param {string} format
+ * @returns {string | null}
+ */
+export function formatDateTime(time = undefined, format = 'YYYY-MM-DD HH:mm:ss') {
+  return dayjs(time).format(format)
+}
+
+export function formatDate(date = undefined, format = 'YYYY-MM-DD') {
+  return formatDateTime(date, format)
+}
+
+/**
+ * @desc  函数节流
+ * @param {Function} fn
+ * @param {Number} wait
+ * @returns {Function}
+ */
+export function throttle(fn, wait) {
+  var context, args
+  var previous = 0
+
+  return function () {
+    var now = +new Date()
+    context = this
+    args = arguments
+    if (now - previous > wait) {
+      fn.apply(context, args)
+      previous = now
+    }
+  }
+}
+
+/**
+ * @desc  函数防抖
+ * @param {Function} func
+ * @param {number} wait
+ * @param {boolean} immediate
+ * @return {*}
+ */
+export function debounce(method, wait, immediate) {
+  let timeout
+  return function (...args) {
+    let context = this
+    if (timeout) {
+      clearTimeout(timeout)
+    }
+    // 立即执行需要两个条件，一是immediate为true，二是timeout未被赋值或被置为null
+    if (immediate) {
+      /**
+       * 如果定时器不存在，则立即执行，并设置一个定时器，wait毫秒后将定时器置为null
+       * 这样确保立即执行后wait毫秒内不会被再次触发
+       */
+      let callNow = !timeout
+      timeout = setTimeout(() => {
+        timeout = null
+      }, wait)
+      if (callNow) {
+        method.apply(context, args)
+      }
+    } else {
+      // 如果immediate为false，则函数wait毫秒后执行
+      timeout = setTimeout(() => {
+        /**
+         * args是一个类数组对象，所以使用fn.apply
+         * 也可写作method.call(context, ...args)
+         */
+        method.apply(context, args)
+      }, wait)
+    }
+  }
+}
diff --git a/src/utils/icon.js b/src/utils/common/icon.js
similarity index 100%
rename from src/utils/icon.js
rename to src/utils/common/icon.js
diff --git a/src/utils/common/index.js b/src/utils/common/index.js
new file mode 100644
index 0000000..1a359a1
--- /dev/null
+++ b/src/utils/common/index.js
@@ -0,0 +1,4 @@
+export * from './common'
+export * from './is'
+export * from './icon'
+export * from './naiveTools'
diff --git a/src/utils/is.js b/src/utils/common/is.js
similarity index 100%
rename from src/utils/is.js
rename to src/utils/common/is.js
diff --git a/src/utils/common/naiveTools.js b/src/utils/common/naiveTools.js
index c741d65..320acd3 100644
--- a/src/utils/common/naiveTools.js
+++ b/src/utils/common/naiveTools.js
@@ -1,4 +1,4 @@
-import { isNullOrUndef } from '@/utils/is'
+import { isNullOrUndef } from '@/utils'
 
 export function setupMessage(NMessage) {
   let loadingMessage = null
diff --git a/src/utils/http/helpers.js b/src/utils/http/helpers.js
index 3d6d0f3..7d3f454 100644
--- a/src/utils/http/helpers.js
+++ b/src/utils/http/helpers.js
@@ -1,7 +1,5 @@
-import { useUserStore } from '@/store/modules/user'
-import { isNullOrUndef } from '@/utils/is'
-import { removeToken } from '@/utils/token'
-import { toLogin } from '@/utils/auth'
+import { useUserStore } from '@/store'
+import { isNullOrUndef, removeToken, toLogin } from '@/utils'
 
 export function addBaseParams(params) {
   if (!params.userId) {
diff --git a/src/utils/http/index.js b/src/utils/http/index.js
index 39b41b1..17f4416 100644
--- a/src/utils/http/index.js
+++ b/src/utils/http/index.js
@@ -14,6 +14,6 @@ export function createAxios(options = {}) {
   return service
 }
 
-export default createAxios({
+export const request = createAxios({
   baseURL: import.meta.env.VITE_BASE_API,
 })
diff --git a/src/utils/http/interceptors.js b/src/utils/http/interceptors.js
index d2b1eeb..73b4d51 100644
--- a/src/utils/http/interceptors.js
+++ b/src/utils/http/interceptors.js
@@ -1,5 +1,4 @@
-import { getToken } from '@/utils/token'
-import { toLogin } from '@/utils/auth'
+import { getToken, toLogin } from '@/utils'
 import { resolveResError } from './helpers'
 
 export function reqResolve(config) {
diff --git a/src/utils/index.js b/src/utils/index.js
index 0978703..8ca6753 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,76 +1,4 @@
-import dayjs from 'dayjs'
-
-/**
- * @desc  格式化时间
- * @param {(Object|string|number)} time
- * @param {string} format
- * @returns {string | null}
- */
-export function formatDateTime(time = undefined, format = 'YYYY-MM-DD HH:mm:ss') {
-  return dayjs(time).format(format)
-}
-
-export function formatDate(date = undefined, format = 'YYYY-MM-DD') {
-  return formatDateTime(date, format)
-}
-
-/**
- * @desc  函数节流
- * @param {Function} fn
- * @param {Number} wait
- * @returns {Function}
- */
-export function throttle(fn, wait) {
-  var context, args
-  var previous = 0
-
-  return function () {
-    var now = +new Date()
-    context = this
-    args = arguments
-    if (now - previous > wait) {
-      fn.apply(context, args)
-      previous = now
-    }
-  }
-}
-
-/**
- * @desc  函数防抖
- * @param {Function} func
- * @param {number} wait
- * @param {boolean} immediate
- * @return {*}
- */
-export function debounce(method, wait, immediate) {
-  let timeout
-  return function (...args) {
-    let context = this
-    if (timeout) {
-      clearTimeout(timeout)
-    }
-    // 立即执行需要两个条件，一是immediate为true，二是timeout未被赋值或被置为null
-    if (immediate) {
-      /**
-       * 如果定时器不存在，则立即执行，并设置一个定时器，wait毫秒后将定时器置为null
-       * 这样确保立即执行后wait毫秒内不会被再次触发
-       */
-      let callNow = !timeout
-      timeout = setTimeout(() => {
-        timeout = null
-      }, wait)
-      if (callNow) {
-        method.apply(context, args)
-      }
-    } else {
-      // 如果immediate为false，则函数wait毫秒后执行
-      timeout = setTimeout(() => {
-        /**
-         * args是一个类数组对象，所以使用fn.apply
-         * 也可写作method.call(context, ...args)
-         */
-        method.apply(context, args)
-      }, wait)
-    }
-  }
-}
+export * from './common'
+export * from './storage'
+export * from './http'
+export * from './auth'
diff --git a/src/utils/cache/index.js b/src/utils/storage/index.js
similarity index 100%
rename from src/utils/cache/index.js
rename to src/utils/storage/index.js
diff --git a/src/utils/cache/storage.js b/src/utils/storage/storage.js
similarity index 96%
rename from src/utils/cache/storage.js
rename to src/utils/storage/storage.js
index e59c0c0..c59f971 100644
--- a/src/utils/cache/storage.js
+++ b/src/utils/storage/storage.js
@@ -1,4 +1,4 @@
-import { isNullOrUndef } from '@/utils/is'
+import { isNullOrUndef } from '@/utils'
 
 class Storage {
   constructor(option) {
diff --git a/src/views/demo/table/api.js b/src/views/demo/table/api.js
index d17fbdf..0365f34 100644
--- a/src/views/demo/table/api.js
+++ b/src/views/demo/table/api.js
@@ -1,4 +1,4 @@
-import request from '@/utils/http'
+import { request } from '@/utils'
 
 export default {
   getPosts: (params = {}) => request.get('posts', { params }),
diff --git a/src/views/demo/table/index.vue b/src/views/demo/table/index.vue
index 62f7331..9117482 100644
--- a/src/views/demo/table/index.vue
+++ b/src/views/demo/table/index.vue
@@ -82,11 +82,9 @@
 
 <script setup>
 import { NButton, NSwitch } from 'naive-ui'
-import { formatDateTime } from '@/utils'
-import { renderIcon } from '@/utils/icon'
+import { formatDateTime, renderIcon, isNullOrUndef } from '@/utils'
 import { useCRUD } from '@/composables'
 import api from './api'
-import { isNullOrUndef } from '@/utils/is'
 
 defineOptions({ name: 'CrudTable' })
 
diff --git a/src/views/login/api.js b/src/views/login/api.js
index d8ca988..d1c539c 100644
--- a/src/views/login/api.js
+++ b/src/views/login/api.js
@@ -1,4 +1,4 @@
-import request from '@/utils/http'
+import { request } from '@/utils'
 
 export default {
   login: (data) => request.post('/auth/login', data, { noNeedToken: true }),
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f12108d..e07e29f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -46,8 +46,7 @@
 </template>
 
 <script setup>
-import { lStorage } from '@/utils/cache'
-import { setToken } from '@/utils/token'
+import { lStorage, setToken } from '@/utils'
 import { useStorage } from '@vueuse/core'
 import bgImg from '@/assets/images/login_bg.webp'
 import api from './api'
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index d1a9ab7..ed6637d 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script setup>
-import { useUserStore } from '@/store/modules/user'
+import { useUserStore } from '@/store'
 
 const userStore = useUserStore()
 </script>