refactor: pinia整合优化重构

src/permission.ts

@@ -1,39 +1,39 @@
 import router from "@/router";
-import {ElMessage} from "element-plus";
-import { usePermissionStoreHook } from "@/store/modules/permission";
-import { useUserStoreHook } from "@/store/modules/user";
+import { ElMessage } from "element-plus";
+import useStore from "@/store";
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css'
-NProgress.configure({showSpinner: false}) // 进度环显示/隐藏
+NProgress.configure({ showSpinner: false }) // 进度环显示/隐藏
+
 
 // 白名单
 const whiteList = ['/login', '/auth-redirect']
 
 router.beforeEach(async (to, form, next) => {
     NProgress.start()
-
-    const hasToken =useUserStoreHook().token
+    const { user, permission } = useStore()
+    const hasToken = user.token
     if (hasToken) {
         // 如果登录成功，跳转到首页
         if (to.path === '/login') {
-            next({path: '/'})
+            next({ path: '/' })
             NProgress.done()
         } else {
-            const hasGetUserInfo =useUserStoreHook().roles.length > 0
+            const hasGetUserInfo = user.roles.length > 0
             if (hasGetUserInfo) {
                 next()
             } else {
                 try {
-                    await useUserStoreHook().getUserInfo()
-                    const roles =useUserStoreHook().roles
-                    const accessRoutes:any = await usePermissionStoreHook().generateRoutes(roles)
+                    await user.getUserInfo()
+                    const roles = user.roles
+                    const accessRoutes: any = await permission.generateRoutes(roles)
                     accessRoutes.forEach((route: any) => {
                         router.addRoute(route)
                     })
-                    next({...to, replace: true})
+                    next({ ...to, replace: true })
                 } catch (error) {
                     // remove token and go to login page to re-login
-                    await useUserStoreHook().resetToken()
+                    await user.resetToken()
                     ElMessage.error(error as any || 'Has Error')
                     next(`/login?redirect=${to.path}`)
                     NProgress.done()