路由守卫完善

src/components/ParentView/index.vue

@@ -0,0 +1,3 @@
+<template>
+    <router-view/>
+</template>

src/main.js

@@ -13,7 +13,7 @@ import 'element-ui/lib/theme-chalk/index.css'
 import VueHighlightJS from 'vue-highlightjs'
 import 'highlight.js/styles/atom-one-dark.css'
 // 加载路由
-import './router/index'
+import './router/routers'
 
 //加载权限指令
 import checkPer from '@/utils/permission'
@@ -21,8 +21,6 @@ import checkPer from '@/utils/permission'
 
 
 
-//加载路由
-Vue.use(router)
 // 加载代码高亮
 Vue.use(VueHighlightJS)
 // 加载elementui

src/router/index.js

@@ -7,9 +7,12 @@ import 'nprogress/nprogress.css'
 import {
   getToken
 } from '@/utils/auth'
-// import {
-//   filterAsyncRouter
-// } from '@/store/modules/permission'
+import {
+  filterAsyncRouter
+} from '@/store/modules/permission'
+import {
+  buildMenus
+} from '@/api/system/menu'
 
 
 
@@ -22,18 +25,93 @@ const whiteList = ['/login']
 
 //路由守卫，路由跳转前执行钩子函数 
 //to：目标路由对象
-//from：即将要离开的路由对象
-//next:执行效果依赖
+//from：当前路由
+//next:放行或重载
 router.beforeEach((to, from, next) => {
-  //如果路由标题设置则显示配置标题和目标菜单标题
+  // 如果路由标题设置则显示配置标题和目标菜单标题
   if (to.meta.title) {
     document.title = to.meta.title + '-' + Config.title
   }
+  //加载效果
   NProgress.start()
-  next(`/login?redirect=${to.fullPath}`)
+  //如果已登录过且要跳转的页面是登录页，执行下一次路由守卫
+  if (getToken()) {
+    if (to.path === '/login') {
+      next({
+        path: '/'
+      })
+      NProgress.done()
+    } else {
+      //判断当前用户是否已拉取完用户信息
+      if (store.getters.roles.length === 0) {
+        //拉取user_info
+        store.dispatch('GetInfo').then(() => {
+          //加载动态路由，拉取菜单
+          loadMenus(next, to)
+        }).catch(() => {
+          store.dispatch('LogOut').then(() => {
+            //重新实例化路由对象 避免bug
+            location.reload()
+          })
+        })
+      } else if (store.getters.loadMenus) {
+        store.dispatch('updateLoadMenus')
+        loadMenus(next, to)
+      } else {
+        next()
+      }
+    }
+  } else {
+    //hsa no token
+    //在免登录白名单，直接进入
+    if (whiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
+      //否则全部重定向到登录页面
+      next(`/loginredirect=${to.fullPath}`)
+      NProgress.done()
+    }
+  }
   NProgress.done()
 })
 
-router.afterEach(()=>{
+export const loadMenus = (next, to) => {
+
+  buildMenus().then(res => {
+    const sdata = JSON.parse(JSON.stringify(res))
+    const rdata = JSON.parse(JSON.stringify(res))
+    const sidebarRoutes = filterAsyncRouter()
+  })
+
+  rewriteRoutes.push({
+    path: '*',
+    redirect: '/404',
+    hidden: true
+  })
+
+  //存储路由
+  store.dispatch('GenerateRoutes', rewriteRoutes).then(() => {
+    /*
+     * 在addRoutes()之后第一次访问被添加的路由会白屏，
+     * 这是因为刚刚addRoutes()就立刻访问被添加的路由，
+     * 然而此时addRoutes()没有执行结束，
+     * 因而找不到刚刚被添加的路由导致白屏
+    */
+    router.addRoutes(rewriteRoutes)
+    /*
+    * 确保addRoutes()时动态添加的路由已经被完全加载上去
+    * replace: true只是一个设置信息，
+    * 告诉VUE本次操作后，
+    * 不能通过浏览器后退按钮，返回前一个路由
+    */
+    next({
+      ...to,
+      replace: true
+    })
+  })
+  store.dispatch('SetSidebarRouters', sidebarRoutes)
+}
+
+router.afterEach(() => {
   NProgress.done()
 })

src/router/routers.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+import Config from '@/settings'
 
 
 //加载路由
@@ -28,8 +29,6 @@ export default new Router({
   //修改路由，取消hash的注释改变部署模式
   //mode:'hash',
   mode: 'history',
-  scrollBehavior: () => ({
-    y: 0
-  }),
+  scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap
 })

src/settings.js

@@ -16,4 +16,10 @@ module.exports = {
   //请求超时时间，毫秒（默认2分钟）
   timeout: 1200000,
 
+  //是否显示设置底部信息
+  showFooter: true,
+
+  //底部文字，支持html语法
+  footerTxt:'© 2021 <a href="https://www.aixylib.com" target="_blank">阅行客后台管理系统</a>'
+
 }

src/store/modules/api.js

@@ -0,0 +1,28 @@
+//适配Nginx反向代理
+const baseUrl = process.env.VUE_APP_BASE_API === '/' ? '' : process.env.VUE_APP_BASE_API
+
+//适配API路径
+const api = {
+  state: {
+
+    //部署包上传
+    //deployUploadApi: baseUrl + '/api/deploy/upload',
+
+    //图片上传
+    imagesUplaodApi: baseUrl + '/api/localStorage/pictures',
+
+    //上传图像
+    updateAvatarApi: baseUrl + '/api/users/updateAvatar',
+
+    //文件上传
+    fileUploadApi: baseUrl + '/api/localStorage',
+
+    // swagger
+    swaggerApi: baseUrl + '/swagger-ui.html',
+
+    //基础url
+    baseApi: baseUrl
+  }
+}
+
+export default api

src/store/modules/permission.js

@@ -0,0 +1,86 @@
+import { constantRouterMap } from "@/router/routers";
+import Layout from '@/layout/index'
+import ParentView from '@/components/ParentView'
+
+const permission = {
+  //存放状态
+  state: {
+    routers: constantRouterMap,
+    addRouters: [],
+    sidebarRouters: []
+  },
+  //同步更改状态
+  mutations: {
+    SET_ROUTERS: (state, routers) => {
+      state.addRouters = routers
+      state.routers = constantRouterMap.concat(routers)
+    },
+    SET_SIDEBAR_ROUTERS: (state, routers) => {
+      state.sidebarRouters = constantRouterMap.concat(routers)
+    }
+  },
+  //发送异步请求拿到数据
+  actions: {
+    GenerateRoutes({
+      commit
+    }, asyncRouter) {
+      commit('SET_ROUTERS', asyncRouter)
+    },
+    SetSidebarRouters({
+      commit
+    }, sidebarRouter) {
+      commit('SET_SIDEBAR_ROUTERS', sidebarRouter)
+    }
+  }
+
+}
+
+//遍历后台传来的路由字符串，转换为组件对象
+export const filterAsyncRouter = (routers, isRewrite = false) => {
+  return routers.filter(router => {
+    if (isRewrite && router.children) {
+      router.children = filterChildren(router.children)
+    }
+    if (router.component) {
+      if (router.component === 'Layout') { // Layout组件特殊处理
+        router.component = Layout
+      } else if (router.component === 'ParentView') {
+        router.component = ParentView
+      } else {
+        const component = router.component
+        router.component = loadView(component)
+      }
+    }
+    if (router.children && router.children.length) {
+      router.children = filterAsyncRouter(router.children, router, isRewrite)
+    }
+    return true
+  })
+}
+
+function filterChildren(childrenMap) {
+  var children = []
+  childrenMap.forEach((el, index) => {
+    if (el.children && el.children.length) {
+      if (el.component === 'ParentView') {
+        el.children.forEach(c => {
+          c.path = el.path + '/' + c.path
+          if (c.children && c.children.length) {
+            children = children.concat(filterChildren(c.children, c))
+            return
+          }
+          children.push(c)
+        })
+        return
+      }
+    }
+    children = children.concat(el)
+  })
+  return children
+}
+
+export const loadView = (view) => {
+  return (resolve) => require([`@/views/${view}`], resolve)
+}
+
+export default permission

src/utils/request.js

@@ -7,7 +7,7 @@ import Config from '@/settings'
 import Cookies from "js-cookie"
 
 
-//创建axios 实例
+//二次封装axios,创建axios 实例
 const service = axios.create({
   //api 的 base_url在.env.development有配置
   baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/',

src/views/login.vue

@@ -0,0 +1,240 @@
+<template>
+ <div class="login" :style="'background-image:url('+ Background +');'">
+    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
+      <h3 class="title">
+        阅行集成后台管理
+      </h3>
+      <el-form-item prop="username">
+        <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="password">
+        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="code">
+        <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter.native="handleLogin">
+          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+        </el-input>
+        <div class="login-code">
+          <img :src="codeUrl" @click="getCode">
+        </div>
+      </el-form-item>
+      <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">
+        记住我
+      </el-checkbox>
+      <el-form-item style="width:100%;">
+        <el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
+          <span v-if="!loading">登 录</span>
+          <span v-else>登 录 中...</span>
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <!--  底部  -->
+     <!-- <div v-if="$store.state.settings.showFooter" id="el-login-footer">
+      <span v-html="$store.state.settings.footerTxt" />
+      <span> ⋅ </span>
+      <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">{{ $store.state.settings.caseNumber }}</a>
+    </div> -->
+  </div>
+</template>
+
+<script>
+import { encrypt } from "@/utils/rsaEncrypt";
+import Config from "@/settings";
+import Cookies from "js-cookie";
+import Background from "@/assets/images/background.jpg";
+import { getCodeImg } from '@/api/login'
+
+export default {
+  //输出模块名称
+  name: 'Login',
+  data() {
+    return {
+      //背景图
+      Background: Background,
+      //登录验证码
+      codeUrl: '',
+      //通行证
+      cookiePass: '',
+      //默认登录信息--测试用
+      loginForm: {
+        username: 'admin',
+        password: '123456',
+        rememberMe: false,
+        code: '',
+        uuid: '',
+      },
+      //登录规则
+      loginRules: {
+        username: [
+          { required: true, trigger: 'blur', message: '用户名不能为空' },
+        ],
+        password: [
+          { required: true, trigger: 'blur', message: '密码不能为空' },
+        ],
+        code: [
+          { required: true, trigger: 'change', message: '验证码不能为空' },
+        ],
+      },
+      //加载状态是否显示
+      loading: false,
+      //跳转定向
+      redirect: undefined
+    };
+  },
+  watch: {
+    //监听路由变化
+    $route: {
+      handler: function (route) {
+        this.redirect = route.query && route.query.redirect;
+      },
+      //立即执行handler
+      immediate: true,
+    },
+  },
+  // 使用钩子初始化获取信息
+  created() {
+    //获取验证码
+    this.getCode();
+    //获取用户名密码等 Cookie
+    this.getCookie();
+    // token过期提示
+    this.point();
+  },
+  methods: {
+    //获取验证码方法
+    getCode() {
+      getCodeImg().then((res) => {
+        this.codeUrl = res.img;
+        this.loginForm.uuid = res.uuid;
+      });
+    },
+    //获取Cookie
+    getCookie() {
+      const username = Cookies.get('username');
+      let password = Cookies.get('password');
+      const rememberMe = Cookies.get('rememberMe');
+      // 保存cookie里面的加密后的密码
+      this.cookiePass = password === undefined ? '' : password;
+      password = password === undefined ? this.loginForm.password : password;
+      this.loginForm = {
+        username: username === undefined ? this.loginForm.username : username,
+        password: password,
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+        code: '',
+      };
+    },
+    handleLogin() {
+      this.$refs.loginForm.validate((valid) => {
+        // 获取登录信息
+        const user = {
+          username: this.loginForm.username,
+          password: this.loginForm.password,
+          rememberMe: this.loginForm.rememberMe,
+          code: this.loginForm.code,
+          uuid: this.loginForm.uuid,
+        };
+        //如果cookie通行证不匹配
+        if (user.password !== this.cookiePass) {
+          //把密码进行加密处理
+          user.password = encrypt(user.password);
+        }
+        if (valid) {
+          this.loading = true;
+          if (user.rememberMe) {
+            Cookies.set('username', user.username, {
+              expires: Config.passCookieExpires,
+            });
+            Cookies.set('password', user.password, {
+              expires: Config.passCookieExpires,
+            });
+            Cookies.set('rememberMe', user.rememberMe, {
+              expires: Config.passCookieExpires,
+            });
+          } else {
+            Cookies.remove('username');
+            Cookies.remove('password');
+            Cookies.remove('rememberMe');
+          }
+          this.$store
+            .dispatch('Login', user)
+            .then(() => {
+              this.loading = false;
+              this.$router.push({ path: this.redirect || '/' });
+            })
+            .catch(() => {
+              this.loading = false;
+              this.getCode();
+            });
+        } else {
+          console.log("提交错误！！");
+          return false;
+        }
+      });
+    },
+    point() {
+      const point = Cookies.get('point') !== undefined;
+      if (point) {
+        this.$notify({
+          title: "提示",
+          message: "当前登录状态已过期，请重新登录！",
+          type: "warning",
+          duration: 5000,
+        });
+        Cookies.remove("point");
+      }
+    },
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.login {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  background-size: cover;
+}
+.title {
+  margin: 0 auto 30px auto;
+  text-align: center;
+  color: #707070;
+}
+
+.login-form {
+  border-radius: 6px;
+  background: #ffffff;
+  width: 385px;
+  padding: 25px 25px 5px 25px;
+  .el-input {
+    height: 38px;
+    input {
+      height: 38px;
+    }
+  }
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 2px;
+  }
+}
+.login-tip {
+  font-size: 13px;
+  text-align: center;
+  color: #bfbfbf;
+}
+.login-code {
+  width: 33%;
+  display: inline-block;
+  height: 38px;
+  float: right;
+  img {
+    cursor: pointer;
+    vertical-align: middle;
+  }
+}
+</style>