From d9a930faf8ac489d3686f58fd639f847058e7381 Mon Sep 17 00:00:00 2001
From: tk <fiyne1a@dingtalk.com>
Date: Wed, 2 Jul 2025 19:22:36 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=94=A8=20=E5=AD=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 .../NetAdmin.Host/NetAdmin.Host.csproj        |  2 +-
 .../NetAdmin.Infrastructure.csproj            |  4 +--
 src/frontend/admin/src/app.vue                | 10 +++---
 .../assets/{icons => icon}/account-report.vue |  0
 .../src/assets/{icons => icon}/alert.vue      |  0
 .../src/assets/{icons => icon}/api-doc.vue    |  0
 .../admin/src/assets/{icons => icon}/api.vue  |  0
 .../admin/src/assets/{icons => icon}/app.vue  |  0
 .../admin/src/assets/{icons => icon}/app2.vue |  0
 .../src/assets/{icons => icon}/archive.vue    |  0
 .../src/assets/{icons => icon}/bug-fill.vue   |  0
 .../src/assets/{icons => icon}/bug-line.vue   |  0
 .../src/assets/{icons => icon}/business.vue   |  0
 .../admin/src/assets/{icons => icon}/code.vue |  0
 .../src/assets/{icons => icon}/code2.vue      |  0
 .../src/assets/{icons => icon}/collect.vue    |  0
 .../src/assets/{icons => icon}/country.vue    |  0
 .../src/assets/{icons => icon}/csharp.vue     |  0
 .../src/assets/{icons => icon}/daily.vue      |  0
 .../src/assets/{icons => icon}/dashboard.vue  |  0
 .../admin/src/assets/{icons => icon}/demo.vue |  0
 .../admin/src/assets/{icons => icon}/dept.vue |  0
 .../src/assets/{icons => icon}/device-log.vue |  0
 .../src/assets/{icons => icon}/device.vue     |  0
 .../admin/src/assets/{icons => icon}/dic.vue  |  0
 .../src/assets/{icons => icon}/docker.vue     |  0
 .../src/assets/{icons => icon}/download.vue   |  0
 .../src/assets/{icons => icon}/drone.vue      |  0
 .../src/assets/{icons => icon}/echarts.vue    |  0
 .../src/assets/{icons => icon}/elastic.vue    |  0
 .../src/assets/{icons => icon}/element.vue    |  0
 .../src/assets/{icons => icon}/email.vue      |  0
 .../src/assets/{icons => icon}/error.vue      |  0
 .../src/assets/{icons => icon}/ex-log.vue     |  0
 .../src/assets/{icons => icon}/exception.vue  |  0
 .../src/assets/{icons => icon}/file-excel.vue |  0
 .../src/assets/{icons => icon}/file-ppt.vue   |  0
 .../src/assets/{icons => icon}/file-word.vue  |  0
 .../src/assets/{icons => icon}/free-sql.vue   |  0
 .../src/assets/{icons => icon}/gitea.vue      |  0
 .../src/assets/{icons => icon}/grafana.vue    |  0
 .../admin/src/assets/{icons => icon}/help.vue |  0
 .../admin/src/assets/{icons => icon}/home.vue |  0
 .../admin/src/assets/{icons => icon}/index.js |  0
 .../admin/src/assets/{icons => icon}/js.vue   |  0
 .../src/assets/{icons => icon}/kafka.vue      |  0
 .../admin/src/assets/{icons => icon}/key.vue  |  0
 .../src/assets/{icons => icon}/kibana.vue     |  0
 .../admin/src/assets/{icons => icon}/link.vue |  0
 .../admin/src/assets/{icons => icon}/log.vue  |  0
 .../src/assets/{icons => icon}/login-log.vue  |  0
 .../src/assets/{icons => icon}/mail-code.vue  |  0
 .../src/assets/{icons => icon}/memory.vue     |  0
 .../src/assets/{icons => icon}/meter.vue      |  0
 .../src/assets/{icons => icon}/mobile.vue     |  0
 .../src/assets/{icons => icon}/nick-name.vue  |  0
 .../src/assets/{icons => icon}/open-door.vue  |  0
 .../src/assets/{icons => icon}/oper-log.vue   |  0
 .../assets/{icons => icon}/organization.vue   |  0
 .../assets/{icons => icon}/performance.vue    |  0
 .../src/assets/{icons => icon}/position.vue   |  0
 .../{icons => icon}/product-category.vue      |  0
 .../src/assets/{icons => icon}/product.vue    |  0
 .../src/assets/{icons => icon}/proxy.vue      |  0
 .../src/assets/{icons => icon}/report.vue     |  0
 .../src/assets/{icons => icon}/resource.vue   |  0
 .../src/assets/{icons => icon}/robot.vue      |  0
 .../admin/src/assets/{icons => icon}/role.vue |  0
 .../assets/{icons => icon}/scheduled-job.vue  |  0
 .../admin/src/assets/{icons => icon}/send.vue |  0
 .../src/assets/{icons => icon}/sms-code.vue   |  0
 .../src/assets/{icons => icon}/stats.vue      |  0
 .../admin/src/assets/{icons => icon}/sync.vue |  0
 .../admin/src/assets/{icons => icon}/task.vue |  0
 .../src/assets/{icons => icon}/telegram.vue   |  0
 .../admin/src/assets/{icons => icon}/tpl.vue  |  0
 .../src/assets/{icons => icon}/tpl/export.js  |  0
 .../src/assets/{icons => icon}/tpl/svg.vue    |  0
 .../src/assets/{icons => icon}/unlink.vue     |  0
 .../src/assets/{icons => icon}/upload.vue     |  0
 .../src/assets/{icons => icon}/version.vue    |  0
 .../admin/src/assets/{icons => icon}/vue.vue  |  0
 .../src/assets/{icons => icon}/warning.vue    |  0
 .../src/assets/{icons => icon}/wechat.vue     |  0
 .../src/components/na-col-avatar/index.vue    |  2 +-
 .../src/components/na-col-indicator/index.vue |  3 +-
 .../src/components/na-col-user/index.vue      |  3 +-
 .../src/components/na-form-email/index.vue    |  3 +-
 .../src/components/na-form-phone/index.vue    |  3 +-
 .../src/components/na-verifition/index.vue    |  2 +-
 .../admin/src/components/sc-echarts/index.vue |  2 +-
 .../src/components/sc-file-export/column.vue  |  4 +--
 .../src/components/sc-file-export/index.vue   |  3 +-
 .../src/components/sc-form-table/index.vue    |  4 +--
 .../src/components/sc-icon-select/index.vue   |  2 +-
 .../components/sc-table/column-setting.vue    |  6 ++--
 .../admin/src/components/sc-table/index.vue   | 11 ++++---
 .../src/components/sc-upload/multiple.vue     |  4 +--
 src/frontend/admin/src/config/file-select.js  | 14 ++++----
 src/frontend/admin/src/config/index.js        | 14 ++++----
 src/frontend/admin/src/config/upload.js       |  6 ++--
 src/frontend/admin/src/config/workflow.js     |  8 ++---
 src/frontend/admin/src/global.js              |  6 +++-
 .../admin/src/layout/components/side-m.vue    |  9 +++---
 .../admin/src/layout/components/tags.vue      |  4 +--
 .../admin/src/layout/components/tasks.vue     |  3 +-
 .../admin/src/layout/components/user-bar.vue  |  8 ++---
 src/frontend/admin/src/layout/index.vue       | 15 +++++----
 src/frontend/admin/src/locales/index.js       |  4 +--
 src/frontend/admin/src/main.js                | 32 +++++++++----------
 src/frontend/admin/src/router/index.js        | 18 +++++------
 src/frontend/admin/src/utils/preload.js       | 12 +++----
 src/frontend/admin/src/utils/tool.js          | 26 +++++++--------
 src/frontend/admin/src/utils/use-tabs.js      |  6 ++--
 .../src/views/guest/components/phone-form.vue |  3 +-
 src/frontend/admin/src/views/guest/login.vue  |  5 +--
 .../admin/src/views/guest/register.vue        |  9 ++++--
 .../admin/src/views/guest/reset-password.vue  |  7 ++--
 src/frontend/admin/src/views/home/index.vue   |  4 +--
 .../components/chart-bar-job-record.vue       |  5 +--
 .../widgets/components/chart-bar-request.vue  |  5 +--
 .../components/chart-pie-job-record.vue       |  5 +--
 .../widgets/components/chart-pie-request.vue  |  5 +--
 .../components/components/chart-bar.vue       |  3 +-
 .../components/components/chart-pie.vue       |  3 +-
 .../admin/src/views/home/widgets/index.vue    |  5 +--
 .../admin/src/views/home/work/index.vue       |  3 +-
 .../src/views/profile/account/set-email.vue   |  4 +--
 .../src/views/profile/account/set-mobile.vue  |  3 +-
 .../views/profile/account/set-password.vue    |  5 +--
 src/frontend/admin/src/views/profile/logs.vue |  5 +--
 .../admin/src/views/profile/message/index.vue |  4 +--
 .../admin/src/views/profile/settings.vue      | 10 +++---
 .../admin/src/views/sys/cache/index.vue       |  6 +---
 .../admin/src/views/sys/dic/index.vue         |  3 +-
 .../admin/src/views/sys/dic/list/save.vue     |  2 +-
 .../admin/src/views/sys/doc/index.vue         |  3 +-
 .../admin/src/views/sys/doc/list/save.vue     |  2 +-
 .../admin/src/views/sys/job/all/index.vue     |  2 --
 .../admin/src/views/sys/job/record/index.vue  |  2 --
 .../admin/src/views/sys/log/login/index.vue   |  5 +--
 .../src/views/sys/log/operation/index.vue     |  2 --
 .../admin/src/views/sys/menu/index.vue        |  3 +-
 .../admin/src/views/sys/menu/save.vue         |  3 +-
 src/frontend/admin/src/views/sys/msg/save.vue |  2 +-
 .../admin/src/views/sys/order/save.vue        |  4 +--
 147 files changed, 201 insertions(+), 186 deletions(-)
 rename src/frontend/admin/src/assets/{icons => icon}/account-report.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/alert.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/api-doc.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/api.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/app.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/app2.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/archive.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/bug-fill.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/bug-line.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/business.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/code.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/code2.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/collect.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/country.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/csharp.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/daily.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/dashboard.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/demo.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/dept.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/device-log.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/device.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/dic.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/docker.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/download.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/drone.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/echarts.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/elastic.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/element.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/email.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/error.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/ex-log.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/exception.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/file-excel.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/file-ppt.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/file-word.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/free-sql.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/gitea.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/grafana.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/help.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/home.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/index.js (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/js.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/kafka.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/key.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/kibana.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/link.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/log.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/login-log.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/mail-code.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/memory.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/meter.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/mobile.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/nick-name.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/open-door.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/oper-log.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/organization.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/performance.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/position.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/product-category.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/product.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/proxy.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/report.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/resource.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/robot.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/role.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/scheduled-job.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/send.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/sms-code.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/stats.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/sync.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/task.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/telegram.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/tpl.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/tpl/export.js (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/tpl/svg.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/unlink.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/upload.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/version.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/vue.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/warning.vue (100%)
 rename src/frontend/admin/src/assets/{icons => icon}/wechat.vue (100%)

diff --git a/package.json b/package.json
index 7a4d71b6..39b93541 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "devDependencies": {
     "cz-git": "^1.11.2",
     "commitizen": "^4.3.1",
-    "prettier": "^3.6.1",
+    "prettier": "^3.6.2",
     "standard-version": "^9.5.0"
   },
   "config": {
diff --git a/src/backend/NetAdmin/NetAdmin.Host/NetAdmin.Host.csproj b/src/backend/NetAdmin/NetAdmin.Host/NetAdmin.Host.csproj
index b5514d0e..60e3ca7c 100644
--- a/src/backend/NetAdmin/NetAdmin.Host/NetAdmin.Host.csproj
+++ b/src/backend/NetAdmin/NetAdmin.Host/NetAdmin.Host.csproj
@@ -4,7 +4,7 @@
         <ProjectReference Include="../NetAdmin.Cache/NetAdmin.Cache.csproj"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="NetAdmin.ApiSkin" Condition="'$(Configuration)' == 'Debug'" Version="1.0.0"/>
+        <PackageReference Include="NetAdmin.ApiSkin" Condition="'$(Configuration)' == 'Debug'" Version="1.0.1"/>
         <PackageReference Include="NetAdmin.Spectre.Console.Cli" Version="1.0.1"/>
         <PackageReference Include="prometheus-net.AspNetCore" Condition="'$(Configuration)' != 'Debug'" Version="8.2.1"/>
     </ItemGroup>
diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
index 88a9270c..ca37d4ee 100644
--- a/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
+++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj
@@ -3,8 +3,8 @@
     <Import Project="$(SolutionDir)/build/copy.pkg.xml.comment.files.targets"/>
     <Import Project="$(SolutionDir)/build/prebuild.targets"/>
     <ItemGroup>
-        <PackageReference Include="NetAdmin.FreeSql.DbContext" Version="1.1.6" Label="refs"/>
-        <PackageReference Include="NetAdmin.FreeSql.Provider.Sqlite" Version="1.1.6" Label="refs"/>
+        <PackageReference Include="NetAdmin.FreeSql.DbContext" Version="1.1.7" Label="refs"/>
+        <PackageReference Include="NetAdmin.FreeSql.Provider.Sqlite" Version="1.1.7" Label="refs"/>
         <PackageReference Include="Gurion" Version="1.2.15" Label="refs"/>
         <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.6"/>
         <PackageReference Include="Minio" Version="6.0.5"/>
diff --git a/src/frontend/admin/src/app.vue b/src/frontend/admin/src/app.vue
index e2b8c65b..d69577d1 100644
--- a/src/frontend/admin/src/app.vue
+++ b/src/frontend/admin/src/app.vue
@@ -7,11 +7,11 @@
 
 <script>
 import colorTool from '@/utils/color'
-import naVersionUpdater from '@/components/na-version-updater'
-import UseTabs from '@/utils/use-tabs'
+import { defineAsyncComponent } from 'vue'
+const naVersionUpdater = defineAsyncComponent(() => import('@/components/na-version-updater'))
+import useTabs from '@/utils/use-tabs'
 
 export default {
-    name: 'App',
     components: { naVersionUpdater },
     provide() {
         return {
@@ -121,9 +121,9 @@ export default {
             } else if (e.altKey) {
                 if (e.keyCode === 81) {
                     if (e.ctrlKey) {
-                        UseTabs.closeOther()
+                        useTabs.closeOther()
                     } else {
-                        UseTabs.close()
+                        useTabs.close()
                     }
                 } else if (e.keyCode === 65) {
                     document.getElementsByClassName('user-bar-btn-search')[0]?.dispatchEvent(
diff --git a/src/frontend/admin/src/assets/icons/account-report.vue b/src/frontend/admin/src/assets/icon/account-report.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/account-report.vue
rename to src/frontend/admin/src/assets/icon/account-report.vue
diff --git a/src/frontend/admin/src/assets/icons/alert.vue b/src/frontend/admin/src/assets/icon/alert.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/alert.vue
rename to src/frontend/admin/src/assets/icon/alert.vue
diff --git a/src/frontend/admin/src/assets/icons/api-doc.vue b/src/frontend/admin/src/assets/icon/api-doc.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/api-doc.vue
rename to src/frontend/admin/src/assets/icon/api-doc.vue
diff --git a/src/frontend/admin/src/assets/icons/api.vue b/src/frontend/admin/src/assets/icon/api.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/api.vue
rename to src/frontend/admin/src/assets/icon/api.vue
diff --git a/src/frontend/admin/src/assets/icons/app.vue b/src/frontend/admin/src/assets/icon/app.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/app.vue
rename to src/frontend/admin/src/assets/icon/app.vue
diff --git a/src/frontend/admin/src/assets/icons/app2.vue b/src/frontend/admin/src/assets/icon/app2.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/app2.vue
rename to src/frontend/admin/src/assets/icon/app2.vue
diff --git a/src/frontend/admin/src/assets/icons/archive.vue b/src/frontend/admin/src/assets/icon/archive.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/archive.vue
rename to src/frontend/admin/src/assets/icon/archive.vue
diff --git a/src/frontend/admin/src/assets/icons/bug-fill.vue b/src/frontend/admin/src/assets/icon/bug-fill.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/bug-fill.vue
rename to src/frontend/admin/src/assets/icon/bug-fill.vue
diff --git a/src/frontend/admin/src/assets/icons/bug-line.vue b/src/frontend/admin/src/assets/icon/bug-line.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/bug-line.vue
rename to src/frontend/admin/src/assets/icon/bug-line.vue
diff --git a/src/frontend/admin/src/assets/icons/business.vue b/src/frontend/admin/src/assets/icon/business.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/business.vue
rename to src/frontend/admin/src/assets/icon/business.vue
diff --git a/src/frontend/admin/src/assets/icons/code.vue b/src/frontend/admin/src/assets/icon/code.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/code.vue
rename to src/frontend/admin/src/assets/icon/code.vue
diff --git a/src/frontend/admin/src/assets/icons/code2.vue b/src/frontend/admin/src/assets/icon/code2.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/code2.vue
rename to src/frontend/admin/src/assets/icon/code2.vue
diff --git a/src/frontend/admin/src/assets/icons/collect.vue b/src/frontend/admin/src/assets/icon/collect.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/collect.vue
rename to src/frontend/admin/src/assets/icon/collect.vue
diff --git a/src/frontend/admin/src/assets/icons/country.vue b/src/frontend/admin/src/assets/icon/country.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/country.vue
rename to src/frontend/admin/src/assets/icon/country.vue
diff --git a/src/frontend/admin/src/assets/icons/csharp.vue b/src/frontend/admin/src/assets/icon/csharp.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/csharp.vue
rename to src/frontend/admin/src/assets/icon/csharp.vue
diff --git a/src/frontend/admin/src/assets/icons/daily.vue b/src/frontend/admin/src/assets/icon/daily.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/daily.vue
rename to src/frontend/admin/src/assets/icon/daily.vue
diff --git a/src/frontend/admin/src/assets/icons/dashboard.vue b/src/frontend/admin/src/assets/icon/dashboard.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/dashboard.vue
rename to src/frontend/admin/src/assets/icon/dashboard.vue
diff --git a/src/frontend/admin/src/assets/icons/demo.vue b/src/frontend/admin/src/assets/icon/demo.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/demo.vue
rename to src/frontend/admin/src/assets/icon/demo.vue
diff --git a/src/frontend/admin/src/assets/icons/dept.vue b/src/frontend/admin/src/assets/icon/dept.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/dept.vue
rename to src/frontend/admin/src/assets/icon/dept.vue
diff --git a/src/frontend/admin/src/assets/icons/device-log.vue b/src/frontend/admin/src/assets/icon/device-log.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/device-log.vue
rename to src/frontend/admin/src/assets/icon/device-log.vue
diff --git a/src/frontend/admin/src/assets/icons/device.vue b/src/frontend/admin/src/assets/icon/device.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/device.vue
rename to src/frontend/admin/src/assets/icon/device.vue
diff --git a/src/frontend/admin/src/assets/icons/dic.vue b/src/frontend/admin/src/assets/icon/dic.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/dic.vue
rename to src/frontend/admin/src/assets/icon/dic.vue
diff --git a/src/frontend/admin/src/assets/icons/docker.vue b/src/frontend/admin/src/assets/icon/docker.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/docker.vue
rename to src/frontend/admin/src/assets/icon/docker.vue
diff --git a/src/frontend/admin/src/assets/icons/download.vue b/src/frontend/admin/src/assets/icon/download.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/download.vue
rename to src/frontend/admin/src/assets/icon/download.vue
diff --git a/src/frontend/admin/src/assets/icons/drone.vue b/src/frontend/admin/src/assets/icon/drone.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/drone.vue
rename to src/frontend/admin/src/assets/icon/drone.vue
diff --git a/src/frontend/admin/src/assets/icons/echarts.vue b/src/frontend/admin/src/assets/icon/echarts.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/echarts.vue
rename to src/frontend/admin/src/assets/icon/echarts.vue
diff --git a/src/frontend/admin/src/assets/icons/elastic.vue b/src/frontend/admin/src/assets/icon/elastic.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/elastic.vue
rename to src/frontend/admin/src/assets/icon/elastic.vue
diff --git a/src/frontend/admin/src/assets/icons/element.vue b/src/frontend/admin/src/assets/icon/element.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/element.vue
rename to src/frontend/admin/src/assets/icon/element.vue
diff --git a/src/frontend/admin/src/assets/icons/email.vue b/src/frontend/admin/src/assets/icon/email.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/email.vue
rename to src/frontend/admin/src/assets/icon/email.vue
diff --git a/src/frontend/admin/src/assets/icons/error.vue b/src/frontend/admin/src/assets/icon/error.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/error.vue
rename to src/frontend/admin/src/assets/icon/error.vue
diff --git a/src/frontend/admin/src/assets/icons/ex-log.vue b/src/frontend/admin/src/assets/icon/ex-log.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/ex-log.vue
rename to src/frontend/admin/src/assets/icon/ex-log.vue
diff --git a/src/frontend/admin/src/assets/icons/exception.vue b/src/frontend/admin/src/assets/icon/exception.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/exception.vue
rename to src/frontend/admin/src/assets/icon/exception.vue
diff --git a/src/frontend/admin/src/assets/icons/file-excel.vue b/src/frontend/admin/src/assets/icon/file-excel.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/file-excel.vue
rename to src/frontend/admin/src/assets/icon/file-excel.vue
diff --git a/src/frontend/admin/src/assets/icons/file-ppt.vue b/src/frontend/admin/src/assets/icon/file-ppt.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/file-ppt.vue
rename to src/frontend/admin/src/assets/icon/file-ppt.vue
diff --git a/src/frontend/admin/src/assets/icons/file-word.vue b/src/frontend/admin/src/assets/icon/file-word.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/file-word.vue
rename to src/frontend/admin/src/assets/icon/file-word.vue
diff --git a/src/frontend/admin/src/assets/icons/free-sql.vue b/src/frontend/admin/src/assets/icon/free-sql.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/free-sql.vue
rename to src/frontend/admin/src/assets/icon/free-sql.vue
diff --git a/src/frontend/admin/src/assets/icons/gitea.vue b/src/frontend/admin/src/assets/icon/gitea.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/gitea.vue
rename to src/frontend/admin/src/assets/icon/gitea.vue
diff --git a/src/frontend/admin/src/assets/icons/grafana.vue b/src/frontend/admin/src/assets/icon/grafana.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/grafana.vue
rename to src/frontend/admin/src/assets/icon/grafana.vue
diff --git a/src/frontend/admin/src/assets/icons/help.vue b/src/frontend/admin/src/assets/icon/help.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/help.vue
rename to src/frontend/admin/src/assets/icon/help.vue
diff --git a/src/frontend/admin/src/assets/icons/home.vue b/src/frontend/admin/src/assets/icon/home.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/home.vue
rename to src/frontend/admin/src/assets/icon/home.vue
diff --git a/src/frontend/admin/src/assets/icons/index.js b/src/frontend/admin/src/assets/icon/index.js
similarity index 100%
rename from src/frontend/admin/src/assets/icons/index.js
rename to src/frontend/admin/src/assets/icon/index.js
diff --git a/src/frontend/admin/src/assets/icons/js.vue b/src/frontend/admin/src/assets/icon/js.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/js.vue
rename to src/frontend/admin/src/assets/icon/js.vue
diff --git a/src/frontend/admin/src/assets/icons/kafka.vue b/src/frontend/admin/src/assets/icon/kafka.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/kafka.vue
rename to src/frontend/admin/src/assets/icon/kafka.vue
diff --git a/src/frontend/admin/src/assets/icons/key.vue b/src/frontend/admin/src/assets/icon/key.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/key.vue
rename to src/frontend/admin/src/assets/icon/key.vue
diff --git a/src/frontend/admin/src/assets/icons/kibana.vue b/src/frontend/admin/src/assets/icon/kibana.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/kibana.vue
rename to src/frontend/admin/src/assets/icon/kibana.vue
diff --git a/src/frontend/admin/src/assets/icons/link.vue b/src/frontend/admin/src/assets/icon/link.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/link.vue
rename to src/frontend/admin/src/assets/icon/link.vue
diff --git a/src/frontend/admin/src/assets/icons/log.vue b/src/frontend/admin/src/assets/icon/log.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/log.vue
rename to src/frontend/admin/src/assets/icon/log.vue
diff --git a/src/frontend/admin/src/assets/icons/login-log.vue b/src/frontend/admin/src/assets/icon/login-log.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/login-log.vue
rename to src/frontend/admin/src/assets/icon/login-log.vue
diff --git a/src/frontend/admin/src/assets/icons/mail-code.vue b/src/frontend/admin/src/assets/icon/mail-code.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/mail-code.vue
rename to src/frontend/admin/src/assets/icon/mail-code.vue
diff --git a/src/frontend/admin/src/assets/icons/memory.vue b/src/frontend/admin/src/assets/icon/memory.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/memory.vue
rename to src/frontend/admin/src/assets/icon/memory.vue
diff --git a/src/frontend/admin/src/assets/icons/meter.vue b/src/frontend/admin/src/assets/icon/meter.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/meter.vue
rename to src/frontend/admin/src/assets/icon/meter.vue
diff --git a/src/frontend/admin/src/assets/icons/mobile.vue b/src/frontend/admin/src/assets/icon/mobile.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/mobile.vue
rename to src/frontend/admin/src/assets/icon/mobile.vue
diff --git a/src/frontend/admin/src/assets/icons/nick-name.vue b/src/frontend/admin/src/assets/icon/nick-name.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/nick-name.vue
rename to src/frontend/admin/src/assets/icon/nick-name.vue
diff --git a/src/frontend/admin/src/assets/icons/open-door.vue b/src/frontend/admin/src/assets/icon/open-door.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/open-door.vue
rename to src/frontend/admin/src/assets/icon/open-door.vue
diff --git a/src/frontend/admin/src/assets/icons/oper-log.vue b/src/frontend/admin/src/assets/icon/oper-log.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/oper-log.vue
rename to src/frontend/admin/src/assets/icon/oper-log.vue
diff --git a/src/frontend/admin/src/assets/icons/organization.vue b/src/frontend/admin/src/assets/icon/organization.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/organization.vue
rename to src/frontend/admin/src/assets/icon/organization.vue
diff --git a/src/frontend/admin/src/assets/icons/performance.vue b/src/frontend/admin/src/assets/icon/performance.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/performance.vue
rename to src/frontend/admin/src/assets/icon/performance.vue
diff --git a/src/frontend/admin/src/assets/icons/position.vue b/src/frontend/admin/src/assets/icon/position.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/position.vue
rename to src/frontend/admin/src/assets/icon/position.vue
diff --git a/src/frontend/admin/src/assets/icons/product-category.vue b/src/frontend/admin/src/assets/icon/product-category.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/product-category.vue
rename to src/frontend/admin/src/assets/icon/product-category.vue
diff --git a/src/frontend/admin/src/assets/icons/product.vue b/src/frontend/admin/src/assets/icon/product.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/product.vue
rename to src/frontend/admin/src/assets/icon/product.vue
diff --git a/src/frontend/admin/src/assets/icons/proxy.vue b/src/frontend/admin/src/assets/icon/proxy.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/proxy.vue
rename to src/frontend/admin/src/assets/icon/proxy.vue
diff --git a/src/frontend/admin/src/assets/icons/report.vue b/src/frontend/admin/src/assets/icon/report.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/report.vue
rename to src/frontend/admin/src/assets/icon/report.vue
diff --git a/src/frontend/admin/src/assets/icons/resource.vue b/src/frontend/admin/src/assets/icon/resource.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/resource.vue
rename to src/frontend/admin/src/assets/icon/resource.vue
diff --git a/src/frontend/admin/src/assets/icons/robot.vue b/src/frontend/admin/src/assets/icon/robot.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/robot.vue
rename to src/frontend/admin/src/assets/icon/robot.vue
diff --git a/src/frontend/admin/src/assets/icons/role.vue b/src/frontend/admin/src/assets/icon/role.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/role.vue
rename to src/frontend/admin/src/assets/icon/role.vue
diff --git a/src/frontend/admin/src/assets/icons/scheduled-job.vue b/src/frontend/admin/src/assets/icon/scheduled-job.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/scheduled-job.vue
rename to src/frontend/admin/src/assets/icon/scheduled-job.vue
diff --git a/src/frontend/admin/src/assets/icons/send.vue b/src/frontend/admin/src/assets/icon/send.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/send.vue
rename to src/frontend/admin/src/assets/icon/send.vue
diff --git a/src/frontend/admin/src/assets/icons/sms-code.vue b/src/frontend/admin/src/assets/icon/sms-code.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/sms-code.vue
rename to src/frontend/admin/src/assets/icon/sms-code.vue
diff --git a/src/frontend/admin/src/assets/icons/stats.vue b/src/frontend/admin/src/assets/icon/stats.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/stats.vue
rename to src/frontend/admin/src/assets/icon/stats.vue
diff --git a/src/frontend/admin/src/assets/icons/sync.vue b/src/frontend/admin/src/assets/icon/sync.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/sync.vue
rename to src/frontend/admin/src/assets/icon/sync.vue
diff --git a/src/frontend/admin/src/assets/icons/task.vue b/src/frontend/admin/src/assets/icon/task.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/task.vue
rename to src/frontend/admin/src/assets/icon/task.vue
diff --git a/src/frontend/admin/src/assets/icons/telegram.vue b/src/frontend/admin/src/assets/icon/telegram.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/telegram.vue
rename to src/frontend/admin/src/assets/icon/telegram.vue
diff --git a/src/frontend/admin/src/assets/icons/tpl.vue b/src/frontend/admin/src/assets/icon/tpl.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/tpl.vue
rename to src/frontend/admin/src/assets/icon/tpl.vue
diff --git a/src/frontend/admin/src/assets/icons/tpl/export.js b/src/frontend/admin/src/assets/icon/tpl/export.js
similarity index 100%
rename from src/frontend/admin/src/assets/icons/tpl/export.js
rename to src/frontend/admin/src/assets/icon/tpl/export.js
diff --git a/src/frontend/admin/src/assets/icons/tpl/svg.vue b/src/frontend/admin/src/assets/icon/tpl/svg.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/tpl/svg.vue
rename to src/frontend/admin/src/assets/icon/tpl/svg.vue
diff --git a/src/frontend/admin/src/assets/icons/unlink.vue b/src/frontend/admin/src/assets/icon/unlink.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/unlink.vue
rename to src/frontend/admin/src/assets/icon/unlink.vue
diff --git a/src/frontend/admin/src/assets/icons/upload.vue b/src/frontend/admin/src/assets/icon/upload.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/upload.vue
rename to src/frontend/admin/src/assets/icon/upload.vue
diff --git a/src/frontend/admin/src/assets/icons/version.vue b/src/frontend/admin/src/assets/icon/version.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/version.vue
rename to src/frontend/admin/src/assets/icon/version.vue
diff --git a/src/frontend/admin/src/assets/icons/vue.vue b/src/frontend/admin/src/assets/icon/vue.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/vue.vue
rename to src/frontend/admin/src/assets/icon/vue.vue
diff --git a/src/frontend/admin/src/assets/icons/warning.vue b/src/frontend/admin/src/assets/icon/warning.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/warning.vue
rename to src/frontend/admin/src/assets/icon/warning.vue
diff --git a/src/frontend/admin/src/assets/icons/wechat.vue b/src/frontend/admin/src/assets/icon/wechat.vue
similarity index 100%
rename from src/frontend/admin/src/assets/icons/wechat.vue
rename to src/frontend/admin/src/assets/icon/wechat.vue
diff --git a/src/frontend/admin/src/components/na-col-avatar/index.vue b/src/frontend/admin/src/components/na-col-avatar/index.vue
index a60ebffd..526fb751 100644
--- a/src/frontend/admin/src/components/na-col-avatar/index.vue
+++ b/src/frontend/admin/src/components/na-col-avatar/index.vue
@@ -16,7 +16,7 @@
 }
 </style>
 <script>
-import tool from '../../utils/tool'
+import tool from '@/utils/tool'
 
 export default {
     emits: [],
diff --git a/src/frontend/admin/src/components/na-col-indicator/index.vue b/src/frontend/admin/src/components/na-col-indicator/index.vue
index 822aa996..6aaa67b2 100644
--- a/src/frontend/admin/src/components/na-col-indicator/index.vue
+++ b/src/frontend/admin/src/components/na-col-indicator/index.vue
@@ -7,7 +7,6 @@
     </el-table-column>
 </template>
 <script>
-import naIndicator from '@/components/na-indicator'
 export default {
     emits: [],
     props: {
@@ -18,7 +17,7 @@ export default {
     },
     mounted() {},
     created() {},
-    components: { naIndicator },
+    components: {},
     computed: {},
     methods: {},
 }
diff --git a/src/frontend/admin/src/components/na-col-user/index.vue b/src/frontend/admin/src/components/na-col-user/index.vue
index 399084cf..94600c4a 100644
--- a/src/frontend/admin/src/components/na-col-user/index.vue
+++ b/src/frontend/admin/src/components/na-col-user/index.vue
@@ -16,7 +16,8 @@
     </el-table-column>
 </template>
 <script>
-import saveDialog from '@/views/sys/user/save'
+import { defineAsyncComponent } from 'vue'
+const saveDialog = defineAsyncComponent(() => import('@/views/sys/user/save'))
 
 export default {
     components: { saveDialog },
diff --git a/src/frontend/admin/src/components/na-form-email/index.vue b/src/frontend/admin/src/components/na-form-email/index.vue
index fa6fdf0d..144e09ba 100644
--- a/src/frontend/admin/src/components/na-form-email/index.vue
+++ b/src/frontend/admin/src/components/na-form-email/index.vue
@@ -33,7 +33,8 @@
 </template>
 
 <script>
-import naVerify from '@/components/na-verifition'
+import { defineAsyncComponent } from 'vue'
+const naVerify = defineAsyncComponent(() => import('@/components/na-verifition'))
 
 export default {
     emits: [],
diff --git a/src/frontend/admin/src/components/na-form-phone/index.vue b/src/frontend/admin/src/components/na-form-phone/index.vue
index fd5b73f9..4549b30d 100644
--- a/src/frontend/admin/src/components/na-form-phone/index.vue
+++ b/src/frontend/admin/src/components/na-form-phone/index.vue
@@ -35,7 +35,8 @@
 </template>
 
 <script>
-import naVerify from '@/components/na-verifition'
+import { defineAsyncComponent } from 'vue'
+const naVerify = defineAsyncComponent(() => import('@/components/na-verifition'))
 
 export default {
     emits: [],
diff --git a/src/frontend/admin/src/components/na-verifition/index.vue b/src/frontend/admin/src/components/na-verifition/index.vue
index a2650702..25b245d0 100644
--- a/src/frontend/admin/src/components/na-verifition/index.vue
+++ b/src/frontend/admin/src/components/na-verifition/index.vue
@@ -35,7 +35,7 @@
  * Verify 验证码组件
  * @description 分发验证码使用
  * */
-import slide from './slide'
+import slide from '@/components/na-verifition/slide'
 import { computed, ref, toRefs, watchEffect } from 'vue'
 
 export default {
diff --git a/src/frontend/admin/src/components/sc-echarts/index.vue b/src/frontend/admin/src/components/sc-echarts/index.vue
index 0c033d3c..cc7f6f6a 100644
--- a/src/frontend/admin/src/components/sc-echarts/index.vue
+++ b/src/frontend/admin/src/components/sc-echarts/index.vue
@@ -4,7 +4,7 @@
 
 <script>
 import * as echarts from 'echarts'
-import t from './echarts-theme-t.js'
+import t from '@/components/sc-echarts/echarts-theme-t.js'
 const unwarp = (obj) => obj && (obj.__v_raw || obj.valueOf() || obj)
 
 export default {
diff --git a/src/frontend/admin/src/components/sc-file-export/column.vue b/src/frontend/admin/src/components/sc-file-export/column.vue
index 8ef0a6ed..e98e139e 100644
--- a/src/frontend/admin/src/components/sc-file-export/column.vue
+++ b/src/frontend/admin/src/components/sc-file-export/column.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import Sortable from 'sortablejs'
+import sortable from 'sortablejs'
 
 export default {
     emits: ['success'],
@@ -40,7 +40,7 @@ export default {
         rowDrop() {
             const _this = this
             const tbody = this.$refs.table.$el.querySelector('.el-table__body-wrapper tbody')
-            Sortable.create(tbody, {
+            sortable.create(tbody, {
                 handle: '.move',
                 animation: 200,
                 ghostClass: 'ghost',
diff --git a/src/frontend/admin/src/components/sc-file-export/index.vue b/src/frontend/admin/src/components/sc-file-export/index.vue
index ad1f736a..0bee6af8 100644
--- a/src/frontend/admin/src/components/sc-file-export/index.vue
+++ b/src/frontend/admin/src/components/sc-file-export/index.vue
@@ -52,7 +52,8 @@
 </template>
 
 <script>
-import columnSet from './column'
+import { defineAsyncComponent } from 'vue'
+const columnSet = defineAsyncComponent(() => import('@/components/sc-file-export/column'))
 
 export default {
     components: {
diff --git a/src/frontend/admin/src/components/sc-form-table/index.vue b/src/frontend/admin/src/components/sc-form-table/index.vue
index 877608e3..07b2614f 100644
--- a/src/frontend/admin/src/components/sc-form-table/index.vue
+++ b/src/frontend/admin/src/components/sc-form-table/index.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import Sortable from 'sortablejs'
+import sortable from 'sortablejs'
 
 export default {
     props: {
@@ -75,7 +75,7 @@ export default {
         rowDrop() {
             const _this = this
             const tbody = this.$refs.table.$el.querySelector('.el-table__body-wrapper tbody')
-            Sortable.create(tbody, {
+            sortable.create(tbody, {
                 handle: '.move',
                 animation: 300,
                 ghostClass: 'ghost',
diff --git a/src/frontend/admin/src/components/sc-icon-select/index.vue b/src/frontend/admin/src/components/sc-icon-select/index.vue
index 737332a5..54d7fbec 100644
--- a/src/frontend/admin/src/components/sc-icon-select/index.vue
+++ b/src/frontend/admin/src/components/sc-icon-select/index.vue
@@ -48,7 +48,7 @@
 
 <script>
 import config from '@/config/icon-select'
-import { error } from '../../assets/icons'
+import { error } from '@/assets/icon'
 
 export default {
     computed: {
diff --git a/src/frontend/admin/src/components/sc-table/column-setting.vue b/src/frontend/admin/src/components/sc-table/column-setting.vue
index a031769e..a58e9255 100644
--- a/src/frontend/admin/src/components/sc-table/column-setting.vue
+++ b/src/frontend/admin/src/components/sc-table/column-setting.vue
@@ -39,11 +39,11 @@
 </template>
 
 <script>
-import Sortable from 'sortablejs'
+import sortable from 'sortablejs'
 
 export default {
     components: {
-        Sortable,
+        sortable,
     },
     props: {
         column: {
@@ -72,7 +72,7 @@ export default {
         rowDrop() {
             const _this = this
             const tbody = this.$refs.list.querySelector('ul')
-            Sortable.create(tbody, {
+            sortable.create(tbody, {
                 handle: '.move',
                 animation: 300,
                 ghostClass: 'ghost',
diff --git a/src/frontend/admin/src/components/sc-table/index.vue b/src/frontend/admin/src/components/sc-table/index.vue
index 80c4e015..188110ec 100644
--- a/src/frontend/admin/src/components/sc-table/index.vue
+++ b/src/frontend/admin/src/components/sc-table/index.vue
@@ -170,10 +170,13 @@
 </template>
 <script>
 import config from '@/config/table'
-import columnSetting from './column-setting'
-import scContextmenuItem from '@/components/sc-context-menu/item'
-import scContextmenu from '@/components/sc-context-menu'
-import fieldFilter from './field-filter'
+import { defineAsyncComponent } from 'vue'
+
+const columnSetting = defineAsyncComponent(() => import('./column-setting'))
+const scContextmenuItem = defineAsyncComponent(() => import('@/components/sc-context-menu/item'))
+const scContextmenu = defineAsyncComponent(() => import('@/components/sc-context-menu'))
+const fieldFilter = defineAsyncComponent(() => import('./field-filter'))
+
 import { h } from 'vue'
 import tool from '@/utils/tool'
 
diff --git a/src/frontend/admin/src/components/sc-upload/multiple.vue b/src/frontend/admin/src/components/sc-upload/multiple.vue
index 92f1d7aa..aa03b0a2 100644
--- a/src/frontend/admin/src/components/sc-upload/multiple.vue
+++ b/src/frontend/admin/src/components/sc-upload/multiple.vue
@@ -60,7 +60,7 @@
 
 <script>
 import config from '@/config/upload'
-import Sortable from 'sortablejs'
+import sortable from 'sortablejs'
 
 export default {
     props: {
@@ -170,7 +170,7 @@ export default {
         rowDrop() {
             const _this = this
             const itemBox = this.$refs.uploader.$el.querySelector('.el-upload-list')
-            Sortable.create(itemBox, {
+            sortable.create(itemBox, {
                 handle: '.el-upload-list__item',
                 animation: 200,
                 ghostClass: 'ghost',
diff --git a/src/frontend/admin/src/config/file-select.js b/src/frontend/admin/src/config/file-select.js
index 341669d8..7a906845 100644
--- a/src/frontend/admin/src/config/file-select.js
+++ b/src/frontend/admin/src/config/file-select.js
@@ -1,11 +1,11 @@
-import API from '@/api'
-import DEFAULT_CONFIG from '@/config'
+import api from '@/api'
+import defaultConfig from '@/config'
 //文件选择器配置
 
 export default {
-    apiObj: API.common.upload,
-    menuApiObj: API.common.file.menu,
-    listApiObj: API.common.file.list,
+    apiObj: api.common.upload,
+    menuApiObj: api.common.file.menu,
+    listApiObj: api.common.file.list,
     successCode: 200,
     maxSize: 30,
     max: 99,
@@ -43,11 +43,11 @@ export default {
     files: {
         doc: {
             icon: 'sc-icon-file-word-2-fill',
-            color: DEFAULT_CONFIG.APP_SET_COLOR,
+            color: defaultConfig.APP_SET_COLOR,
         },
         docx: {
             icon: 'sc-icon-file-word-2-fill',
-            color: DEFAULT_CONFIG.APP_SET_COLOR,
+            color: defaultConfig.APP_SET_COLOR,
         },
         xls: {
             icon: 'sc-icon-file-excel-2-fill',
diff --git a/src/frontend/admin/src/config/index.js b/src/frontend/admin/src/config/index.js
index 739d7ecd..317319e7 100644
--- a/src/frontend/admin/src/config/index.js
+++ b/src/frontend/admin/src/config/index.js
@@ -1,9 +1,9 @@
-import MY_CONFIG from './my-config'
-import APP_CONFIG from './app-config'
+import myConfig from '@/config/my-config'
+import appConfig from '@/config/app-config'
 import avatar from '@/utils/avatar'
 import tool from '@/utils/tool'
 
-const DEFAULT_CONFIG = {
+const defaultConfig = {
     //标题
     APP_NAME: 'NetAdmin',
 
@@ -81,12 +81,12 @@ const DEFAULT_CONFIG = {
 }
 
 //合并业务配置
-Object.assign(DEFAULT_CONFIG, MY_CONFIG)
+Object.assign(defaultConfig, myConfig)
 
-// 如果生产模式，就合并动态的APP_CONFIG
+// 如果生产模式，就合并动态的appConfig
 // public/config.js
 if (import.meta.env.MODE === 'production' || import.meta.env.MODE === 'test') {
-    Object.assign(DEFAULT_CONFIG, APP_CONFIG)
+    Object.assign(defaultConfig, appConfig)
 }
 
-export default DEFAULT_CONFIG
\ No newline at end of file
+export default defaultConfig
\ No newline at end of file
diff --git a/src/frontend/admin/src/config/upload.js b/src/frontend/admin/src/config/upload.js
index 7cc467de..d5427787 100644
--- a/src/frontend/admin/src/config/upload.js
+++ b/src/frontend/admin/src/config/upload.js
@@ -1,9 +1,9 @@
-import API from '@/api'
+import api from '@/api'
 
 //上传配置
 
 export default {
-    apiObj: API.sys_file.upload, //上传请求API对象
+    apiObj: api.sys_file.upload, //上传请求api对象
     filename: 'file', //form请求时文件的key
     successCode: 'succeed', //请求完成代码
     maxSize: 10, //最大文件大小 默认10MB
@@ -15,6 +15,6 @@ export default {
             msg: res.msg, //分析描述字段结构
         }
     },
-    apiObjFile: API.sys_file.upload, //附件上传请求API对象
+    apiObjFile: api.sys_file.upload, //附件上传请求api对象
     maxSizeFile: 10, //最大文件大小 默认10MB
 }
\ No newline at end of file
diff --git a/src/frontend/admin/src/config/workflow.js b/src/frontend/admin/src/config/workflow.js
index aad283c3..4acac6fd 100644
--- a/src/frontend/admin/src/config/workflow.js
+++ b/src/frontend/admin/src/config/workflow.js
@@ -1,4 +1,4 @@
-import API from '@/api'
+import api from '@/api'
 
 //审批工作流人员/组织选择器配置
 
@@ -8,7 +8,7 @@ export default {
     //配置组织
     group: {
         //请求接口对象
-        apiObj: API.system.dept.list,
+        apiObj: api.system.dept.list,
         //接受数据字段映射
         parseData: function (res) {
             return {
@@ -26,7 +26,7 @@ export default {
     },
     //配置用户
     user: {
-        apiObj: API.demo.page,
+        apiObj: api.demo.page,
         pageSize: 20,
         parseData: function (res) {
             return {
@@ -50,7 +50,7 @@ export default {
     //配置角色
     role: {
         //请求接口对象
-        apiObj: API.system.dept.list,
+        apiObj: api.system.dept.list,
         //接受数据字段映射
         parseData: function (res) {
             return {
diff --git a/src/frontend/admin/src/global.js b/src/frontend/admin/src/global.js
index 568cbdbf..ab603636 100644
--- a/src/frontend/admin/src/global.js
+++ b/src/frontend/admin/src/global.js
@@ -1,7 +1,7 @@
 // noinspection ES6UnusedImports
 
 import * as elIcons from '@element-plus/icons-vue'
-import * as scIcons from '@/assets/icons'
+import * as scIcons from '@/assets/icon'
 import api from '@/api'
 import config from '@/config'
 import errorHandler from '@/utils/error-handler'
@@ -38,7 +38,9 @@ import naColId from '@/components/na-col-id'
 import naColIndicator from '@/components/na-col-indicator'
 import naColOperation from '@/components/na-col-operation'
 import naColUser from '@/components/na-col-user'
+import naIndicator from '@/components/na-indicator'
 import naSearch from '@/components/na-search'
+import naInfo from '@/components/na-info'
 
 export default {
     install(app) {
@@ -75,6 +77,8 @@ export default {
         app.component('naColIndicator', naColIndicator)
         app.component('naColOperation', naColOperation)
         app.component('naColUser', naColUser)
+        app.component('naIndicator', naIndicator)
+        app.component('naInfo', naInfo)
         app.component('naSearch', naSearch)
 
         // sc组件
diff --git a/src/frontend/admin/src/layout/components/side-m.vue b/src/frontend/admin/src/layout/components/side-m.vue
index d74a06e5..2eca7305 100644
--- a/src/frontend/admin/src/layout/components/side-m.vue
+++ b/src/frontend/admin/src/layout/components/side-m.vue
@@ -24,8 +24,9 @@
 </template>
 
 <script>
-import navMenu from './nav-menu'
-import DEFAULT_CONFIG from '@/config'
+import { defineAsyncComponent } from 'vue'
+const navMenu = defineAsyncComponent(() => import('./nav-menu'))
+import defaultConfig from '@/config'
 
 export default {
     components: {
@@ -38,8 +39,8 @@ export default {
         }
     },
     computed: {
-        DEFAULT_CONFIG() {
-            return DEFAULT_CONFIG
+        defaultConfig() {
+            return defaultConfig
         },
     },
     created() {
diff --git a/src/frontend/admin/src/layout/components/tags.vue b/src/frontend/admin/src/layout/components/tags.vue
index d25334a2..ba237b95 100644
--- a/src/frontend/admin/src/layout/components/tags.vue
+++ b/src/frontend/admin/src/layout/components/tags.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import Sortable from 'sortablejs'
+import sortable from 'sortablejs'
 
 export default {
     name: 'tags',
@@ -145,7 +145,7 @@ export default {
         //标签拖拽排序
         tagDrop() {
             const target = this.$refs.tags
-            Sortable.create(target, {
+            sortable.create(target, {
                 draggable: 'li',
                 animation: 300,
             })
diff --git a/src/frontend/admin/src/layout/components/tasks.vue b/src/frontend/admin/src/layout/components/tasks.vue
index f20acd5f..f16a6286 100644
--- a/src/frontend/admin/src/layout/components/tasks.vue
+++ b/src/frontend/admin/src/layout/components/tasks.vue
@@ -119,8 +119,7 @@
 
 <script>
 import { defineAsyncComponent } from 'vue'
-import scPageHeader from '@/components/sc-page-header'
-
+const scPageHeader = defineAsyncComponent(() => import('@/components/sc-page-header'))
 const jobSaveDialog = defineAsyncComponent(() => import('@/views/sys/job/all/save'))
 const jobRecordSaveDialog = defineAsyncComponent(() => import('@/views/sys/job/record/save'))
 
diff --git a/src/frontend/admin/src/layout/components/user-bar.vue b/src/frontend/admin/src/layout/components/user-bar.vue
index 9bf27d36..4b2e7807 100644
--- a/src/frontend/admin/src/layout/components/user-bar.vue
+++ b/src/frontend/admin/src/layout/components/user-bar.vue
@@ -18,7 +18,7 @@
         <div v-auth="'system/job/user-bar'" @click="tasks" class="tasks panel-item">
             <el-badge :hidden="failJobCnt === 0" :value="failJobCnt">
                 <el-icon>
-                    <sc-icon-ScheduledJob />
+                    <sc-icon-scheduled-job />
                 </el-icon>
             </el-badge>
         </div>
@@ -81,9 +81,9 @@
 
 <script>
 import { defineAsyncComponent } from 'vue'
-import avatar from '../../utils/avatar'
-const search = defineAsyncComponent(() => import('./search'))
-const tasks = defineAsyncComponent(() => import('./tasks'))
+import avatar from '@/utils/avatar'
+const search = defineAsyncComponent(() => import('@/layout/components/search'))
+const tasks = defineAsyncComponent(() => import('@/layout/components/tasks'))
 const message = defineAsyncComponent(() => import('@/views/profile/message/components/list'))
 export default {
     components: {
diff --git a/src/frontend/admin/src/layout/index.vue b/src/frontend/admin/src/layout/index.vue
index cd13ac71..b9a8f2e8 100644
--- a/src/frontend/admin/src/layout/index.vue
+++ b/src/frontend/admin/src/layout/index.vue
@@ -217,13 +217,14 @@
 </template>
 
 <script>
-import sideM from './components/side-m'
-import topbar from './components/topbar'
-import tags from './components/tags'
-import navMenu from './components/nav-menu'
-import userBar from './components/user-bar'
-import iframeView from './components/iframe-view'
-import autoExit from './other/auto-exit'
+import { defineAsyncComponent } from 'vue'
+const sideM = defineAsyncComponent(() => import('./components/side-m'))
+const topbar = defineAsyncComponent(() => import('./components/topbar'))
+const tags = defineAsyncComponent(() => import('./components/tags'))
+const navMenu = defineAsyncComponent(() => import('./components/nav-menu'))
+const userBar = defineAsyncComponent(() => import('./components/user-bar'))
+const iframeView = defineAsyncComponent(() => import('./components/iframe-view'))
+const autoExit = defineAsyncComponent(() => import('./other/auto-exit'))
 
 export default {
     name: 'index',
diff --git a/src/frontend/admin/src/locales/index.js b/src/frontend/admin/src/locales/index.js
index 616895dc..7d23e73b 100644
--- a/src/frontend/admin/src/locales/index.js
+++ b/src/frontend/admin/src/locales/index.js
@@ -4,8 +4,8 @@ import { createI18n } from 'vue-i18n'
 import el_zh_cn from 'element-plus/es/locale/lang/zh-cn'
 import el_en from 'element-plus/es/locale/lang/en'
 
-import zh_cn from './lang/zh-cn.js'
-import en from './lang/en.js'
+import zh_cn from '@/locales/lang/zh-cn.js'
+import en from '@/locales/lang/en.js'
 
 const messages = {
     'zh-cn': {
diff --git a/src/frontend/admin/src/main.js b/src/frontend/admin/src/main.js
index c86e6a35..d78e61ac 100644
--- a/src/frontend/admin/src/main.js
+++ b/src/frontend/admin/src/main.js
@@ -1,24 +1,24 @@
 import { createApp } from 'vue'
-import ElementPlus from 'element-plus'
+import elementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import 'element-plus/theme-chalk/display.css'
-import global from './global'
-import i18n from './locales'
-import router from './router'
-import store from './store'
-import App from './app'
+import global from '@/global'
+import i18n from '@/locales'
+import router from '@/router'
+import store from '@/store'
+import app from '@/app'
 import preload from '@/utils/preload'
 import passiveEventListener from '@/utils/passive-event-listener'
 
-const app = createApp(App)
-app.use(ElementPlus)
-app.use(store)
-app.use(i18n)
-app.use(global)
-app.use(passiveEventListener)
+const appInstance = createApp(app)
+appInstance.use(elementPlus)
+appInstance.use(store)
+appInstance.use(i18n)
+appInstance.use(global)
+appInstance.use(passiveEventListener)
 
-preload.install(app).then(() => {
-    app.use(router)
-    //挂载app
-    app.mount('#app')
+preload.install(appInstance).then(() => {
+    appInstance.use(router)
+    //挂载appInstance
+    appInstance.mount('#app')
 })
\ No newline at end of file
diff --git a/src/frontend/admin/src/router/index.js b/src/frontend/admin/src/router/index.js
index 0a1e3dd1..a3f796a9 100644
--- a/src/frontend/admin/src/router/index.js
+++ b/src/frontend/admin/src/router/index.js
@@ -1,17 +1,17 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import { ElNotification } from 'element-plus'
 import config from '@/config'
-import NProgress from 'nprogress'
+import nProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import systemRouter from './system-router'
+import systemRouter from '@/router/system-router'
 import userRoutes from '@/config/route'
-import { afterEach, beforeEach } from './scroll-behavior'
+import { afterEach, beforeEach } from '@/router/scroll-behavior'
 
 // 匹配views里面所有的.vue文件
-const modules = import.meta.glob('./../views/**/*.vue')
+const modules = import.meta.glob('@/views/**/*.vue')
 const otherModules = {
-    404: () => import('../layout/other/404'),
-    empty: () => import('../layout/other/empty'),
+    404: () => import('@/layout/other/404'),
+    empty: () => import('@/layout/other/empty'),
 }
 
 //系统路由
@@ -37,7 +37,7 @@ document.title = config.APP_NAME
 let isGetRouter = false
 
 router.beforeEach(async (to, from, next) => {
-    NProgress.start()
+    nProgress.start()
     //动态标题
     document.title = to.meta.title ? `${to.meta.title} - ${config.APP_NAME}` : `${config.APP_NAME}`
 
@@ -87,11 +87,11 @@ router.beforeEach(async (to, from, next) => {
 
 router.afterEach(async (to, from) => {
     await afterEach(to, from)
-    NProgress.done()
+    nProgress.done()
 })
 
 router.onError((error) => {
-    NProgress.done()
+    nProgress.done()
     ElNotification.error({
         title: '路由错误',
         message: error.message,
diff --git a/src/frontend/admin/src/utils/preload.js b/src/frontend/admin/src/utils/preload.js
index 98c178bc..8ad29b95 100644
--- a/src/frontend/admin/src/utils/preload.js
+++ b/src/frontend/admin/src/utils/preload.js
@@ -1,4 +1,4 @@
-import Api from '@/api'
+import api from '@/api'
 import tool from '@/utils/tool'
 
 export default {
@@ -6,35 +6,35 @@ export default {
         const preloads = await Promise.all([
             (async () => {
                 try {
-                    return await Api.sys_menu.userMenus.post()
+                    return await api.sys_menu.userMenus.post()
                 } catch {
                     //
                 }
             })(),
             (async () => {
                 try {
-                    return await Api.sys_user.userInfo.post()
+                    return await api.sys_user.userInfo.post()
                 } catch {
                     //
                 }
             })(),
             (async () => {
                 try {
-                    return await Api.sys_constant.getEnums.post()
+                    return await api.sys_constant.getEnums.post()
                 } catch {
                     //
                 }
             })(),
             (async () => {
                 try {
-                    return await Api.sys_constant.getNumbers.post()
+                    return await api.sys_constant.getNumbers.post()
                 } catch {
                     //
                 }
             })(),
             (async () => {
                 try {
-                    return await Api.sys_constant.getChars.post()
+                    return await api.sys_constant.getChars.post()
                 } catch {
                     //
                 }
diff --git a/src/frontend/admin/src/utils/tool.js b/src/frontend/admin/src/utils/tool.js
index 8498b4c6..aba61c93 100644
--- a/src/frontend/admin/src/utils/tool.js
+++ b/src/frontend/admin/src/utils/tool.js
@@ -1,4 +1,4 @@
-import CryptoJS from 'crypto-js'
+import cryptoJS from 'crypto-js'
 import sysConfig from '@/config'
 
 import dayjs from 'dayjs'
@@ -430,15 +430,15 @@ tool.crypto = {
 
     //MD5加密
     MD5(data) {
-        return CryptoJS.MD5(data).toString()
+        return cryptoJS.MD5(data).toString()
     },
     //BASE64加解密
     BASE64: {
         encrypt(data) {
-            return CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(data))
+            return cryptoJS.enc.Base64.stringify(cryptoJS.enc.Utf8.parse(data))
         },
         decrypt(cipher) {
-            return CryptoJS.enc.Base64.parse(cipher).toString(CryptoJS.enc.Utf8)
+            return cryptoJS.enc.Base64.parse(cipher).toString(cryptoJS.enc.Utf8)
         },
     },
     //AES加解密
@@ -447,20 +447,20 @@ tool.crypto = {
             if (secretKey.length % 8 !== 0) {
                 console.warn('[error]: 秘钥长度需为8的倍数，否则解密将会失败。')
             }
-            const result = CryptoJS.AES.encrypt(data, CryptoJS.enc.Utf8.parse(secretKey), {
-                iv: CryptoJS.enc.Utf8.parse(config.iv || ''),
-                mode: CryptoJS.mode[config.mode || 'ECB'],
-                padding: CryptoJS.pad[config.padding || 'Pkcs7'],
+            const result = cryptoJS.AES.encrypt(data, cryptoJS.enc.Utf8.parse(secretKey), {
+                iv: cryptoJS.enc.Utf8.parse(config.iv || ''),
+                mode: cryptoJS.mode[config.mode || 'ECB'],
+                padding: cryptoJS.pad[config.padding || 'Pkcs7'],
             })
             return result.toString()
         },
         decrypt(cipher, secretKey, config = {}) {
-            const result = CryptoJS.AES.decrypt(cipher, CryptoJS.enc.Utf8.parse(secretKey), {
-                iv: CryptoJS.enc.Utf8.parse(config.iv || ''),
-                mode: CryptoJS.mode[config.mode || 'ECB'],
-                padding: CryptoJS.pad[config.padding || 'Pkcs7'],
+            const result = cryptoJS.AES.decrypt(cipher, cryptoJS.enc.Utf8.parse(secretKey), {
+                iv: cryptoJS.enc.Utf8.parse(config.iv || ''),
+                mode: cryptoJS.mode[config.mode || 'ECB'],
+                padding: cryptoJS.pad[config.padding || 'Pkcs7'],
             })
-            return CryptoJS.enc.Utf8.stringify(result)
+            return cryptoJS.enc.Utf8.stringify(result)
         },
     },
 }
diff --git a/src/frontend/admin/src/utils/use-tabs.js b/src/frontend/admin/src/utils/use-tabs.js
index dfe1023d..9dde266c 100644
--- a/src/frontend/admin/src/utils/use-tabs.js
+++ b/src/frontend/admin/src/utils/use-tabs.js
@@ -1,5 +1,5 @@
 import { nextTick } from 'vue'
-import NProgress from 'nprogress'
+import nProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import router from '@/router'
 import store from '@/store'
@@ -7,14 +7,14 @@ import store from '@/store'
 export default {
     //刷新标签
     refresh() {
-        NProgress.start()
+        nProgress.start()
         const route = router.currentRoute.value
         store.commit('removeKeepLive', route.name)
         store.commit('setRouteShow', false)
         nextTick(() => {
             store.commit('pushKeepLive', route.name)
             store.commit('setRouteShow', true)
-            NProgress.done()
+            nProgress.done()
         })
     },
     //关闭标签
diff --git a/src/frontend/admin/src/views/guest/components/phone-form.vue b/src/frontend/admin/src/views/guest/components/phone-form.vue
index 9099b8ff..9adac2a0 100644
--- a/src/frontend/admin/src/views/guest/components/phone-form.vue
+++ b/src/frontend/admin/src/views/guest/components/phone-form.vue
@@ -17,7 +17,8 @@
     </el-form>
 </template>
 <script>
-import naFormPhone from '@/components/na-form-phone'
+import { defineAsyncComponent } from 'vue'
+const naFormPhone = defineAsyncComponent(() => import('@/components/na-form-phone'))
 import phoneConfig from '@/config/na-form-phone'
 
 export default {
diff --git a/src/frontend/admin/src/views/guest/login.vue b/src/frontend/admin/src/views/guest/login.vue
index f03bef68..a4c7a60e 100644
--- a/src/frontend/admin/src/views/guest/login.vue
+++ b/src/frontend/admin/src/views/guest/login.vue
@@ -51,8 +51,9 @@
 </template>
 
 <script>
-import passwordForm from './components/password-form'
-import phoneForm from './components/phone-form'
+import { defineAsyncComponent } from 'vue'
+const passwordForm = defineAsyncComponent(() => import('./components/password-form'))
+const phoneForm = defineAsyncComponent(() => import('./components/phone-form'))
 import $CONFIG from '@/config'
 
 export default {
diff --git a/src/frontend/admin/src/views/guest/register.vue b/src/frontend/admin/src/views/guest/register.vue
index 29e7667e..f90251ec 100644
--- a/src/frontend/admin/src/views/guest/register.vue
+++ b/src/frontend/admin/src/views/guest/register.vue
@@ -79,16 +79,19 @@
     </common-page>
 </template>
 <script>
-import commonPage from './components/common-page'
+import { defineAsyncComponent } from 'vue'
+const commonPage = defineAsyncComponent(() => import('@/views/guest/components/common-page'))
+const naFormPhone = defineAsyncComponent(() => import('@/components/na-form-phone'))
+const scPasswordStrength = defineAsyncComponent(() => import('@/components/sc-password-strength'))
 import naFormPassword from '@/config/na-form-password'
-import naFormPhone from '@/components/na-form-phone'
 import phoneConfig from '@/config/na-form-phone'
-import scPasswordStrength from '@/components/sc-password-strength'
 
 export default {
     components: {
         commonPage,
+        naFormPassword,
         naFormPhone,
+        phoneConfig,
         scPasswordStrength,
     },
     data() {
diff --git a/src/frontend/admin/src/views/guest/reset-password.vue b/src/frontend/admin/src/views/guest/reset-password.vue
index cbaa41d6..3ec14c39 100644
--- a/src/frontend/admin/src/views/guest/reset-password.vue
+++ b/src/frontend/admin/src/views/guest/reset-password.vue
@@ -35,11 +35,12 @@
 </template>
 
 <script>
-import commonPage from './components/common-page'
+import { defineAsyncComponent } from 'vue'
+const commonPage = defineAsyncComponent(() => import('@/views/guest/components/common-page'))
+const naFormPhone = defineAsyncComponent(() => import('@/components/na-form-phone'))
+const scPasswordStrength = defineAsyncComponent(() => import('@/components/sc-password-strength'))
 import naFormPassword from '@/config/na-form-password'
-import naFormPhone from '@/components/na-form-phone'
 import phoneConfig from '@/config/na-form-phone'
-import scPasswordStrength from '@/components/sc-password-strength'
 
 export default {
     components: {
diff --git a/src/frontend/admin/src/views/home/index.vue b/src/frontend/admin/src/views/home/index.vue
index 47977aa3..fa8f0a03 100644
--- a/src/frontend/admin/src/views/home/index.vue
+++ b/src/frontend/admin/src/views/home/index.vue
@@ -21,8 +21,8 @@
 <script>
 import { defineAsyncComponent } from 'vue'
 
-const work = defineAsyncComponent(() => import('./work'))
-const widgets = defineAsyncComponent(() => import('./widgets'))
+const work = defineAsyncComponent(() => import('@/views/home/work'))
+const widgets = defineAsyncComponent(() => import('@/views/home/widgets'))
 
 export default {
     components: {
diff --git a/src/frontend/admin/src/views/home/widgets/components/chart-bar-job-record.vue b/src/frontend/admin/src/views/home/widgets/components/chart-bar-job-record.vue
index 8dbe4965..1de7f058 100644
--- a/src/frontend/admin/src/views/home/widgets/components/chart-bar-job-record.vue
+++ b/src/frontend/admin/src/views/home/widgets/components/chart-bar-job-record.vue
@@ -20,7 +20,8 @@
 </template>
 
 <script>
-import ChartBar from '@/views/home/widgets/components/components/chart-bar'
+import { defineAsyncComponent } from 'vue'
+const chartBar = defineAsyncComponent(() => import('./components/chart-bar'))
 import tool from '@/utils/tool'
 
 export default {
@@ -33,7 +34,7 @@ export default {
     icon: 'el-icon-data-line',
     description: '作业趋势(Today)',
     components: {
-        ChartBar,
+        chartBar,
     },
     data() {
         return {}
diff --git a/src/frontend/admin/src/views/home/widgets/components/chart-bar-request.vue b/src/frontend/admin/src/views/home/widgets/components/chart-bar-request.vue
index abbd44b0..6337105b 100644
--- a/src/frontend/admin/src/views/home/widgets/components/chart-bar-request.vue
+++ b/src/frontend/admin/src/views/home/widgets/components/chart-bar-request.vue
@@ -20,7 +20,8 @@
 </template>
 
 <script>
-import ChartBar from '@/views/home/widgets/components/components/chart-bar'
+import { defineAsyncComponent } from 'vue'
+const chartBar = defineAsyncComponent(() => import('./components/chart-bar'))
 import tool from '@/utils/tool'
 
 export default {
@@ -33,7 +34,7 @@ export default {
     icon: 'el-icon-data-line',
     description: '流量趋势(Today)',
     components: {
-        ChartBar,
+        chartBar,
     },
     data() {
         return {}
diff --git a/src/frontend/admin/src/views/home/widgets/components/chart-pie-job-record.vue b/src/frontend/admin/src/views/home/widgets/components/chart-pie-job-record.vue
index 88059e2e..1f47da5c 100644
--- a/src/frontend/admin/src/views/home/widgets/components/chart-pie-job-record.vue
+++ b/src/frontend/admin/src/views/home/widgets/components/chart-pie-job-record.vue
@@ -20,7 +20,8 @@
 </template>
 
 <script>
-import ChartPie from '@/views/home/widgets/components/components/chart-pie'
+import { defineAsyncComponent } from 'vue'
+const chartPie = defineAsyncComponent(() => import('./components/chart-pie'))
 import tool from '@/utils/tool'
 
 export default {
@@ -33,7 +34,7 @@ export default {
     icon: 'el-icon-data-line',
     description: '作业分布(Today)',
     components: {
-        ChartPie,
+        chartPie,
     },
     data() {
         return {}
diff --git a/src/frontend/admin/src/views/home/widgets/components/chart-pie-request.vue b/src/frontend/admin/src/views/home/widgets/components/chart-pie-request.vue
index 3cf620e1..f3522716 100644
--- a/src/frontend/admin/src/views/home/widgets/components/chart-pie-request.vue
+++ b/src/frontend/admin/src/views/home/widgets/components/chart-pie-request.vue
@@ -20,7 +20,8 @@
 </template>
 
 <script>
-import ChartPie from '@/views/home/widgets/components/components/chart-pie'
+import { defineAsyncComponent } from 'vue'
+const chartPie = defineAsyncComponent(() => import('./components/chart-pie'))
 import tool from '@/utils/tool'
 
 export default {
@@ -33,7 +34,7 @@ export default {
     icon: 'el-icon-data-line',
     description: '流量分布(Today)',
     components: {
-        ChartPie,
+        chartPie,
     },
     data() {
         return {}
diff --git a/src/frontend/admin/src/views/home/widgets/components/components/chart-bar.vue b/src/frontend/admin/src/views/home/widgets/components/components/chart-bar.vue
index 93aaa89a..b46c76e7 100644
--- a/src/frontend/admin/src/views/home/widgets/components/components/chart-bar.vue
+++ b/src/frontend/admin/src/views/home/widgets/components/components/chart-bar.vue
@@ -5,7 +5,8 @@
 </template>
 
 <script>
-import scEcharts from '@/components/sc-echarts'
+import { defineAsyncComponent } from 'vue'
+const scEcharts = defineAsyncComponent(() => import('@/components/sc-echarts'))
 
 export default {
     components: {
diff --git a/src/frontend/admin/src/views/home/widgets/components/components/chart-pie.vue b/src/frontend/admin/src/views/home/widgets/components/components/chart-pie.vue
index c79e0a5d..35f2bb43 100644
--- a/src/frontend/admin/src/views/home/widgets/components/components/chart-pie.vue
+++ b/src/frontend/admin/src/views/home/widgets/components/components/chart-pie.vue
@@ -5,7 +5,8 @@
 </template>
 
 <script>
-import scEcharts from '@/components/sc-echarts'
+import { defineAsyncComponent } from 'vue'
+const scEcharts = defineAsyncComponent(() => import('@/components/sc-echarts'))
 
 export default {
     components: {
diff --git a/src/frontend/admin/src/views/home/widgets/index.vue b/src/frontend/admin/src/views/home/widgets/index.vue
index dbcaa899..7496814c 100644
--- a/src/frontend/admin/src/views/home/widgets/index.vue
+++ b/src/frontend/admin/src/views/home/widgets/index.vue
@@ -120,8 +120,9 @@
 <script>
 import draggable from 'vuedraggable'
 import allComps from './components'
-import customLayoutDialog from './dialog/custom-layout-dialog'
-import layout from './components/components/layout'
+import { defineAsyncComponent } from 'vue'
+const customLayoutDialog = defineAsyncComponent(() => import('./dialog/custom-layout-dialog'))
+const layout = defineAsyncComponent(() => import('./components/components/layout'))
 
 export default {
     components: {
diff --git a/src/frontend/admin/src/views/home/work/index.vue b/src/frontend/admin/src/views/home/work/index.vue
index 9d0b7bc1..5cf7fc4c 100644
--- a/src/frontend/admin/src/views/home/work/index.vue
+++ b/src/frontend/admin/src/views/home/work/index.vue
@@ -5,7 +5,8 @@
 </template>
 
 <script>
-import myApp from './components/my-app'
+import { defineAsyncComponent } from 'vue'
+const myApp = defineAsyncComponent(() => import('./components/my-app'))
 
 export default {
     components: {
diff --git a/src/frontend/admin/src/views/profile/account/set-email.vue b/src/frontend/admin/src/views/profile/account/set-email.vue
index 21919960..409b5e50 100644
--- a/src/frontend/admin/src/views/profile/account/set-email.vue
+++ b/src/frontend/admin/src/views/profile/account/set-email.vue
@@ -35,10 +35,10 @@
 </template>
 
 <script>
-import naFormPhone from '@/components/na-form-phone'
+import { defineAsyncComponent } from 'vue'
 import phoneConfig from '@/config/na-form-phone'
 import emailConfig from '@/config/na-form-email'
-import { defineAsyncComponent } from 'vue'
+const naFormPhone = defineAsyncComponent(() => import('@/components/na-form-phone'))
 const naFormEmail = defineAsyncComponent(() => import('@/components/na-form-email'))
 export default {
     components: {
diff --git a/src/frontend/admin/src/views/profile/account/set-mobile.vue b/src/frontend/admin/src/views/profile/account/set-mobile.vue
index 292c5732..35c48dbb 100644
--- a/src/frontend/admin/src/views/profile/account/set-mobile.vue
+++ b/src/frontend/admin/src/views/profile/account/set-mobile.vue
@@ -40,7 +40,8 @@
 </template>
 
 <script>
-import naFormPhone from '@/components/na-form-phone'
+import { defineAsyncComponent } from 'vue'
+const naFormPhone = defineAsyncComponent(() => import('@/components/na-form-phone'))
 import phoneConfig from '@/config/na-form-phone'
 
 export default {
diff --git a/src/frontend/admin/src/views/profile/account/set-password.vue b/src/frontend/admin/src/views/profile/account/set-password.vue
index 3dda8d25..59491773 100644
--- a/src/frontend/admin/src/views/profile/account/set-password.vue
+++ b/src/frontend/admin/src/views/profile/account/set-password.vue
@@ -29,8 +29,9 @@
 </template>
 
 <script>
-import scPasswordStrength from '@/components/sc-password-strength'
-import naFormPassword from '@/config/na-form-password'
+import { defineAsyncComponent } from 'vue'
+const scPasswordStrength = defineAsyncComponent(() => import('@/components/sc-password-strength'))
+const naFormPassword = defineAsyncComponent(() => import('@/config/na-form-password'))
 
 export default {
     components: {
diff --git a/src/frontend/admin/src/views/profile/logs.vue b/src/frontend/admin/src/views/profile/logs.vue
index fdb9c43c..ff30a728 100644
--- a/src/frontend/admin/src/views/profile/logs.vue
+++ b/src/frontend/admin/src/views/profile/logs.vue
@@ -5,10 +5,11 @@
 </template>
 
 <script>
-import LoginLog from '@/views/sys/log/login'
+import { defineAsyncComponent } from 'vue'
+const loginLog = defineAsyncComponent(() => import('@/views/sys/log/login'))
 
 export default {
-    components: { LoginLog },
+    components: { loginLog },
     data() {
         return {}
     },
diff --git a/src/frontend/admin/src/views/profile/message/index.vue b/src/frontend/admin/src/views/profile/message/index.vue
index 5624124e..4d184bd7 100644
--- a/src/frontend/admin/src/views/profile/message/index.vue
+++ b/src/frontend/admin/src/views/profile/message/index.vue
@@ -4,8 +4,8 @@
     </el-card>
 </template>
 <script>
-import list from '@/views/profile/message/components/list'
-
+import { defineAsyncComponent } from 'vue'
+const list = defineAsyncComponent(() => import('./components/list'))
 export default {
     components: {
         list,
diff --git a/src/frontend/admin/src/views/profile/settings.vue b/src/frontend/admin/src/views/profile/settings.vue
index 6910e4e8..8bd2e307 100644
--- a/src/frontend/admin/src/views/profile/settings.vue
+++ b/src/frontend/admin/src/views/profile/settings.vue
@@ -72,12 +72,12 @@
 
 <script>
 import colorTool from '@/utils/color'
-import DEFAULT_CONFIG from '@/config'
+import defaultConfig from '@/config'
 
 export default {
     data() {
         return {
-            colorList: [DEFAULT_CONFIG.APP_SET_COLOR, ...colorTool.colorSets],
+            colorList: [defaultConfig.APP_SET_COLOR, ...colorTool.colorSets],
             config: {
                 layout: this.$TOOL.data.get('APP_SET_LAYOUT') || this.$CONFIG.APP_SET_LAYOUT,
                 menuIsCollapse: this.$TOOL.data.get('APP_SET_MENU_IS_COLLAPSE') || this.$CONFIG.APP_SET_MENU_IS_COLLAPSE,
@@ -85,7 +85,7 @@ export default {
                 layoutTags: this.$TOOL.data.get('APP_SET_MULTI_TAGS') || this.$CONFIG.APP_SET_MULTI_TAGS,
                 lang: this.$TOOL.data.get('APP_SET_LANG') || this.$CONFIG.APP_SET_LANG,
                 dark: this.$TOOL.data.get('APP_SET_DARK') || this.$CONFIG.APP_SET_DARK,
-                colorPrimary: this.$TOOL.data.get('APP_SET_COLOR') || this.$CONFIG.APP_SET_COLOR || DEFAULT_CONFIG.APP_SET_COLOR,
+                colorPrimary: this.$TOOL.data.get('APP_SET_COLOR') || this.$CONFIG.APP_SET_COLOR || defaultConfig.APP_SET_COLOR,
                 autoExit: this.$TOOL.data.get('APP_SET_AUTO_EXIT') || this.$CONFIG.APP_SET_AUTO_EXIT,
             },
         }
@@ -137,8 +137,8 @@ export default {
         },
         'config.colorPrimary'(val) {
             if (!val) {
-                val = DEFAULT_CONFIG.APP_SET_COLOR
-                this.config.colorPrimary = DEFAULT_CONFIG.APP_SET_COLOR
+                val = defaultConfig.APP_SET_COLOR
+                this.config.colorPrimary = defaultConfig.APP_SET_COLOR
             }
             document.documentElement.style.setProperty('--el-color-primary', val)
             for (let i = 1; i <= 9; i++) {
diff --git a/src/frontend/admin/src/views/sys/cache/index.vue b/src/frontend/admin/src/views/sys/cache/index.vue
index 413d8f5c..20d9e1af 100644
--- a/src/frontend/admin/src/views/sys/cache/index.vue
+++ b/src/frontend/admin/src/views/sys/cache/index.vue
@@ -108,12 +108,8 @@
 </template>
 
 <script>
-import naInfo from '@/components/na-info'
-
 export default {
-    components: {
-        naInfo,
-    },
+    components: {},
     data() {
         return {
             selection: [],
diff --git a/src/frontend/admin/src/views/sys/dic/index.vue b/src/frontend/admin/src/views/sys/dic/index.vue
index 2fc6a58d..813608ef 100644
--- a/src/frontend/admin/src/views/sys/dic/index.vue
+++ b/src/frontend/admin/src/views/sys/dic/index.vue
@@ -56,8 +56,7 @@
 
 <script>
 import { defineAsyncComponent } from 'vue'
-import list from './list'
-
+const list = defineAsyncComponent(() => import('./list'))
 const saveDialog = defineAsyncComponent(() => import('./save'))
 export default {
     components: {
diff --git a/src/frontend/admin/src/views/sys/dic/list/save.vue b/src/frontend/admin/src/views/sys/dic/list/save.vue
index 7efe882d..41697fb6 100644
--- a/src/frontend/admin/src/views/sys/dic/list/save.vue
+++ b/src/frontend/admin/src/views/sys/dic/list/save.vue
@@ -38,7 +38,7 @@
 
 <script>
 import { defineAsyncComponent } from 'vue'
-const catalogSelect = defineAsyncComponent(() => import('../components/catalog-select'))
+const catalogSelect = defineAsyncComponent(() => import('@/views/sys/dic/components/catalog-select'))
 export default {
     components: { catalogSelect },
     data() {
diff --git a/src/frontend/admin/src/views/sys/doc/index.vue b/src/frontend/admin/src/views/sys/doc/index.vue
index 4f9a0a2b..3c4db41d 100644
--- a/src/frontend/admin/src/views/sys/doc/index.vue
+++ b/src/frontend/admin/src/views/sys/doc/index.vue
@@ -56,8 +56,7 @@
 
 <script>
 import { defineAsyncComponent } from 'vue'
-import list from './list'
-
+const list = defineAsyncComponent(() => import('./list'))
 const saveDialog = defineAsyncComponent(() => import('./save'))
 export default {
     components: {
diff --git a/src/frontend/admin/src/views/sys/doc/list/save.vue b/src/frontend/admin/src/views/sys/doc/list/save.vue
index a98b9f29..96ae6eb3 100644
--- a/src/frontend/admin/src/views/sys/doc/list/save.vue
+++ b/src/frontend/admin/src/views/sys/doc/list/save.vue
@@ -49,7 +49,7 @@ import { defineAsyncComponent } from 'vue'
 import { AiEditor } from 'aieditor'
 import 'aieditor/dist/style.css'
 import sysConfig from '@/config'
-const catalogSelect = defineAsyncComponent(() => import('../components/catalog-select'))
+const catalogSelect = defineAsyncComponent(() => import('@/views/sys/doc/components/catalog-select'))
 export default {
     components: { catalogSelect },
     data() {
diff --git a/src/frontend/admin/src/views/sys/job/all/index.vue b/src/frontend/admin/src/views/sys/job/all/index.vue
index dc8f8b48..9c9a8327 100644
--- a/src/frontend/admin/src/views/sys/job/all/index.vue
+++ b/src/frontend/admin/src/views/sys/job/all/index.vue
@@ -247,12 +247,10 @@
 import { defineAsyncComponent, h } from 'vue'
 import table from '@/config/table'
 import naColOperation from '@/config/na-col-operation'
-import naIndicator from '@/components/na-indicator'
 
 const saveDialog = defineAsyncComponent(() => import('./save'))
 export default {
     components: {
-        naIndicator,
         saveDialog,
     },
     computed: {
diff --git a/src/frontend/admin/src/views/sys/job/record/index.vue b/src/frontend/admin/src/views/sys/job/record/index.vue
index 77f869d7..345a4474 100644
--- a/src/frontend/admin/src/views/sys/job/record/index.vue
+++ b/src/frontend/admin/src/views/sys/job/record/index.vue
@@ -180,13 +180,11 @@
 import { defineAsyncComponent } from 'vue'
 import table from '@/config/table'
 import naColOperation from '@/config/na-col-operation'
-import naIndicator from '@/components/na-indicator'
 
 const saveDialog = defineAsyncComponent(() => import('./save'))
 const jobDialog = defineAsyncComponent(() => import('@/views/sys/job/all/save'))
 export default {
     components: {
-        naIndicator,
         saveDialog,
         jobDialog,
     },
diff --git a/src/frontend/admin/src/views/sys/log/login/index.vue b/src/frontend/admin/src/views/sys/log/login/index.vue
index 81ace86a..67f95573 100644
--- a/src/frontend/admin/src/views/sys/log/login/index.vue
+++ b/src/frontend/admin/src/views/sys/log/login/index.vue
@@ -151,13 +151,10 @@
 </template>
 
 <script>
-import naInfo from '@/components/na-info'
 import http from '@/utils/request'
 
 export default {
-    components: {
-        naInfo,
-    },
+    components: {},
     computed: {},
     created() {
         if (this.ownerId) {
diff --git a/src/frontend/admin/src/views/sys/log/operation/index.vue b/src/frontend/admin/src/views/sys/log/operation/index.vue
index 42302903..bc9d6bd0 100644
--- a/src/frontend/admin/src/views/sys/log/operation/index.vue
+++ b/src/frontend/admin/src/views/sys/log/operation/index.vue
@@ -224,11 +224,9 @@
 import { defineAsyncComponent } from 'vue'
 import http from '@/utils/request'
 const saveDialog = defineAsyncComponent(() => import('@/views/sys/user/save'))
-import naInfo from '@/components/na-info'
 
 export default {
     components: {
-        naInfo,
         saveDialog,
     },
     computed: {},
diff --git a/src/frontend/admin/src/views/sys/menu/index.vue b/src/frontend/admin/src/views/sys/menu/index.vue
index 10afc0ae..ef3ac8d5 100644
--- a/src/frontend/admin/src/views/sys/menu/index.vue
+++ b/src/frontend/admin/src/views/sys/menu/index.vue
@@ -58,7 +58,8 @@
     </el-container>
 </template>
 <script>
-import save from './save'
+import { defineAsyncComponent } from 'vue'
+const save = defineAsyncComponent(() => import('./save'))
 
 export default {
     components: { save },
diff --git a/src/frontend/admin/src/views/sys/menu/save.vue b/src/frontend/admin/src/views/sys/menu/save.vue
index 49a98f48..6696e4c4 100644
--- a/src/frontend/admin/src/views/sys/menu/save.vue
+++ b/src/frontend/admin/src/views/sys/menu/save.vue
@@ -77,7 +77,8 @@
 </template>
 
 <script>
-import scIconSelect from '@/components/sc-icon-select'
+import { defineAsyncComponent } from 'vue'
+const scIconSelect = defineAsyncComponent(() => import('@/components/sc-icon-select'))
 
 export default {
     components: { scIconSelect },
diff --git a/src/frontend/admin/src/views/sys/msg/save.vue b/src/frontend/admin/src/views/sys/msg/save.vue
index be10b2d0..f8861583 100644
--- a/src/frontend/admin/src/views/sys/msg/save.vue
+++ b/src/frontend/admin/src/views/sys/msg/save.vue
@@ -74,7 +74,7 @@
 <script>
 import { AiEditor } from 'aieditor'
 import 'aieditor/dist/style.css'
-import sysConfig from '../../../config'
+import sysConfig from '@/config'
 import { defineAsyncComponent } from 'vue'
 const naDept = defineAsyncComponent(() => import('@/components/na-dept'))
 const naUserSelect = defineAsyncComponent(() => import('@/components/na-user-select'))
diff --git a/src/frontend/admin/src/views/sys/order/save.vue b/src/frontend/admin/src/views/sys/order/save.vue
index a0d5e4e3..9b534419 100644
--- a/src/frontend/admin/src/views/sys/order/save.vue
+++ b/src/frontend/admin/src/views/sys/order/save.vue
@@ -94,7 +94,7 @@
 </template>
 
 <script>
-import QRCode from 'qrcode-svg'
+import qrCode from 'qrcode-svg'
 
 export default {
     computed: {},
@@ -164,7 +164,7 @@ export default {
                 const res = await this.$API.sys_depositorder.get.post({ id: data.row.id })
                 if (res.data) {
                     Object.assign(this.form, res.data)
-                    this.form.receiptAccountQrCode = new QRCode(this.form.receiptAccount).svg()
+                    this.form.receiptAccountQrCode = new qrCode(this.form.receiptAccount).svg()
                     this.loading = false
                     return this
                 }