From 88aff5d8a7c3543deb7f043e22697c9e7be946f6 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 15 Dec 2020 10:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8Epush=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0catch=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/permission.js   | 14 ++------------
 ruoyi-ui/src/views/login.vue | 15 ++++++---------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index 17e5b3d5..2c0b1cfb 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -23,28 +23,18 @@ router.beforeEach((to, from, next) => {
           // 拉取user_info
           const roles = res.roles
           store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
-          // 测试 默认静态页面
-          // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
             // 根据roles权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
           })
-        })
-          .catch(err => {
-            store.dispatch('FedLogOut').then(() => {
+        }).catch(err => {
+            store.dispatch('LogOut').then(() => {
               Message.error(err)
               next({ path: '/' })
             })
           })
       } else {
         next()
-        // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
-        // if (hasPermission(store.getters.roles, to.meta.roles)) {
-        //   next()
-        // } else {
-        //   next({ path: '/401', replace: true, query: { noGoBack: true }})
-        // }
-        // 可删 ↑
       }
     }
   } else {
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 574ca0b8..6b2139ea 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -126,15 +126,12 @@ export default {
             Cookies.remove("password");
             Cookies.remove('rememberMe');
           }
-          this.$store
-            .dispatch("Login", this.loginForm)
-            .then(() => {
-              this.$router.push({ path: this.redirect || "/" });
-            })
-            .catch(() => {
-              this.loading = false;
-              this.getCode();
-            });
+          this.$store.dispatch("Login", this.loginForm).then(() => {
+            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+          }).catch(() => {
+            this.loading = false;
+            this.getCode();
+          });
         }
       });
     }
-- 
GitLab