From 19757a9a495c7b9a4456fb1b18f1771bf81d9572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=B4=E4=B8=9A=E4=BC=9F?= <806724993@qq.com>
Date: Mon, 22 Jan 2024 18:02:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=92=8C=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/axios.ts                              |   3 +
 src/api/http.ts                               |   4 -
 src/api/system/user.ts                        |  10 +
 .../Table/src/hooks/useDataSource.ts          |   1 -
 src/config/website.config.ts                  |  13 ++
 src/enums/httpEnum.ts                         |   1 +
 src/enums/pageEnum.ts                         |  11 +-
 src/enums/storageEnum.ts                      |   4 +-
 src/layout/components/Header/index.vue        |   5 +-
 src/layout/components/Sider/index.vue         |  57 +++++-
 src/router/base.ts                            |  64 ++++---
 src/router/generator.ts                       | 126 +++++++++++++
 src/router/icons.ts                           |   7 +
 src/router/index.ts                           |  48 ++---
 src/router/modules/system.router.ts           |  52 -----
 src/router/router-guards.ts                   | 120 ++++++++++--
 src/store/modules/asyncRoute.ts               | 107 +++++++++++
 src/store/modules/user.ts                     | 106 +++++++++++
 src/styles/index.scss                         |  12 +-
 src/utils/domUtils.ts                         |   6 +-
 src/utils/menu.ts                             |   2 +
 src/utils/router.ts                           |  28 ++-
 src/utils/storage.ts                          | 178 ++++++++++++------
 src/views/login/index.vue                     |  64 +++----
 src/views/redirect/index.vue                  |  22 +++
 25 files changed, 789 insertions(+), 262 deletions(-)
 create mode 100644 src/config/website.config.ts
 create mode 100644 src/router/generator.ts
 create mode 100644 src/router/icons.ts
 delete mode 100644 src/router/modules/system.router.ts
 create mode 100644 src/store/modules/asyncRoute.ts
 create mode 100644 src/store/modules/user.ts
 create mode 100644 src/views/redirect/index.vue

diff --git a/src/api/axios.ts b/src/api/axios.ts
index 5981971..dc33c67 100644
--- a/src/api/axios.ts
+++ b/src/api/axios.ts
@@ -2,6 +2,8 @@ import axios, { AxiosResponse, AxiosRequestConfig } from "axios";
 import { ResultEnum } from "@/enums/httpEnum";
 // import { ErrorPageNameMap } from "@/enums/pageEnum";
 // import { redirectErrorPage } from "@/utils";
+import { storage } from "@/utils";
+import { StorageEnum } from "@/enums/storageEnum";
 
 const axiosInstance = axios.create({
   baseURL: import.meta.env.DEV
@@ -13,6 +15,7 @@ const axiosInstance = axios.create({
 // 请求拦截器
 axiosInstance.interceptors.request.use(
   (config) => {
+    config.headers.Authorization = storage.get(StorageEnum.ZS_ACCESS_TOKEN);
     return config;
   },
   (error: AxiosRequestConfig) => {
diff --git a/src/api/http.ts b/src/api/http.ts
index aefd735..7f8ad14 100644
--- a/src/api/http.ts
+++ b/src/api/http.ts
@@ -17,9 +17,6 @@ export const get = (url: string, params?: object) => {
     url: url,
     method: RequestHttpEnum.GET,
     params: params,
-    headers: {
-      Authorization: "7df1bd95-bf13-4660-a07d-90b8b1b314e8",
-    },
   });
 };
 
@@ -30,7 +27,6 @@ export const post = (url: string, data?: object, headersType?: string) => {
     data: data,
     headers: {
       "Content-Type": headersType || ContentTypeEnum.JSON,
-      Authorization: "7df1bd95-bf13-4660-a07d-90b8b1b314e8",
     },
   });
 };
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c3d2b83..9f66119 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -3,12 +3,22 @@ import { get, post } from "@/api/http";
 const fix = "/user";
 
 const url = {
+  login: `${fix}/login`,
+  userInfo: `${fix}/userInfo`,
   insert: `${fix}/insert`,
   page: `${fix}/page`,
   update: `${fix}/update`,
   delete: `${fix}/delete`,
 };
 
+export const login = (params: Object) => {
+  return post(url.login, params);
+};
+
+export const getUserInfo = () => {
+  return get(url.userInfo);
+};
+
 export const insertUser = (params: Object) => {
   return post(url.insert, params);
 };
diff --git a/src/components/Table/src/hooks/useDataSource.ts b/src/components/Table/src/hooks/useDataSource.ts
index 6794165..8b7a7f2 100644
--- a/src/components/Table/src/hooks/useDataSource.ts
+++ b/src/components/Table/src/hooks/useDataSource.ts
@@ -54,7 +54,6 @@ export function useDataSource(
       const sizeField = APISETTING.sizeField;
       const totalField = APISETTING.totalField;
       const listField = APISETTING.listField;
-      console.log(listField);
 
       const itemCount = APISETTING.countField;
       let pageParams = {};
diff --git a/src/config/website.config.ts b/src/config/website.config.ts
new file mode 100644
index 0000000..c167fbd
--- /dev/null
+++ b/src/config/website.config.ts
@@ -0,0 +1,13 @@
+import logoImage from "@/assets/images/logo.png";
+interface WebsiteConfig {
+  title: string;
+  logo: string;
+  loginImage: string;
+  loginDesc: string;
+}
+export const websiteConfig: WebsiteConfig = Object.freeze({
+  title: "中盛起元基础框架",
+  logo: logoImage,
+  loginImage: logoImage,
+  loginDesc: "中盛起元基础框架",
+});
diff --git a/src/enums/httpEnum.ts b/src/enums/httpEnum.ts
index da1e0ff..469b2f1 100644
--- a/src/enums/httpEnum.ts
+++ b/src/enums/httpEnum.ts
@@ -2,6 +2,7 @@
  * @description: 请求结果集
  */
 export enum ResultEnum {
+  STATUS = 200,
   DATA_SUCCESS = 0,
   SUCCESS = 2000,
   SERVER_ERROR = 500,
diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts
index 7edd7df..986340f 100644
--- a/src/enums/pageEnum.ts
+++ b/src/enums/pageEnum.ts
@@ -1,12 +1,17 @@
 import { ResultEnum } from "@/enums/httpEnum";
 
 export enum PageEnum {
+  // 登录
+  BASE_LOGIN = "/login",
+  BASE_LOGIN_NAME = "lOGIN",
+  //重定向
+  REDIRECT = "/redirect",
+  REDIRECT_NAME = "Redirect",
+  // 首页
+  BASE_HOME = "/system/menu",
   // 错误
   ERROR_PAGE_NAME_403 = "ErrorPage403",
   ERROR_PAGE_NAME_404 = "ErrorPage404",
-  BASE_LOGIN = "/login",
-  REDIRECT = "/redirect",
-  REDIRECT_NAME = "Redirect",
   // ERROR_PAGE_NAME_500 = "ErrorPage500",
 }
 
diff --git a/src/enums/storageEnum.ts b/src/enums/storageEnum.ts
index 14cd505..2a6ede5 100644
--- a/src/enums/storageEnum.ts
+++ b/src/enums/storageEnum.ts
@@ -2,7 +2,9 @@ export enum StorageEnum {
   // 全局设置
   ZS_SYSTEM_SETTING_STORE = "YSTEM_SETTING",
   // token 等信息
-  ZS_ACCESS_TOKEN_STORE = "ACCESS_TOKEN",
+  ZS_ACCESS_TOKEN = "ACCESS_TOKEN",
   // 登录信息
   ZS_LOGIN_INFO_STORE = "LOGIN_INFO",
+  // 当前用户信息
+  ZS_CURRENT_USER = "CURRENT_USER",
 }
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 953e443..f92dd2c 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { UserOutlined } from "@vicons/antd";
-import { logout } from "@/utils";
+import { useUserStore } from "@/store/modules/user";
+const userStore = useUserStore();
 //头像下拉菜单
 const avatarSelect = (key) => {
   switch (key) {
@@ -19,7 +20,7 @@ const avatarOptions = [
 
 // 退出登录
 const doLogout = () => {
-  logout();
+  userStore.logout();
 };
 </script>
 
diff --git a/src/layout/components/Sider/index.vue b/src/layout/components/Sider/index.vue
index efa6402..d73a60f 100644
--- a/src/layout/components/Sider/index.vue
+++ b/src/layout/components/Sider/index.vue
@@ -13,11 +13,12 @@
       <aside>
         <n-space vertical class="sider-top"> 中盛起元基础框架 </n-space>
         <n-menu
-          :options="generatorMenu(asyncRoutes)"
-          :collapsed-width="60"
-          :collapsed-icon-size="22"
+          :options="menus"
+          :collapsed-width="64"
+          :collapsed-icon-size="20"
+          :indent="24"
           :expanded-keys="state.openKeys"
-          :value="currentRoute.meta?.activeMenu"
+          :value="getSelectedKeys"
           @update:value="clickMenuItem"
           @update:expanded-keys="menuExpanded"
         />
@@ -28,8 +29,9 @@
 
 <script setup lang="ts">
 import { useRoute } from "vue-router";
-import { asyncRoutes } from "@/router";
 import { routerTurnByName, generatorMenu } from "@/utils";
+import { useAsyncRouteStore } from "@/store/modules/asyncRoute";
+
 // 当前路由
 const currentRoute = useRoute();
 // 获取当前打开的子菜单
@@ -37,12 +39,49 @@ const matched = currentRoute.matched;
 const getOpenKeys =
   matched && matched.length ? matched.map((item) => item.name) : [];
 
+const asyncRouteStore = useAsyncRouteStore();
+const menus = ref<any[]>([]);
+const selectedKeys = ref<string>(currentRoute.name as string);
+
 const state = reactive({
   openKeys: getOpenKeys,
 });
 
+// 跟随页面路由变化，切换菜单选中状态
+watch(
+  () => currentRoute.fullPath,
+  () => {
+    console.log(123);
+    updateMenu();
+  }
+);
+
+function updateSelectedKeys() {
+  const matched = currentRoute.matched;
+  state.openKeys = matched.map((item) => item.name);
+  const activeMenu: string = (currentRoute.meta?.activeMenu as string) || "";
+  selectedKeys.value = activeMenu
+    ? (activeMenu as string)
+    : (currentRoute.name as string);
+
+  console.log(selectedKeys.value);
+}
+
+function updateMenu() {
+  menus.value = generatorMenu(asyncRouteStore.getMenus);
+  updateSelectedKeys();
+}
+
+const getSelectedKeys = computed(() => {
+  return unref(selectedKeys);
+});
+
 const clickMenuItem = (key: string) => {
-  routerTurnByName(key);
+  if (/http(s)?:/.test(key)) {
+    window.open(key);
+  } else {
+    routerTurnByName(key);
+  }
 };
 
 //展开菜单
@@ -63,7 +102,6 @@ function menuExpanded(openKeys: string[]) {
 function findChildrenLen(key: string) {
   if (!key) return false;
   const subRouteChildren: string[] = [];
-  const menus = generatorMenu(asyncRoutes);
   for (const { children, key } of unref(menus)) {
     if (children && children.length) {
       subRouteChildren.push(key as string);
@@ -72,7 +110,9 @@ function findChildrenLen(key: string) {
   return subRouteChildren.includes(key);
 }
 
-// onMounted(() => {});
+onMounted(() => {
+  updateMenu();
+});
 </script>
 
 <style lang="scss" scoped>
@@ -82,6 +122,5 @@ function findChildrenLen(key: string) {
   align-items: center;
   justify-content: space-between;
   margin-top: 10px;
-  // margin-bottom: 20px;
 }
 </style>
diff --git a/src/router/base.ts b/src/router/base.ts
index 442553c..d65ff9e 100644
--- a/src/router/base.ts
+++ b/src/router/base.ts
@@ -1,12 +1,12 @@
 import { RouteRecordRaw } from "vue-router";
 import type { AppRouteRecordRaw } from "@/router/types";
-import { ErrorPage404, ErrorPage403 } from "@/router/constant";
+import { ErrorPage404, ErrorPage403, Layout } from "@/router/constant";
 import { PageEnum } from "@/enums/pageEnum";
 // import { GoReload } from "@/components/GoReload";
 
 export const LoginRoute: RouteRecordRaw = {
-  path: "/login",
-  name: "Login",
+  path: PageEnum.BASE_LOGIN,
+  name: PageEnum.BASE_LOGIN_NAME,
   component: () => import("@/views/login/index.vue"),
   meta: {
     title: "登录",
@@ -40,14 +40,25 @@ export const HttpErrorPage: RouteRecordRaw[] = [
   // },
 ];
 
-export const ErrorPageRoute: AppRouteRecordRaw = {
+export const ErrorPageRoute: RouteRecordRaw = {
   path: "/:path(.*)*",
   name: "ErrorPage",
-  component: ErrorPage404,
+  component: Layout,
   meta: {
-    title: PageEnum.ERROR_PAGE_NAME_404,
-    hideBreadcrumb: true,
+    title: "ErrorPage",
+    // hideBreadcrumb: true,
   },
+  children: [
+    {
+      path: "/:path(.*)*",
+      name: "ErrorPageSon",
+      component: ErrorPage404,
+      meta: {
+        title: "ErrorPage",
+        // hideBreadcrumb: true,
+      },
+    },
+  ],
 };
 
 // export const ReloadRoute: AppRouteRecordRaw = {
@@ -59,22 +70,23 @@ export const ErrorPageRoute: AppRouteRecordRaw = {
 //   },
 // };
 
-// export const RedirectRoute: AppRouteRecordRaw = {
-//   path: PageEnum.REDIRECT,
-//   name: PageEnum.REDIRECT_NAME,
-//   component: Layout,
-//   meta: {
-//     title: PageEnum.REDIRECT_NAME,
-//   },
-//   children: [
-//     {
-//       path: "/redirect/:path(.*)",
-//       name: PageEnum.REDIRECT_NAME,
-//       component: () => import("@/views/redirect/index.vue"),
-//       meta: {
-//         title: PageEnum.REDIRECT_NAME,
-//         hideBreadcrumb: true,
-//       },
-//     },
-//   ],
-// };
+export const RedirectRoute: AppRouteRecordRaw = {
+  path: PageEnum.REDIRECT,
+  name: PageEnum.REDIRECT_NAME,
+  component: Layout,
+  meta: {
+    title: PageEnum.REDIRECT_NAME,
+    hideBreadcrumb: true,
+  },
+  children: [
+    {
+      path: "/redirect/:path(.*)",
+      name: PageEnum.REDIRECT_NAME,
+      component: () => import("@/views/redirect/index.vue"),
+      meta: {
+        title: PageEnum.REDIRECT_NAME,
+        hideBreadcrumb: true,
+      },
+    },
+  ],
+};
diff --git a/src/router/generator.ts b/src/router/generator.ts
new file mode 100644
index 0000000..64007cf
--- /dev/null
+++ b/src/router/generator.ts
@@ -0,0 +1,126 @@
+import { getMenuTree } from "@/api/system/menu";
+import { constantRouterIcon } from "./icons";
+import { RouteRecordRaw } from "vue-router";
+import { Layout, ParentLayout } from "@/router/constant";
+// import { storage } from "@/utils";
+// import { StorageEnum } from "@/enums/storageEnum";
+import type { AppRouteRecordRaw } from "@/router/types";
+
+const Iframe = () => import("@/views/iframe/index.vue");
+const LayoutMap = new Map<string, () => Promise<typeof import("*.vue")>>();
+
+LayoutMap.set("Layout", Layout);
+LayoutMap.set("iframe", Iframe);
+
+/**
+ * 格式化 后端 结构信息并递归生成层级路由表
+ * @param routerMap
+ * @param parent
+ * @returns {*}
+ */
+export const generateRoutes = (routerMap, parent?): any[] => {
+  return routerMap.map((item) => {
+    const currentRoute: any = {
+      // 路由地址 动态拼接生成如 /dashboard/workplace
+      path: `${(parent && parent.path) ?? ""}/${item.path}`,
+      // 路由名称，建议唯一
+      name: item.name ?? "",
+      key: item.name ?? "",
+      // 该路由对应页面的 组件
+      component: item.component,
+      // meta: 页面标题, 菜单图标, 页面权限(供指令权限用，可去掉)
+      meta: {
+        ...item.meta,
+        label: item.meta.title,
+        icon: constantRouterIcon[item.meta.icon] || null,
+        permissions: item.meta.permissions || null,
+      },
+    };
+
+    // 为了防止出现后端返回结果不规范，处理有可能出现拼接出两个 反斜杠
+    currentRoute.path = currentRoute.path.replace("//", "/");
+    // 重定向
+    item.redirect && (currentRoute.redirect = item.redirect);
+    // 是否有子菜单，并递归处理
+    if (item.children && item.children.length > 0) {
+      //如果未定义 redirect 默认第一个子路由为 redirect
+      !item.redirect &&
+        (currentRoute.redirect = `${item.path}/${item.children[0].path}`);
+      // Recursion
+      currentRoute.children = generateRoutes(item.children, currentRoute);
+    }
+    return currentRoute;
+  });
+};
+
+/**
+ * 动态生成菜单
+ * @returns {Promise<Router>}
+ */
+export const generateDynamicRoutes = async (): Promise<RouteRecordRaw[]> => {
+  const { data } = await getMenuTree();
+  const router = generateRoutes(data);
+  asyncImportRoute(router);
+  return router;
+};
+
+/**
+ * 查找views中对应的组件文件
+ * */
+let viewsModules: Record<string, () => Promise<Recordable>>;
+export const asyncImportRoute = (
+  routes: AppRouteRecordRaw[] | undefined
+): void => {
+  viewsModules = viewsModules || import.meta.glob("../views/**/*.{vue,tsx}");
+
+  if (!routes) return;
+  routes.forEach((item) => {
+    if (!item.component && item.meta?.frameSrc) {
+      item.component = "iframe";
+    }
+    const { component, name } = item;
+
+    const { children } = item;
+    if (component) {
+      const layoutFound = LayoutMap.get(component as string);
+      // console.log(layoutFound, "layoutFound");
+
+      if (layoutFound) {
+        item.component = layoutFound;
+      } else {
+        item.component = dynamicImport(viewsModules, component as string);
+      }
+    } else if (name) {
+      item.component = ParentLayout;
+    }
+
+    children && asyncImportRoute(children);
+  });
+};
+
+/**
+ * 动态导入
+ * */
+export const dynamicImport = (
+  viewsModules: Record<string, () => Promise<Recordable>>,
+  component: string
+) => {
+  const keys = Object.keys(viewsModules);
+  const matchKeys = keys.filter((key) => {
+    let k = key.replace("../views", "");
+
+    const lastIndex = k.lastIndexOf(".");
+    k = k.substring(0, lastIndex);
+    return k === component;
+  });
+  if (matchKeys?.length === 1) {
+    const matchKey = matchKeys[0];
+    return viewsModules[matchKey];
+  }
+  if (matchKeys?.length > 1) {
+    console.warn(
+      "Please do not create `.vue` and `.TSX` files with the same file name in the same hierarchical directory under the views folder. This will cause dynamic introduction failure"
+    );
+    return;
+  }
+};
diff --git a/src/router/icons.ts b/src/router/icons.ts
new file mode 100644
index 0000000..60dfafd
--- /dev/null
+++ b/src/router/icons.ts
@@ -0,0 +1,7 @@
+import { renderIcon } from "@/utils/index";
+import { DashboardOutlined } from "@vicons/antd";
+
+//前端路由图标映射表
+export const constantRouterIcon = {
+  DashboardOutlined: renderIcon(DashboardOutlined),
+};
diff --git a/src/router/index.ts b/src/router/index.ts
index c1d50a0..f6d7a35 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,49 +1,41 @@
 import type { App } from "vue";
 import { createRouter, createWebHashHistory, RouteRecordRaw } from "vue-router";
-
 import { createRouterGuards } from "./router-guards";
-import { HttpErrorPage, LoginRoute, ErrorPageRoute } from "@/router/base";
+import { LoginRoute, RedirectRoute } from "@/router/base";
+// import type { IModuleType } from "./types";
 
-// import modules from "@/router/modules";
-import type { IModuleType } from "./types";
+// const modules = import.meta.glob<IModuleType>("./modules/**/*router.ts", {
+//   eager: true,
+// });
 
-const modules = import.meta.glob<IModuleType>("./modules/**/*router.ts", {
-  eager: true,
-});
+// const routeModuleList: RouteRecordRaw[] = Object.keys(modules).reduce<
+//   RouteRecordRaw[]
+// >((list, key) => {
+//   const mod = modules[key].default ?? {};
+//   const modList = Array.isArray(mod) ? [...mod] : [mod];
+//   return [...list, ...modList];
+// }, []);
 
-const routeModuleList: RouteRecordRaw[] = Object.keys(modules).reduce<
-  RouteRecordRaw[]
->((list, key) => {
-  const mod = modules[key].default ?? {};
-  const modList = Array.isArray(mod) ? [...mod] : [mod];
-  return [...list, ...modList];
-}, []);
+// function sortRoute(a, b) {
+//   return (a.meta?.sort ?? 0) - (b.meta?.sort ?? 0);
+// }
 
-function sortRoute(a, b) {
-  return (a.meta?.sort ?? 0) - (b.meta?.sort ?? 0);
-}
-
-routeModuleList.sort(sortRoute);
+// routeModuleList.sort(sortRoute);
 
 export const RootRoute: RouteRecordRaw = {
   path: "/",
   name: "Root",
-  redirect: "/system",
+  redirect: "/system/menu",
   meta: {
     title: "Root",
   },
 };
 
 //需要验证权限
-export const asyncRoutes = [...routeModuleList];
+export const asyncRoutes = [];
 
-const constantRouter: any[] = [
-  LoginRoute,
-  RootRoute,
-  ...asyncRoutes,
-  ErrorPageRoute,
-  ...HttpErrorPage,
-];
+//普通路由 无需验证权限
+export const constantRouter: any[] = [LoginRoute, RootRoute, RedirectRoute];
 
 /**
  * 创建路由
diff --git a/src/router/modules/system.router.ts b/src/router/modules/system.router.ts
deleted file mode 100644
index 77bd930..0000000
--- a/src/router/modules/system.router.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { RouteRecordRaw } from "vue-router";
-import { Layout } from "@/router/constant";
-import { renderIcon } from "@/utils";
-// import { icons } from "@/plugins";
-import { OptionsSharp } from "@vicons/ionicons5";
-
-// 引入路径
-const importPath = {
-  USER: () => import("@/views/system/user/user.vue"),
-  ROLE: () => import("@/views/system/role/role.vue"),
-  MENU: () => import("@/views/system/menu/menu.vue"),
-};
-
-const systemRoutes: RouteRecordRaw = {
-  path: "/system",
-  name: "System",
-  redirect: "/system/menu",
-  component: Layout,
-  meta: {
-    title: "系统设置",
-    icons: renderIcon(OptionsSharp),
-    sort: 1,
-  },
-  children: [
-    {
-      path: "role",
-      name: "system_role",
-      meta: {
-        title: "角色管理",
-      },
-      component: () => import("@/views/system/role/role.vue"),
-    },
-    {
-      path: "user",
-      name: "system_user",
-      meta: {
-        title: "用户管理",
-      },
-      component: () => import("@/views/system/user/user.vue"),
-    },
-    {
-      path: "menu",
-      name: "system_menu",
-      meta: {
-        title: "菜单管理",
-      },
-      component: importPath["MENU"],
-    },
-  ],
-};
-
-export default systemRoutes;
diff --git a/src/router/router-guards.ts b/src/router/router-guards.ts
index 6f79bf7..ddbfc30 100644
--- a/src/router/router-guards.ts
+++ b/src/router/router-guards.ts
@@ -1,35 +1,123 @@
-import { Router } from "vue-router";
+import { Router, isNavigationFailure } from "vue-router";
+import type { RouteRecordRaw } from "vue-router";
 import { loginCheck } from "@/utils/router";
+import { useUser } from "@/store/modules/user";
+import { useAsyncRoute } from "@/store/modules/asyncRoute";
+import { PageEnum } from "@/enums/pageEnum";
+import { ErrorPageRoute } from "@/router/base";
 
-export function createRouterGuards(router: Router) {
+const LOGIN_PATH = PageEnum.BASE_LOGIN;
+const whitePathList = [LOGIN_PATH]; // 没有重定向白名单
+
+export async function createRouterGuards(router: Router) {
+  const userStore = useUser();
+  const asyncRouteStore = useAsyncRoute();
   // 前置;
   router.beforeEach(async (to, from, next) => {
-    const Loading = window["$loading"];
+    const Loading = window["$loading"] || null;
     Loading && Loading.start();
-    const isErrorPage = router
-      .getRoutes()
-      .findIndex((item) => item.name === to.name);
-    if (isErrorPage === -1) {
-      next({ name: "ErrorPage404" });
+
+    if (from.path === LOGIN_PATH && to.name === "errorPage") {
+      next(PageEnum.BASE_HOME);
+      return;
+    }
+
+    if (whitePathList.includes(to.path as PageEnum)) {
+      next();
+      return;
     }
 
     if (!loginCheck()) {
-      if (to.name === "Login") {
+      // 不需要登录鉴权的路由
+      if (to.meta.ignoreAuth) {
         next();
+        return;
       }
-      next({ name: "Login" });
+      // 重定向到登录页
+      const redirectData: {
+        path: string;
+        replace: boolean;
+        query?: Recordable<string>;
+      } = {
+        path: LOGIN_PATH,
+        replace: true,
+      };
+
+      if (to.path) {
+        redirectData.query = {
+          ...redirectData.query,
+          redirect: to.path,
+        };
+      }
+
+      next(redirectData);
+      return;
     }
 
-    next();
-  });
+    if (asyncRouteStore.getIsDynamicRouteAdded) {
+      next();
+      return;
+    }
 
-  router.afterEach((to) => {
-    const Loading = window["$loading"];
-    document.title = (to?.meta?.title as string) || document.title;
+    await userStore.getInfo();
+    const routes = await asyncRouteStore.generateRoutes();
+
+    // 动态添加可访问路由表
+    routes.forEach((item: unknown) => {
+      router.addRoute(item as unknown as RouteRecordRaw);
+    });
+
+    //添加404
+    const isErrorPage = router
+      .getRoutes()
+      .findIndex((item) => item.name === ErrorPageRoute.name);
+
+    if (isErrorPage === -1) {
+      router.addRoute(ErrorPageRoute as unknown as RouteRecordRaw);
+    }
+
+    const redirectPath = (from.query.redirect || to.path) as string;
+
+    const redirect = decodeURIComponent(redirectPath);
+    const nextData =
+      to.path === redirect ? { ...to, replace: true } : { path: redirect };
+    asyncRouteStore.setDynamicRouteAdded(true);
+    next(nextData);
+    Loading && Loading.finish();
+  });
+
+  router.afterEach((to, _, failure) => {
+    document.title = (to?.meta?.title as string) || document.title;
+    if (isNavigationFailure(failure)) {
+      console.log("导航失败", failure);
+    }
+    const asyncRouteStore = useAsyncRoute();
+    // 在这里设置需要缓存的组件名称
+    const keepAliveComponents = asyncRouteStore.keepAliveComponents;
+    const currentComName: any = to.matched.find(
+      (item) => item.name == to.name
+    )?.name;
+    if (
+      currentComName &&
+      !keepAliveComponents.includes(currentComName) &&
+      to.meta?.keepAlive
+    ) {
+      // 需要缓存的组件
+      keepAliveComponents.push(currentComName);
+    } else if (!to.meta?.keepAlive || to.name == "Redirect") {
+      // 不需要缓存的组件
+      const index = asyncRouteStore.keepAliveComponents.findIndex(
+        (name) => name == currentComName
+      );
+      if (index != -1) {
+        keepAliveComponents.splice(index, 1);
+      }
+    }
+    asyncRouteStore.setKeepAliveComponents(keepAliveComponents);
+    const Loading = window["$loading"] || null;
     Loading && Loading.finish();
   });
 
-  // 错误
   router.onError((error) => {
     console.log(error, "路由错误");
   });
diff --git a/src/store/modules/asyncRoute.ts b/src/store/modules/asyncRoute.ts
new file mode 100644
index 0000000..8371c5d
--- /dev/null
+++ b/src/store/modules/asyncRoute.ts
@@ -0,0 +1,107 @@
+import { defineStore } from "pinia";
+import { RouteRecordRaw } from "vue-router";
+import { store } from "@/store";
+import { asyncRoutes, constantRouter } from "@/router/index";
+import { generateDynamicRoutes } from "@/router/generator";
+
+interface TreeHelperConfig {
+  id: string;
+  children: string;
+  pid: string;
+}
+
+const DEFAULT_CONFIG: TreeHelperConfig = {
+  id: "id",
+  children: "children",
+  pid: "pid",
+};
+
+const getConfig = (config: Partial<TreeHelperConfig>) =>
+  Object.assign({}, DEFAULT_CONFIG, config);
+
+export interface IAsyncRouteState {
+  menus: RouteRecordRaw[];
+  routers: any[];
+  routersAdded: any[];
+  keepAliveComponents: string[];
+  isDynamicRouteAdded: boolean;
+}
+
+function filter<T = any>(
+  tree: T[],
+  func: (n: T) => boolean,
+  config: Partial<TreeHelperConfig> = {}
+): T[] {
+  config = getConfig(config);
+  const children = config.children as string;
+
+  function listFilter(list: T[]) {
+    return list
+      .map((node: any) => ({ ...node }))
+      .filter((node) => {
+        node[children] = node[children] && listFilter(node[children]);
+        return func(node) || (node[children] && node[children].length);
+      });
+  }
+
+  return listFilter(tree);
+}
+
+export const useAsyncRouteStore = defineStore({
+  id: "app-async-route",
+  state: (): IAsyncRouteState => ({
+    menus: [],
+    routers: constantRouter,
+    routersAdded: [],
+    keepAliveComponents: [],
+    // Whether the route has been dynamically added
+    isDynamicRouteAdded: false,
+  }),
+  getters: {
+    getMenus(): RouteRecordRaw[] {
+      return this.menus;
+    },
+    getIsDynamicRouteAdded(): boolean {
+      return this.isDynamicRouteAdded;
+    },
+  },
+  actions: {
+    getRouters() {
+      return toRaw(this.routersAdded);
+    },
+    setDynamicRouteAdded(added: boolean) {
+      this.isDynamicRouteAdded = added;
+    },
+    // 设置动态路由
+    setRouters(routers: RouteRecordRaw[]) {
+      this.routersAdded = routers;
+      this.routers = constantRouter.concat(routers);
+    },
+    setMenus(menus: RouteRecordRaw[]) {
+      // 设置动态路由
+      this.menus = menus;
+    },
+    setKeepAliveComponents(compNames: string[]) {
+      // 设置需要缓存的组件
+      this.keepAliveComponents = compNames;
+    },
+    async generateRoutes() {
+      let accessedRouters;
+      // 动态获取菜单
+      try {
+        accessedRouters = await generateDynamicRoutes();
+      } catch (error) {
+        console.log(error);
+      }
+      // accessedRouters = accessedRouters.filter(routeFilter);
+      this.setRouters(accessedRouters);
+      this.setMenus(accessedRouters);
+      return toRaw(accessedRouters);
+    },
+  },
+});
+
+// Need to be used outside the setup
+export function useAsyncRoute() {
+  return useAsyncRouteStore(store);
+}
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
new file mode 100644
index 0000000..2a97cfc
--- /dev/null
+++ b/src/store/modules/user.ts
@@ -0,0 +1,106 @@
+import { defineStore } from "pinia";
+import { store } from "@/store";
+import { StorageEnum } from "@/enums/storageEnum";
+import { ResultEnum } from "@/enums/httpEnum";
+import { storage, routerTurnByName } from "@/utils";
+import { login, getUserInfo } from "@/api/system/user";
+import { PageEnum } from "@/enums/pageEnum";
+export type UserInfoType = {
+  // TODO: add your own data
+  name: string;
+  email: string;
+};
+
+export interface IUserState {
+  token: string;
+  username: string;
+  welcome: string;
+  avatar: string;
+  permissions: any[];
+  info: UserInfoType;
+}
+
+export const useUserStore = defineStore({
+  id: "app-user",
+  state: (): IUserState => ({
+    token: storage.get(StorageEnum.ZS_ACCESS_TOKEN, ""),
+    username: "",
+    welcome: "",
+    avatar: "",
+    permissions: [],
+    info: storage.get(StorageEnum.ZS_CURRENT_USER, {}),
+  }),
+  getters: {
+    getToken(): string {
+      return this.token;
+    },
+    getAvatar(): string {
+      return this.avatar;
+    },
+    getNickname(): string {
+      return this.username;
+    },
+    getPermissions(): [any][] {
+      return this.permissions;
+    },
+    getUserInfo(): UserInfoType {
+      return this.info;
+    },
+  },
+  actions: {
+    setToken(token: string) {
+      this.token = token;
+    },
+    setAvatar(avatar: string) {
+      this.avatar = avatar;
+    },
+    setPermissions(permissions) {
+      this.permissions = permissions;
+    },
+    setUserInfo(info: UserInfoType) {
+      this.info = info;
+    },
+    // 登录
+    async login(params: any) {
+      const res = await login(params);
+      const { data } = res;
+      if (res.status === ResultEnum.STATUS) {
+        const ex = 7 * 24 * 60 * 60;
+        storage.set(StorageEnum.ZS_ACCESS_TOKEN, data, ex);
+        this.setToken(data);
+        // this.setUserInfo(result);
+      }
+      return res;
+    },
+
+    // 获取用户信息
+    async getInfo() {
+      const { data } = await getUserInfo();
+      console.log(data, "用户信息");
+
+      // if (result.permissions && result.permissions.length) {
+      // const permissionsList = result.permissions;
+      // this.setPermissions(permissionsList);
+      this.setUserInfo(data);
+      // } else {
+      //   throw new Error("getInfo: permissionsList must be a non-null array !");
+      // }
+      this.setAvatar(data.avatar);
+      return data;
+    },
+
+    // 登出
+    async logout() {
+      this.setPermissions([]);
+      this.setUserInfo({ name: "", email: "" });
+      storage.remove(StorageEnum.ZS_ACCESS_TOKEN);
+      storage.remove(StorageEnum.ZS_CURRENT_USER);
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME);
+    },
+  },
+});
+
+// Need to be used outside the setup
+export function useUser() {
+  return useUserStore(store);
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9a86fe5..94c86e0 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -22,12 +22,10 @@
       width: 10px;
       height: 22px;
       content: "";
-      background: linear-gradient(
-        90deg,
-        #3db8ff 0%,
-        rgb(53 138 225 / 77%) 52%,
-        #3db8ff 100%
-      );
+      background: linear-gradient(90deg,
+          #3db8ff 0%,
+          rgb(53 138 225 / 77%) 52%,
+          #3db8ff 100%);
     }
   }
 }
@@ -47,4 +45,4 @@
 ::-webkit-scrollbar-thumb {
   background: rgb(123 157 213 / 50%);
   border-radius: 4px;
-}
+}
\ No newline at end of file
diff --git a/src/utils/domUtils.ts b/src/utils/domUtils.ts
index 94e5f8f..a74cd47 100644
--- a/src/utils/domUtils.ts
+++ b/src/utils/domUtils.ts
@@ -152,7 +152,7 @@ export function on(
 export function off(
   element: Element | HTMLElement | Document | Window,
   event: string,
-  handler: Fn
+  handler: any
 ): void {
   if (element && event && handler) {
     element.removeEventListener(event, handler, false);
@@ -161,9 +161,9 @@ export function off(
 
 /* istanbul ignore next */
 export function once(el: HTMLElement, event: string, fn: EventListener): void {
-  const listener = function (this: any, ...args: unknown[]) {
+  const listener: EventListener = function (this: any, evt: Event) {
     if (fn) {
-      fn.apply(this, args);
+      fn.call(this, evt);
     }
     off(el, event, listener);
   };
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index a8b2f19..01889d9 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -38,11 +38,13 @@ export function generatorMenu(routerMap: Array<any>) {
       key: info.name,
       icon: isRoot ? item.meta?.icons : info.meta?.icons,
     };
+
     // 是否有子菜单，并递归处理
     if (info.children && info.children.length > 0) {
       // Recursion
       currentMenu.children = generatorMenu(info.children);
     }
+
     return currentMenu;
   });
 }
diff --git a/src/utils/router.ts b/src/utils/router.ts
index a909c44..d83a159 100644
--- a/src/utils/router.ts
+++ b/src/utils/router.ts
@@ -1,9 +1,10 @@
 import router from "@/router";
 import { ResultEnum } from "@/enums/httpEnum";
 import { ErrorPageNameMap } from "@/enums/pageEnum";
-import { clearLocalStorage, getLocalStorage } from "./storage";
-import { StorageEnum } from "@/enums/storageEnum";
 import { cryptoDecode } from "./crypto";
+import { StorageEnum } from "@/enums/storageEnum";
+import { storage } from "@/utils/storage";
+
 /**
  * * 根据名字跳转路由
  * @param pageName
@@ -73,23 +74,16 @@ export const openNewWindow = (url: string) => {
  */
 export const loginCheck = () => {
   try {
-    const info = getLocalStorage(StorageEnum.ZS_LOGIN_INFO_STORE);
-    if (!info) return false;
-    const decodeInfo = cryptoDecode(info);
+    const token = storage.get(StorageEnum.ZS_ACCESS_TOKEN);
 
-    if (decodeInfo) {
-      return true;
-    }
-    return false;
+    if (token) return true;
+    // const decodeInfo = cryptoDecode(info);
+
+    // if (decodeInfo) {
+    //   return true;
+    // }
+    // return false;
   } catch (error) {
     return false;
   }
 };
-
-/**
- * * 退出
- */
-export const logout = () => {
-  clearLocalStorage(StorageEnum.ZS_LOGIN_INFO_STORE);
-  routerTurnByName("Login");
-};
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index 88bac14..15f8170 100644
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -1,70 +1,128 @@
+// 默认缓存期限为7天
+const DEFAULT_CACHE_TIME = 60 * 60 * 24 * 7;
+
 /**
- * * 存储本地会话数据
- * @param k 键名
- * @param v 键值（无需stringiiy）
- * @returns RemovableRef
+ * 创建本地缓存对象
+ * @param {string=} prefixKey -
+ * @param {Object} [storage=localStorage] - sessionStorage | localStorage
  */
-export const setLocalStorage = <T>(k: string, v: T) => {
-  try {
-    window.localStorage.setItem(k, JSON.stringify(v));
-  } catch (error) {
-    return false;
+
+export default class Storage {
+  private storage: globalThis.Storage;
+  private prefixKey?: string;
+
+  constructor(prefixKey = "", storage = localStorage) {
+    this.storage = storage;
+    this.prefixKey = prefixKey;
   }
-};
 
-/**
- * * 获取本地会话数据
- * @param k 键名
- * @returns any
- */
-export const getLocalStorage = (k: string) => {
-  const item = window.localStorage.getItem(k);
-  try {
-    return item ? JSON.parse(item) : item;
-  } catch (err) {
-    return item;
+  private getKey(key: string) {
+    return `${this.prefixKey}${key}`.toUpperCase();
   }
-};
 
-/**
- * * 清除本地会话数据
- * @param name
- */
-export const clearLocalStorage = (name: string) => {
-  window.localStorage.removeItem(name);
-};
-
-/**
- * * 存储临时会话数据
- * @param k 键名
- * @param v 键值
- * @returns RemovableRef
- */
-export const setSessionStorage = <T>(k: string, v: T) => {
-  try {
-    window.sessionStorage.setItem(k, JSON.stringify(v));
-  } catch (error) {
-    return false;
+  /**
+   * @description 设置缓存
+   * @param {string} key 缓存键
+   * @param {*} value 缓存值
+   * @param expire
+   */
+  set(key: string, value: any, expire: number | null = DEFAULT_CACHE_TIME) {
+    const stringData = JSON.stringify({
+      value,
+      expire: expire !== null ? new Date().getTime() + expire * 1000 : null,
+    });
+    this.storage.setItem(this.getKey(key), stringData);
   }
-};
 
-/**
- * * 获取临时会话数据
- * @returns any
- */
-export const getSessionStorage: (k: string) => any = (k: string) => {
-  const item = window.sessionStorage.getItem(k);
-  try {
-    return item ? JSON.parse(item) : item;
-  } catch (err) {
-    return item;
+  /**
+   * 读取缓存
+   * @param {string} key 缓存键
+   * @param {*=} def 默认值
+   */
+  get(key: string, def: any = null) {
+    const item = this.storage.getItem(this.getKey(key));
+    if (item) {
+      try {
+        const data = JSON.parse(item);
+        const { value, expire } = data;
+        // 在有效期内直接返回
+        if (expire === null || expire >= Date.now()) {
+          return value;
+        }
+        this.remove(key);
+      } catch (e) {
+        return def;
+      }
+    }
+    return def;
   }
-};
 
-/**
- * * 清除本地会话数据
- * @param name
- */
-export const clearSessioStorage = (name: string) => {
-  window.sessionStorage.removeItem(name);
-};
+  /**
+   * 从缓存删除某项
+   * @param {string} key
+   */
+  remove(key: string) {
+    this.storage.removeItem(this.getKey(key));
+  }
+
+  /**
+   * 清空所有缓存
+   * @memberOf Cache
+   */
+  clear(): void {
+    this.storage.clear();
+  }
+
+  /**
+   * 设置cookie
+   * @param {string} name cookie 名称
+   * @param {*} value cookie 值
+   * @param {number=} expire 过期时间
+   * 如果过期时间未设置，默认关闭浏览器自动删除
+   * @example
+   */
+  setCookie(
+    name: string,
+    value: any,
+    expire: number | null = DEFAULT_CACHE_TIME
+  ) {
+    document.cookie = `${this.getKey(name)}=${value}; Max-Age=${expire}`;
+  }
+
+  /**
+   * 根据名字获取cookie值
+   * @param name
+   */
+  getCookie(name: string): string {
+    const cookieArr = document.cookie.split("; ");
+    for (let i = 0, length = cookieArr.length; i < length; i++) {
+      const kv = cookieArr[i].split("=");
+      if (kv[0] === this.getKey(name)) {
+        return kv[1];
+      }
+    }
+    return "";
+  }
+
+  /**
+   * 根据名字删除指定的cookie
+   * @param {string} key
+   */
+  removeCookie(key: string) {
+    this.setCookie(key, 1, -1);
+  }
+
+  /**
+   * 清空cookie，使所有cookie失效
+   */
+  clearCookie(): void {
+    const keys = document.cookie.match(/[^ =;]+(?==)/g);
+    if (keys) {
+      for (let i = keys.length; i--; ) {
+        document.cookie = keys[i] + "=0;expire=" + new Date(0).toUTCString();
+      }
+    }
+  }
+}
+
+export const storage = new Storage("");
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e3d449d..cffec91 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -61,12 +61,19 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from "vue";
 import { PersonOutline, LockClosedOutline } from "@vicons/ionicons5";
-import logoImage from "@/assets/images/logo.png";
-import { routerTurnByName, cryptoEncode, setLocalStorage } from "@/utils";
-import { StorageEnum } from "@/enums/storageEnum";
-const { ZS_LOGIN_INFO_STORE } = StorageEnum;
+import { useUserStore } from "@/store/modules/user";
+// import { routerTurnByName, cryptoEncode } from "@/utils";
+// import { StorageEnum } from "@/enums/storageEnum";
+import { ResultEnum } from "@/enums/httpEnum";
+import { PageEnum } from "@/enums/pageEnum";
+import { useRoute, useRouter } from "vue-router";
+import { websiteConfig } from "@/config/website.config";
+const userStore = useUserStore();
+const router = useRouter();
+
+const route = useRoute();
+
 interface FormState {
   username: string;
   password: string;
@@ -77,7 +84,7 @@ const loading = ref(false);
 
 const formInline = reactive({
   username: "admin",
-  password: "zsqy123",
+  password: "123456",
   isCaptcha: true,
 });
 
@@ -86,16 +93,9 @@ const rules = {
   password: { required: true, message: "请输入密码", trigger: "blur" },
 };
 
-const websiteConfig = {
-  title: "中盛起元基础框架",
-  logo: logoImage,
-  loginImage: logoImage,
-  loginDesc: "中盛起元基础框架",
-};
-
-const handleSubmit = (e: any) => {
+const handleSubmit = (e) => {
   e.preventDefault();
-  formRef.value.validate(async (errors: any) => {
+  formRef.value.validate(async (errors) => {
     if (!errors) {
       const { username, password } = formInline;
       window["$message"].loading("登录中...");
@@ -106,27 +106,25 @@ const handleSubmit = (e: any) => {
         password,
       };
 
-      if (params.username === "admin" && params.password === "zsqy123") {
-        window["$message"].success("登录成功，即将进入系统");
-        setLocalStorage(
-          ZS_LOGIN_INFO_STORE,
-          cryptoEncode(
-            JSON.stringify({
-              username,
-              password,
-            })
-          )
-        );
-        setTimeout(() => {
-          routerTurnByName("Root", true);
-        }, 3000);
-      } else {
+      try {
+        const { status } = await userStore.login(params);
+        window["$message"].destroyAll();
+        if (status == ResultEnum.STATUS) {
+          const toPath = decodeURIComponent(
+            (route.query?.redirect || "/") as string
+          );
+          window["$message"].success("登录成功，即将进入系统");
+          if (route.name === PageEnum.BASE_LOGIN_NAME) {
+            router.replace("/");
+          } else router.replace(toPath);
+        } else {
+          window["$message"].info("登录失败");
+        }
+      } finally {
         loading.value = false;
-        window["$message"].error("用户名或密码错误");
       }
     } else {
-      loading.value = false;
-      window["$message"].error("用户名或密码错误");
+      window["$message"].error("请填写完整信息，并且进行验证码校验");
     }
   });
 };
diff --git a/src/views/redirect/index.vue b/src/views/redirect/index.vue
new file mode 100644
index 0000000..4b1e6a3
--- /dev/null
+++ b/src/views/redirect/index.vue
@@ -0,0 +1,22 @@
+<script lang="tsx">
+import { defineComponent, onBeforeMount } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import { NEmpty } from "naive-ui";
+
+export default defineComponent({
+  name: "Redirect",
+  setup() {
+    const route = useRoute();
+    const router = useRouter();
+    onBeforeMount(() => {
+      const { params, query } = route;
+      const { path } = params;
+      router.replace({
+        path: "/" + (Array.isArray(path) ? path.join("/") : path),
+        query,
+      });
+    });
+    return () => <NEmpty />;
+  },
+});
+</script>