From 421a8e06122fe3783f67b572e910edb321845d0e Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Sat, 30 Jul 2022 01:37:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Auth/index.vue                     | 2 +-
 src/components/AuthAll/index.vue                  | 2 +-
 src/components/CascaderArea/index.vue             | 2 +-
 src/layout/components/AppSetting/index.vue        | 2 +-
 src/layout/components/Header/index.vue            | 2 +-
 src/layout/components/MainSidebar/index.vue       | 2 +-
 src/layout/components/Search/index.vue            | 4 ++--
 src/layout/components/SidebarItem/index.vue       | 2 +-
 src/layout/components/Tools/index.vue             | 4 ++--
 src/layout/index.vue                              | 2 +-
 src/main.js                                       | 2 +-
 src/store/modules/menu.js                         | 2 +-
 src/store/modules/route.js                        | 2 +-
 src/{util => utils}/area.js                       | 0
 src/{util => utils}/composables/auth/index.js     | 0
 src/{util => utils}/composables/index.js          | 0
 src/{util => utils}/composables/mainPage/index.js | 0
 src/{util => utils}/composables/menu/index.js     | 2 +-
 src/{util => utils}/directive.js                  | 2 +-
 src/{util => utils}/eventBus.js                   | 0
 src/{util => utils}/index.js                      | 0
 src/views/permission_example/index.vue            | 2 +-
 22 files changed, 18 insertions(+), 18 deletions(-)
 rename src/{util => utils}/area.js (100%)
 rename src/{util => utils}/composables/auth/index.js (100%)
 rename src/{util => utils}/composables/index.js (100%)
 rename src/{util => utils}/composables/mainPage/index.js (100%)
 rename src/{util => utils}/composables/menu/index.js (94%)
 rename src/{util => utils}/directive.js (90%)
 rename src/{util => utils}/eventBus.js (100%)
 rename src/{util => utils}/index.js (100%)

diff --git a/src/components/Auth/index.vue b/src/components/Auth/index.vue
index 762c34f..9f475e7 100644
--- a/src/components/Auth/index.vue
+++ b/src/components/Auth/index.vue
@@ -1,5 +1,5 @@
 <script setup name="Auth">
-import { useAuth } from '@/util/composables'
+import { useAuth } from '@/utils/composables'
 
 const props = defineProps({
     value: {
diff --git a/src/components/AuthAll/index.vue b/src/components/AuthAll/index.vue
index b7b22ca..49390e9 100644
--- a/src/components/AuthAll/index.vue
+++ b/src/components/AuthAll/index.vue
@@ -1,5 +1,5 @@
 <script setup name="AuthAll">
-import { useAuth } from '@/util/composables'
+import { useAuth } from '@/utils/composables'
 
 const props = defineProps({
     value: {
diff --git a/src/components/CascaderArea/index.vue b/src/components/CascaderArea/index.vue
index 0fa5b43..024bded 100644
--- a/src/components/CascaderArea/index.vue
+++ b/src/components/CascaderArea/index.vue
@@ -1,5 +1,5 @@
 <script setup name="CascaderArea">
-import area from '@/util/area'
+import area from '@/utils/area'
 
 const props = defineProps({
     // 传入数据为中文数组，例如：['河北省', '唐山市', '市辖区']
diff --git a/src/layout/components/AppSetting/index.vue b/src/layout/components/AppSetting/index.vue
index d1ca2f0..6404d26 100644
--- a/src/layout/components/AppSetting/index.vue
+++ b/src/layout/components/AppSetting/index.vue
@@ -1,6 +1,6 @@
 <script setup name="AppSetting">
 import { useClipboard } from '@vueuse/core'
-import eventBus from '@/util/eventBus'
+import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
 import globalSettings from '@/settings'
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 9057574..0fb2ba5 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -3,7 +3,7 @@ import Logo from '../Logo/index.vue'
 import Tools from '../Tools/index.vue'
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
-import { useMenu } from '@/util/composables'
+import { useMenu } from '@/utils/composables'
 
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
diff --git a/src/layout/components/MainSidebar/index.vue b/src/layout/components/MainSidebar/index.vue
index 53e0895..54ab7c7 100644
--- a/src/layout/components/MainSidebar/index.vue
+++ b/src/layout/components/MainSidebar/index.vue
@@ -2,7 +2,7 @@
 import Logo from '../Logo/index.vue'
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
-import { useMenu } from '@/util/composables'
+import { useMenu } from '@/utils/composables'
 
 const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
diff --git a/src/layout/components/Search/index.vue b/src/layout/components/Search/index.vue
index 310f24b..52194e7 100644
--- a/src/layout/components/Search/index.vue
+++ b/src/layout/components/Search/index.vue
@@ -1,7 +1,7 @@
 <script setup name="Search">
 import hotkeys from 'hotkeys-js'
-import { deepClone, isExternalLink } from '@/util'
-import eventBus from '@/util/eventBus'
+import { deepClone, isExternalLink } from '@/utils'
+import eventBus from '@/utils/eventBus'
 import useSettingsStore from '@/store/modules/settings'
 import useRouteStore from '@/store/modules/route'
 import useMenuStore from '@/store/modules/menu'
diff --git a/src/layout/components/SidebarItem/index.vue b/src/layout/components/SidebarItem/index.vue
index 4870c0b..1e6bcd7 100644
--- a/src/layout/components/SidebarItem/index.vue
+++ b/src/layout/components/SidebarItem/index.vue
@@ -1,6 +1,6 @@
 <script setup name="SidebarItem">
 import SidebarItem from './index.vue'
-import { isExternalLink, resolveRoutePath } from '@/util'
+import { isExternalLink, resolveRoutePath } from '@/utils'
 
 const props = defineProps({
     item: {
diff --git a/src/layout/components/Tools/index.vue b/src/layout/components/Tools/index.vue
index b601819..84ac25e 100644
--- a/src/layout/components/Tools/index.vue
+++ b/src/layout/components/Tools/index.vue
@@ -1,7 +1,7 @@
 <script setup name="Tools">
 import { useFullscreen } from '@vueuse/core'
-import eventBus from '@/util/eventBus'
-import { useMainPage } from '@/util/composables'
+import eventBus from '@/utils/eventBus'
+import { useMainPage } from '@/utils/composables'
 import useSettingsStore from '@/store/modules/settings'
 import useUserStore from '@/store/modules/user'
 
diff --git a/src/layout/index.vue b/src/layout/index.vue
index c13cfd5..392ffd0 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -9,7 +9,7 @@ import AppSetting from './components/AppSetting/index.vue'
 import BuyIt from './components/BuyIt/index.vue'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
-import { useMainPage } from '@/util/composables'
+import { useMainPage } from '@/utils/composables'
 
 const routeInfo = useRoute()
 
diff --git a/src/main.js b/src/main.js
index 89dae63..c0c6340 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,7 @@ app.use(router)
 /* importElementPlusPlaceholder */
 
 // 自定义指令
-import directive from '@/util/directive'
+import directive from '@/utils/directive'
 directive(app)
 
 // 加载 svg 图标
diff --git a/src/store/modules/menu.js b/src/store/modules/menu.js
index 890d5f2..4508ccd 100644
--- a/src/store/modules/menu.js
+++ b/src/store/modules/menu.js
@@ -1,4 +1,4 @@
-import { deepClone, resolveRoutePath } from '@/util'
+import { deepClone, resolveRoutePath } from '@/utils'
 import path from 'path-browserify'
 import api from '@/api'
 import menu from '@/menu'
diff --git a/src/store/modules/route.js b/src/store/modules/route.js
index a7d1651..e82c672 100644
--- a/src/store/modules/route.js
+++ b/src/store/modules/route.js
@@ -1,4 +1,4 @@
-import { deepClone, resolveRoutePath } from '@/util'
+import { deepClone, resolveRoutePath } from '@/utils'
 import api from '@/api'
 import { systemRoutes } from '@/router/routes'
 
diff --git a/src/util/area.js b/src/utils/area.js
similarity index 100%
rename from src/util/area.js
rename to src/utils/area.js
diff --git a/src/util/composables/auth/index.js b/src/utils/composables/auth/index.js
similarity index 100%
rename from src/util/composables/auth/index.js
rename to src/utils/composables/auth/index.js
diff --git a/src/util/composables/index.js b/src/utils/composables/index.js
similarity index 100%
rename from src/util/composables/index.js
rename to src/utils/composables/index.js
diff --git a/src/util/composables/mainPage/index.js b/src/utils/composables/mainPage/index.js
similarity index 100%
rename from src/util/composables/mainPage/index.js
rename to src/utils/composables/mainPage/index.js
diff --git a/src/util/composables/menu/index.js b/src/utils/composables/menu/index.js
similarity index 94%
rename from src/util/composables/menu/index.js
rename to src/utils/composables/menu/index.js
index 599b309..ef2a487 100644
--- a/src/util/composables/menu/index.js
+++ b/src/utils/composables/menu/index.js
@@ -1,7 +1,7 @@
 import router from '@/router'
 import useSettingsStore from '@/store/modules/settings'
 import useMenuStore from '@/store/modules/menu'
-import { isExternalLink } from '@/util'
+import { isExternalLink } from '@/utils'
 
 export default function useMenu() {
     const settingsStore = useSettingsStore()
diff --git a/src/util/directive.js b/src/utils/directive.js
similarity index 90%
rename from src/util/directive.js
rename to src/utils/directive.js
index a957a30..b5b53e7 100644
--- a/src/util/directive.js
+++ b/src/utils/directive.js
@@ -1,4 +1,4 @@
-import { useAuth } from '@/util/composables'
+import { useAuth } from '@/utils/composables'
 
 export default function directive(app) {
     // 注册 v-auth 和 v-auth-all 指令
diff --git a/src/util/eventBus.js b/src/utils/eventBus.js
similarity index 100%
rename from src/util/eventBus.js
rename to src/utils/eventBus.js
diff --git a/src/util/index.js b/src/utils/index.js
similarity index 100%
rename from src/util/index.js
rename to src/utils/index.js
diff --git a/src/views/permission_example/index.vue b/src/views/permission_example/index.vue
index 0f6a557..63d4da3 100644
--- a/src/views/permission_example/index.vue
+++ b/src/views/permission_example/index.vue
@@ -9,7 +9,7 @@
 <script setup>
 import useSettingsStore from '@/store/modules/settings'
 import useUserStore from '@/store/modules/user'
-import { useAuth } from '@/util/composables'
+import { useAuth } from '@/utils/composables'
 
 const settingsStore = useSettingsStore()
 const userStore = useUserStore()