diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..47bf70b9def4bdda7fd3cb9fdbba9e794c2bfb7f
Binary files /dev/null and b/src/assets/img/logo.png differ
diff --git a/src/main.js b/src/main.js
index 32eb188d903c89e521a18137f8e66d968a603293..19ea87b74a74a59c075bbdbb92ff5568356ef78e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -33,8 +33,7 @@ const store = new Vuex.Store({
 
 //装载vue-router控件 如果开发时 不用动态可直接修改这里 isAsynRount=false
 Vue.use(Router);
-const isAsynRount = store.state.settingModule.asyncRoutes;
-const options = initRouter(isAsynRount);
+const options = initRouter();
 const router = new Router(options);
 
 //装载vue-i18n控件 如果语言优先级 请直接修改这里localeLang和fallbackLang
diff --git a/src/pages/frame/components/header/LayoutTopHeaderLang.vue b/src/pages/frame/components/header/LayoutTopHeaderLang.vue
index 1f3ce65a82ec81876e79ff1f9092a04fac1cec0f..90eede3818fc1b0fdfe19602c8fcdc703b022d0d 100644
--- a/src/pages/frame/components/header/LayoutTopHeaderLang.vue
+++ b/src/pages/frame/components/header/LayoutTopHeaderLang.vue
@@ -1,7 +1,7 @@
 <template>
     <a-dropdown class="lang header-item">
         <div><a-icon type="global" /> {{ langAlias }}</div>
-        <a-menu @click="changeLang" :selected-keys="[lang]" slot="overlay">
+        <a-menu @click="change" :selected-keys="[lang]" slot="overlay">
             <a-menu-item v-for="lang in langList" :key="lang.key">
                 {{ lang.key.toLowerCase() + ' ' + lang.name }}
             </a-menu-item>
@@ -27,10 +27,9 @@ export default {
         },
     },
     methods: {
-        change(langKey) {
-            this.$i18n.locale = langKey;
-            this.lang = langKey;
-            langUtils.set(langKey);
+        change({ key }) {
+            langUtils.set(key);
+            window.location.reload();
         },
     },
 };
diff --git a/src/pages/frame/components/setting/Setting.vue b/src/pages/frame/components/setting/Setting.vue
index e75ee2beb3ae849e8262a836dd9144d21efaaf26..f6622fef9798d29b6c79497e3128e10c106176d1 100644
--- a/src/pages/frame/components/setting/Setting.vue
+++ b/src/pages/frame/components/setting/Setting.vue
@@ -1,44 +1,84 @@
 <template>
     <div class="side-setting">
         <setting-item>
-            <a-button @click="saveSetting" type="primary" icon="save">{{$t('save')}}</a-button>
-            <a-button @click="resetSetting" type="dashed" icon="redo" style="float: right">{{$t('reset')}}</a-button>
+            <a-button @click="saveSetting" type="primary" icon="save">{{ $t('save') }}</a-button>
+            <a-button @click="resetSetting" type="dashed" icon="redo" style="float: right">
+                {{ $t('reset') }}
+            </a-button>
         </setting-item>
         <setting-item :title="$t('theme.title')">
-            <img-checkbox-group @change="values => setTheme({...theme, mode: values[0]})" :default-values="[theme.mode]">
-                <img-checkbox :title="$t('theme.dark')" img="https://gw.alipayobjects.com/zos/rmsportal/LCkqqYNmvBEbokSDscrm.svg" value="dark" />
-                <img-checkbox :title="$t('theme.light')" img="https://gw.alipayobjects.com/zos/rmsportal/jpRkZQMyYRryryPNtyIC.svg" value="light" />
-                <img-checkbox :title="$t('theme.night')" img="https://gw.alipayobjects.com/zos/antfincdn/hmKaLQvmY2/LCkqqYNmvBEbokSDscrm.svg" value="night" />
+            <img-checkbox-group
+                @change="values => setTheme({ ...theme, mode: values[0] })"
+                :default-values="[theme.mode]"
+            >
+                <img-checkbox
+                    :title="$t('theme.dark')"
+                    img="https://gw.alipayobjects.com/zos/rmsportal/LCkqqYNmvBEbokSDscrm.svg"
+                    value="dark"
+                />
+                <img-checkbox
+                    :title="$t('theme.light')"
+                    img="https://gw.alipayobjects.com/zos/rmsportal/jpRkZQMyYRryryPNtyIC.svg"
+                    value="light"
+                />
             </img-checkbox-group>
         </setting-item>
         <setting-item :title="$t('theme.color')">
-            <color-checkbox-group @change="(values, colors) => setTheme({...theme, color: colors[0]})" :defaultValues="[palettes.indexOf(theme.color)]" :multiple="false">
-                <color-checkbox v-for="(color, index) in palettes" :key="index" :color="color" :value="index" />
+            <color-checkbox-group
+                @change="(values, colors) => setTheme({ ...theme, color: colors[0] })"
+                :defaultValues="[palettes.indexOf(theme.color)]"
+                :multiple="false"
+            >
+                <color-checkbox
+                    v-for="(color, index) in palettes"
+                    :key="index"
+                    :color="color"
+                    :value="index"
+                />
             </color-checkbox-group>
         </setting-item>
         <a-divider />
         <setting-item :title="$t('navigate.title')">
             <img-checkbox-group @change="values => setLayout(values[0])" :default-values="[layout]">
-                <img-checkbox :title="$t('navigate.side')" img="https://gw.alipayobjects.com/zos/rmsportal/JopDzEhOqwOjeNTXkoje.svg" value="side" />
-                <img-checkbox :title="$t('navigate.head')" img="https://gw.alipayobjects.com/zos/rmsportal/KDNDBbriJhLwuqMoxcAr.svg" value="head" />
-                <img-checkbox :title="$t('navigate.mix')" img="https://gw.alipayobjects.com/zos/antfincdn/x8Ob%26B8cy8/LCkqqYNmvBEbokSDscrm.svg" value="mix" />
+                <img-checkbox
+                    :title="$t('navigate.side')"
+                    img="https://gw.alipayobjects.com/zos/rmsportal/JopDzEhOqwOjeNTXkoje.svg"
+                    value="side"
+                />
+                <img-checkbox
+                    :title="$t('navigate.head')"
+                    img="https://gw.alipayobjects.com/zos/rmsportal/KDNDBbriJhLwuqMoxcAr.svg"
+                    value="head"
+                />
+                <img-checkbox
+                    :title="$t('navigate.mix')"
+                    img="https://gw.alipayobjects.com/zos/antfincdn/x8Ob%26B8cy8/LCkqqYNmvBEbokSDscrm.svg"
+                    value="mix"
+                />
             </img-checkbox-group>
         </setting-item>
         <setting-item>
             <a-list :split="false">
                 <a-list-item>
-                    {{$t('navigate.content.title')}}
-                    <a-select :getPopupContainer="getPopupContainer" :value="pageWidth" @change="setPageWidth" class="select-item" size="small" slot="actions">
-                        <a-select-option value="fluid">{{$t('navigate.content.fluid')}}</a-select-option>
-                        <a-select-option value="fixed">{{$t('navigate.content.fixed')}}</a-select-option>
+                    {{ $t('navigate.content.title') }}
+                    <a-select
+                        :getPopupContainer="getPopupContainer"
+                        :value="pageWidth"
+                        @change="setPageWidth"
+                        class="select-item"
+                        size="small"
+                        slot="actions"
+                    >
+                        <a-select-option value="fluid">{{ $t('navigate.content.fluid') }}</a-select-option>
+                        <a-select-option value="fixed">{{ $t('navigate.content.fixed') }}</a-select-option>
                     </a-select>
                 </a-list-item>
                 <a-list-item>
-                    {{$t('navigate.fixedHeader')}}
+                    {{ $t('navigate.fixedHeader') }}
                     <a-switch :checked="fixedHeader" slot="actions" size="small" @change="setFixedHeader" />
                 </a-list-item>
                 <a-list-item>
-                    {{$t('navigate.fixedSideBar')}}
+                    {{ $t('navigate.fixedSideBar') }}
                     <a-switch :checked="fixedSideBar" slot="actions" size="small" @change="setFixedSideBar" />
                 </a-list-item>
             </a-list>
@@ -47,11 +87,11 @@
         <setting-item :title="$t('other.title')">
             <a-list :split="false">
                 <a-list-item>
-                    {{$t('other.multiPages')}}
+                    {{ $t('other.multiPages') }}
                     <a-switch :checked="multiPage" slot="actions" size="small" @change="setMultiPage" />
                 </a-list-item>
                 <a-list-item>
-                    {{$t('other.hideSetting')}}
+                    {{ $t('other.hideSetting') }}
                     <a-switch :checked="hideSetting" slot="actions" size="small" @change="setHideSetting" />
                 </a-list-item>
             </a-list>
@@ -60,24 +100,46 @@
         <setting-item :title="$t('animate.title')">
             <a-list :split="false">
                 <a-list-item>
-                    {{$t('animate.disable')}}
-                    <a-switch :checked="animate.disabled" slot="actions" size="small" @change="val => setAnimate({...animate, disabled: val})" />
+                    {{ $t('animate.disable') }}
+                    <a-switch
+                        :checked="animate.disabled"
+                        slot="actions"
+                        size="small"
+                        @change="val => setAnimate({ ...animate, disabled: val })"
+                    />
                 </a-list-item>
                 <a-list-item>
-                    {{$t('animate.effect')}}
-                    <a-select :value="animate.name" :getPopupContainer="getPopupContainer" @change="val => setAnimate({...animate, name: val})" class="select-item" size="small" slot="actions">
-                        <a-select-option :key="index" :value="item.name" v-for="(item, index) in animates">{{item.alias}}</a-select-option>
+                    {{ $t('animate.effect') }}
+                    <a-select
+                        :value="animate.name"
+                        :getPopupContainer="getPopupContainer"
+                        @change="val => setAnimate({ ...animate, name: val })"
+                        class="select-item"
+                        size="small"
+                        slot="actions"
+                    >
+                        <a-select-option :key="index" :value="item.name" v-for="(item, index) in animates">{{
+                            item.alias
+                        }}</a-select-option>
                     </a-select>
                 </a-list-item>
                 <a-list-item>
-                    {{$t('animate.direction')}}
-                    <a-select :value="animate.direction" :getPopupContainer="getPopupContainer" @change="val => setAnimate({...animate, direction: val})" class="select-item" size="small" slot="actions">
-                        <a-select-option :key="index" :value="item" v-for="(item, index) in directions">{{item}}</a-select-option>
+                    {{ $t('animate.direction') }}
+                    <a-select
+                        :value="animate.direction"
+                        :getPopupContainer="getPopupContainer"
+                        @change="val => setAnimate({ ...animate, direction: val })"
+                        class="select-item"
+                        size="small"
+                        slot="actions"
+                    >
+                        <a-select-option :key="index" :value="item" v-for="(item, index) in directions">{{
+                            item
+                        }}</a-select-option>
                     </a-select>
                 </a-list-item>
             </a-list>
         </setting-item>
-
     </div>
 </template>
 
@@ -176,7 +238,7 @@ export default {
     },
     computed: {
         directions() {
-            return this.animates.find((item) => item.name == this.animate.name).directions;
+            return this.animates.find(item => item.name == this.animate.name).directions;
         },
         ...mapState('settingModule', [
             'theme',
@@ -192,7 +254,7 @@ export default {
         ]),
     },
     watch: {
-        'animate.name': function (val) {
+        'animate.name': function(val) {
             this.setAnimate({ name: val, direction: this.directions[0] });
         },
     },
@@ -220,7 +282,7 @@ export default {
             let config = {};
             let mySetting = this.$store.state.settingModule;
             let dftSetting = local ? settingConfig : settingConfig;
-            Object.keys(mySetting).forEach((key) => {
+            Object.keys(mySetting).forEach(key => {
                 const dftValue = dftSetting[key],
                     myValue = mySetting[key];
                 if (dftValue != undefined && !fastEqual(dftValue, myValue)) {
diff --git a/src/pages/frame/layouts/AdminLayout.vue b/src/pages/frame/layouts/AdminLayout.vue
index ad47f973e7b380bfccab2241b7bc0a53eefbcb1c..399547056e24b18bd3379d92943de2f9a4dbd59a 100644
--- a/src/pages/frame/layouts/AdminLayout.vue
+++ b/src/pages/frame/layouts/AdminLayout.vue
@@ -170,6 +170,7 @@ export default {
 
 <style lang="less" scoped>
 .admin-layout {
+    height: 100%;
     .side-menu {
         &.fixed-side {
             position: fixed;
diff --git a/src/pages/frame/view/template/BlankTemplateView.vue b/src/pages/frame/view/template/BlankTemplateView.vue
deleted file mode 100644
index 310611e241b8abee31c7482511877bdd104b0072..0000000000000000000000000000000000000000
--- a/src/pages/frame/view/template/BlankTemplateView.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
-    <router-view />
-</template>
-
-<script>
-import { mapState } from 'vuex';
-
-export default {
-    name: 'BlankTemplateView',
-    computed: {
-        ...mapState('settingModule', ['multiPage']),
-    },
-};
-</script>
diff --git a/src/pages/frame/view/template/index.js b/src/pages/frame/view/template/index.js
index 28e77574e9e824dfd46ad2d1cf2e0653e370ab09..b4816a390a3bf7afe2a0c05485676edd408e1e14 100644
--- a/src/pages/frame/view/template/index.js
+++ b/src/pages/frame/view/template/index.js
@@ -1,5 +1,4 @@
-import BlankTemplateView from './BlankTemplateView';
 import PageTemplateView from './PageTemplateView';
 import TabsTemplateView from './TabsTemplateView';
 
-export { BlankTemplateView, PageTemplateView, TabsTemplateView }
+export { PageTemplateView, TabsTemplateView };
diff --git a/src/pages/home/index.js b/src/pages/home/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..946277db299184a5aa109d588bb8155d84a68690
--- /dev/null
+++ b/src/pages/home/index.js
@@ -0,0 +1,3 @@
+import Home from './index.vue';
+
+export default Home;
diff --git a/src/pages/system/view/log/login_log/index.js b/src/pages/system/view/log/login_log/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..01758dd062c734074a5af1626d474dc54a712e3e
--- /dev/null
+++ b/src/pages/system/view/log/login_log/index.js
@@ -0,0 +1,3 @@
+import LoginLog from './index.vue';
+
+export default LoginLog;
diff --git a/src/pages/system/view/menu/add_com.vue b/src/pages/system/view/menu/add_com.vue
index c6774a1f55f30f5ebca0fa4e527493ceda81485b..437a702acefcccc6dfe7c9d671625c606e771570 100644
--- a/src/pages/system/view/menu/add_com.vue
+++ b/src/pages/system/view/menu/add_com.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <a-button type="primary" class="tw-mb-2" @click="add">新增</a-button>
-        <a-table :dataSource="components" :rowKey="getRowKey">
+        <a-table :dataSource="components" :rowKey="getRowKey" :pagination="false">
             <a-table-column title="组件编码">
                 <template #default="row">
                     <span v-if="row.componentId">{{ row.componentCode }}</span>
diff --git a/src/router/async/config.async.js b/src/router/async/config.async.js
deleted file mode 100644
index 654a2938855b990c19ef013bbfe4c5184480bbae..0000000000000000000000000000000000000000
--- a/src/router/async/config.async.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import routerMap from './router.map'
-import {parseRoutes} from '@/utils/routerUtil'
-
-// 异步路由配置
-const routesConfig = [
-  'login',
-  'root',
-  {
-    router: 'exp404',
-    path: '*',
-    name: '404'
-  },
-  {
-    router: 'exp403',
-    path: '/403',
-    name: '403'
-  }
-]
-
-const options = {
-  routes: parseRoutes(routesConfig, routerMap)
-}
-
-export default options
diff --git a/src/router/async/router.map.js b/src/router/async/router.map.js
deleted file mode 100644
index 3e2f10751e630d7cb1b8d4e089a39f7b3fee1b81..0000000000000000000000000000000000000000
--- a/src/router/async/router.map.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// 视图组件
-const view = {
-    tabs: () => import('@/pages/frame/view/template/TabsTemplateView'),
-    blank: () => import('@/pages/frame/view/template/BlankTemplateView'),
-    page: () => import('@/pages/frame/view/template/PageTemplateView'),
-};
-
-// 路由组件注册
-const routerMap = {
-    login: {
-        authority: '*',
-        path: '/login',
-        component: () => import('@/pages/frame/view/login'),
-    },
-    root: {
-        path: '/',
-        name: '首页',
-        redirect: '/login',
-        component: view.tabs,
-    },
-    exp403: {
-        authority: '*',
-        name: '403错误',
-        path: '403',
-        component: () => import('@/pages/frame/view/exception/403'),
-    },
-    exp404: {
-        name: '404错误',
-        path: '404',
-        component: () => import('@/pages/frame/view/exception/404'),
-    },
-    exp500: {
-        name: '500错误',
-        path: '500',
-        component: () => import('@/pages/frame/view/exception/500'),
-    },
-    dashboard: {
-        name: 'Dashboard',
-        component: view.blank,
-    },
-    workbench: {
-        name: '工作台',
-        component: () => import('@/pages/dashboard/workbench'),
-    },
-    analysis: {
-        name: '分析页',
-        component: () => import('@/pages/dashboard/analysis'),
-    },
-    system_management: {
-        name: '系统管理',
-        component: view.page,
-    },
-    menu_management: {
-        name: '菜单管理',
-        component: () => import('@/pages/system/view/menu'),
-    },
-};
-export default routerMap;
diff --git a/src/router/config.js b/src/router/config.js
index 50ec493f93b22e431f8d12101a29a976f4bb2aaf..6228b3c95eb68dec615ad935fc9e0f23c63b1d66 100644
--- a/src/router/config.js
+++ b/src/router/config.js
@@ -1,4 +1,4 @@
-import { BlankTemplateView, PageTemplateView, TabsTemplateView } from '@/pages/frame/view/template';
+import { PageTemplateView, TabsTemplateView } from '@/pages/frame/view/template';
 
 // 路由配置
 const options = {
@@ -9,11 +9,6 @@ const options = {
             name: '登录页',
             component: () => import('@/pages/frame/view/login'),
         },
-        {
-            path: '*',
-            name: '404',
-            component: () => import('@/pages/frame/view/exception/404'),
-        },
         {
             path: '/403',
             name: '403',
@@ -42,7 +37,6 @@ const options = {
                     meta: {
                         icon: 'dashboard',
                     },
-                    component: BlankTemplateView,
                     children: [
                         {
                             path: 'workbench',
@@ -62,7 +56,7 @@ const options = {
                     ],
                 },
                 {
-                    path: 'system_management',
+                    path: 'system',
                     name: '系统管理',
                     meta: {
                         icon: 'setting',
@@ -73,29 +67,28 @@ const options = {
                     component: PageTemplateView,
                     children: [
                         {
-                            path: 'menu_management',
+                            path: 'menu',
                             name: '菜单管理',
                             component: () => import('@/pages/system/view/menu'),
                         },
                         {
-                            path: 'organization_management',
+                            path: 'organization',
                             name: '组织管理',
-                            component: BlankTemplateView,
                             children: [
                                 {
-                                    path: 'job_management',
+                                    path: 'job',
                                     name: '岗位管理',
                                     component: () =>
                                         import('@/pages/system/view/organization/jobsmanagement/Jobs.vue'),
                                 },
                                 {
-                                    path: 'user_management',
+                                    path: 'user',
                                     name: '用户管理',
                                     component: () =>
                                         import('@/pages/system/view/organization/usermanagement/User.vue'),
                                 },
                                 {
-                                    path: 'org_management',
+                                    path: 'org',
                                     name: '机构管理',
                                     component: () =>
                                         import('@/pages/system/view/organization/orgmanagement/Org.vue'),
@@ -103,23 +96,22 @@ const options = {
                             ],
                         },
                         {
-                            path: 'role_management',
+                            path: 'role',
                             name: '角色管理',
                             component: () => import('@/pages/system/view/role'),
                         },
                         {
-                            path: 'parameter_management',
+                            path: 'parameter',
                             name: '参数管理',
-                            component: BlankTemplateView,
                             children: [
                                 {
-                                    path: 'business_management',
+                                    path: 'business',
                                     name: '业务参数',
                                     component: () =>
                                         import('@/pages/system/view/parameter/business/index.vue'),
                                 },
                                 {
-                                    path: 'operation_management',
+                                    path: 'operation',
                                     name: '运维参数',
                                     component: () =>
                                         import('@/pages/system/view/parameter/operation/index.vue'),
@@ -127,37 +119,41 @@ const options = {
                             ],
                         },
                         {
-                            path: 'log_management',
+                            path: 'log',
                             name: '日志管理',
-                            component: BlankTemplateView,
                             children: [
                                 {
-                                    path: 'login_log',
+                                    path: 'login',
                                     name: '登录日志',
-                                    component: () => import('@/pages/system/view/log/login_log/index.vue'),
+                                    component: () => import('@/pages/system/view/log/login_log'),
                                 },
                                 {
-                                    path: 'operation_log',
+                                    path: 'operation',
                                     name: '操作日志',
                                     component: () => import('@/pages/system/view/log/operation/index.vue'),
                                 },
                             ],
                         },
                         {
-                            path: 'task_management',
+                            path: 'task',
                             name: '任务管理',
                             component: () => import('@/pages/system/view/task/index.vue'),
                         },
                     ],
                 },
                 {
-                    path: 'user_center',
+                    path: 'user',
                     name: '个人中心',
                     meta: { icon: 'user' },
                     component: () => import('@/pages/user/index.vue'),
                 },
             ],
         },
+        {
+            path: '*',
+            name: '404',
+            component: () => import('@/pages/frame/view/exception/404'),
+        },
     ],
 };
 
diff --git a/src/router/index.js b/src/router/index.js
index d0a8df5f6fe10c160a910a3876812e103b7e688f..ce84d89295ed3f45b860561a4c4c342adf4b47d4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,19 +1,18 @@
 import syncConfig from './config';
-import asyncConfig from './async/config.async';
 import { formatRoutes } from '../utils/routerUtil';
 
 // 不需要登录拦截的路由配置
 const loginIgnore = {
-  names: ['404', '403'],      //根据路由名称匹配
-  paths: ['/login'],   //根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes(route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
+    names: ['404', '403'], //根据路由名称匹配
+    paths: ['/login'], //根据路由fullPath匹配
+    /**
+     * 判断路由是否包含在该配置中
+     * @param route vue-router 的 route 对象
+     * @returns {boolean}
+     */
+    includes(route) {
+        return this.names.includes(route.name) || this.paths.includes(route.path);
+    },
 };
 
 /**
@@ -21,11 +20,10 @@ const loginIgnore = {
  * @param isAsync 是否异步路由模式
  * @returns {options.routes}
  */
-function initRouter(isAsync) {
-  const options = isAsync ? asyncConfig : syncConfig;
-  formatRoutes(options.routes);
-  return options;
+function initRouter() {
+    const options = syncConfig;
+    formatRoutes(options.routes);
+    return options;
 }
 
-
-export {loginIgnore , initRouter}
+export { loginIgnore, initRouter };
diff --git a/src/utils/routerUtil.js b/src/utils/routerUtil.js
index 09a9cafa5d80e19b826ec087ccd4ef7d22cef998..e41d82607839805e636ed83f0a1c3930b1b423eb 100644
--- a/src/utils/routerUtil.js
+++ b/src/utils/routerUtil.js
@@ -1,8 +1,5 @@
-import routerMap from "@/router/async/router.map";
-import { mergeI18nFromRoutes } from "@/utils/i18nUtil";
-import Router from "vue-router";
-import deepMerge from "deepmerge";
-import basicOptions from "@/router/async/config.async";
+import { mergeI18nFromRoutes } from '@/utils/i18nUtil';
+import deepMerge from 'deepmerge';
 
 //应用配置
 let appOptions = {
@@ -29,20 +26,20 @@ function setAppOptions(options) {
  */
 function parseRoutes(routesConfig, routerMap) {
     let routes = [];
-    routesConfig.forEach((item) => {
+    routesConfig.forEach(item => {
         // 获取注册在 routerMap 中的 router，初始化 routeCfg
         let router = undefined,
             routeCfg = {};
-        if (typeof item === "string") {
+        if (typeof item === 'string') {
             router = routerMap[item];
             routeCfg = { path: (router && router.path) || item, router: item };
-        } else if (typeof item === "object") {
+        } else if (typeof item === 'object') {
             router = routerMap[item.router];
             routeCfg = item;
         }
         if (!router) {
             console.warn(`can't find register for router ${routeCfg.router}, please register it in advance.`);
-            router = typeof item === "string" ? { path: item, name: item } : item;
+            router = typeof item === 'string' ? { path: item, name: item } : item;
         }
         // 从 router 和 routeCfg 解析路由
         const route = {
@@ -52,7 +49,11 @@ function parseRoutes(routesConfig, routerMap) {
             redirect: routeCfg.redirect || router.redirect,
             meta: {
                 authority:
-                    routeCfg.authority || router.authority || routeCfg.meta?.authority || router.meta?.authority || "*",
+                    routeCfg.authority ||
+                    router.authority ||
+                    routeCfg.meta?.authority ||
+                    router.meta?.authority ||
+                    '*',
                 icon: routeCfg.icon || router.icon || routeCfg.meta?.icon || router.meta?.icon,
                 page: routeCfg.page || router.page || routeCfg.meta?.page || router.meta?.page,
                 link: routeCfg.link || router.link || routeCfg.meta?.link || router.meta?.link,
@@ -74,51 +75,26 @@ function parseRoutes(routesConfig, routerMap) {
  * @param routesConfig {RouteConfig[]} 路由配置
  */
 function loadRoutes(routesConfig) {
-    
     // 应用配置
     const { router, store, i18n } = appOptions;
 
     // 如果 routesConfig 有值，则更新到本地，否则从本地获取
     if (routesConfig) {
-        store.commit("accountModule/setRoutesConfig", routesConfig);
+        store.commit('accountModule/setRoutesConfig', routesConfig);
     } else {
-        routesConfig = store.getters["accountModule/routesConfig"];
-    }
-    // 如果开启了异步路由，则加载异步路由配置
-    const asyncRoutes = store.state.settingModule.asyncRoutes;
-    if (asyncRoutes) {
-        if (routesConfig && routesConfig.length > 0) {
-            const routes = parseRoutes(routesConfig, routerMap);
-            const finalRoutes = mergeRoutes(basicOptions.routes, routes);
-            formatRoutes(finalRoutes);
-            router.options = { ...router.options, routes: finalRoutes };
-            router.matcher = new Router({ ...router.options, routes: [] }).matcher;
-            router.addRoutes(finalRoutes);
-        }
+        routesConfig = store.getters['accountModule/routesConfig'];
     }
+
     // 提取路由国际化数据
     mergeI18nFromRoutes(i18n, router.options.routes);
     // 初始化Admin后台菜单数据
-    const rootRoute = router.options.routes.find((item) => item.path === "/");
+    const rootRoute = router.options.routes.find(item => item.path === '/');
     const menuRoutes = rootRoute && rootRoute.children;
     if (menuRoutes) {
-        store.commit("settingModule/setMenuData", menuRoutes);
+        store.commit('settingModule/setMenuData', menuRoutes);
     }
 }
 
-/**
- * 合并路由
- * @param target {Route[]}
- * @param source {Route[]}
- * @returns {Route[]}
- */
-function mergeRoutes(target, source) {
-    const routesMap = {};
-    target.forEach((item) => (routesMap[item.path] = item));
-    source.forEach((item) => (routesMap[item.path] = item));
-    return Object.values(routesMap);
-}
-
 /**
  * 深度合并路由
  * @param target {Route[]}
@@ -127,9 +103,9 @@ function mergeRoutes(target, source) {
  */
 function deepMergeRoutes(target, source) {
     // 映射路由数组
-    const mapRoutes = (routes) => {
+    const mapRoutes = routes => {
         const routesMap = {};
-        routes.forEach((item) => {
+        routes.forEach(item => {
             routesMap[item.path] = {
                 ...item,
                 children: item.children ? mapRoutes(item.children) : undefined,
@@ -144,8 +120,8 @@ function deepMergeRoutes(target, source) {
     const merge = deepMerge(tarMap, srcMap);
 
     // 转换为 routes 数组
-    const parseRoutesMap = (routesMap) => {
-        return Object.values(routesMap).map((item) => {
+    const parseRoutesMap = routesMap => {
+        return Object.values(routesMap).map(item => {
             if (item.children) {
                 item.children = parseRoutesMap(item.children);
             } else {
@@ -162,10 +138,10 @@ function deepMergeRoutes(target, source) {
  * @param routes 路由配置
  */
 function formatRoutes(routes) {
-    routes.forEach((route) => {
+    routes.forEach(route => {
         const { path } = route;
-        if (!path.startsWith("/") && path !== "*") {
-            route.path = "/" + path;
+        if (!path.startsWith('/') && path !== '*') {
+            route.path = '/' + path;
         }
     });
     formatAuthority(routes);
@@ -177,19 +153,19 @@ function formatRoutes(routes) {
  * @param pAuthorities 父级路由权限配置集合
  */
 function formatAuthority(routes, pAuthorities = []) {
-    routes.forEach((route) => {
+    routes.forEach(route => {
         const meta = route.meta;
-        const defaultAuthority = pAuthorities[pAuthorities.length - 1] || { permission: "*" };
+        const defaultAuthority = pAuthorities[pAuthorities.length - 1] || { permission: '*' };
         if (meta) {
             let authority = {};
             if (!meta.authority) {
                 authority = defaultAuthority;
-            } else if (typeof meta.authority === "string") {
+            } else if (typeof meta.authority === 'string') {
                 authority.permission = meta.authority;
-            } else if (typeof meta.authority === "object") {
+            } else if (typeof meta.authority === 'object') {
                 authority = meta.authority;
                 const { role } = authority;
-                if (typeof role === "string") {
+                if (typeof role === 'string') {
                     authority.role = [role];
                 }
                 if (!authority.permission && !authority.role) {
@@ -214,9 +190,9 @@ function formatAuthority(routes, pAuthorities = []) {
  * @returns {*}
  */
 function getI18nKey(path) {
-    const keys = path.split("/").filter((item) => !item.startsWith(":") && item != "");
-    keys.push("name");
-    return keys.join(".");
+    const keys = path.split('/').filter(item => !item.startsWith(':') && item != '');
+    keys.push('name');
+    return keys.join('.');
 }
 
 /**
@@ -227,13 +203,13 @@ function getI18nKey(path) {
 function loadGuards(guards, options) {
     const { beforeEach, afterEach } = guards;
     const { router } = options;
-    beforeEach.forEach((guard) => {
-        if (guard && typeof guard === "function") {
+    beforeEach.forEach(guard => {
+        if (guard && typeof guard === 'function') {
             router.beforeEach((to, from, next) => guard(to, from, next, options));
         }
     });
-    afterEach.forEach((guard) => {
-        if (guard && typeof guard === "function") {
+    afterEach.forEach(guard => {
+        if (guard && typeof guard === 'function') {
             router.afterEach((to, from) => guard(to, from, options));
         }
     });