登录修改06171144

src/axios/filter.js

@@ -78,8 +78,7 @@ axios.interceptors.response.use(function (response) {
     return response;
 }, function (error) {
     tryHideFullScreenLoading();
-    //console.log(error)
-    if(error.response.data.error == 'invalid_token'){  //token失效，弹框提示确认返回login
+    if(error.response.status == 401){  //token失效，弹框提示确认返回login
         //ElementUI.Message.error("用户信息过期，请重新登录");
         if(isInvalid1 == false){
             isInvalid1 = true
@@ -138,8 +137,7 @@ instance.interceptors.response.use(function (response) {
     return response;
 }, function (error) {
     tryHideFullScreenLoading();
-    console.log('网络异常');
-    if(error.response.data.error == 'invalid_token'){  //token失效，弹框提示确认返回login
+    if(error.response.status == 401){  //token失效，弹框提示确认返回login
         if(isInvalid2 == false){
             isInvalid2 = true
             ElementUI.MessageBox.alert('用户信息过期，请重新登陆','提示',{

src/views/login.vue

@@ -90,18 +90,7 @@ export default {
                             }else{
                                 this.$router.push({ path: "/mainPage" });
                             }
-                            // 过期时间前60秒即可发送获取新的token
-                            /*if (toExpiresTime > 60 * 1000) {
-                                tokenTimer = setTimeout(() => {
-                                    this.getRefreshToken();
-                                    clearTimeout(tokenTimer);
-                                    // }, toExpiresTime - 60 * 1000);
-                                }, 15 * 1000);
-                            } else {
-                                this.getRefreshToken();
-                            }
-
-                            this.$message.success("登录成功");*/
+                            
                         } else {
                             this.$message.error(res.message || "登录失败");
                         }
@@ -128,25 +117,7 @@ export default {
                     localStorage.setItem("expiresTime", expiresTime);
 
                     this.$router.push({ path: "/mainPage" });
-                    /*let tokenTimer = null;
-                    let toExpiresTime =
-                        new Date(expiresTime).getTime() - new Date().getTime();
-
-                    if (toExpiresTime > 60 * 1000) {
-                        tokenTimer = setTimeout(() => {
-                            this.i++;
-                            if (this.i >= 10) {
-                                clearTimeout(tokenTimer);
-                                return;
-                            }
-                            this.getRefreshToken();
-                            clearTimeout(tokenTimer);
-                            // }, toExpiresTime - 60 * 1000);
-                            // Bearer 59d5d321-f16c-4412-9177-7f7d1e9180aa
-                        }, 15 * 1000);
-                    } else {
-                        this.getRefreshToken();
-                    }*/
+                    
                 } else {
                     this.$message.error(res.message || "获取refresh_token失败");
                 }

src/views/page/pageMenu.vue

@@ -126,7 +126,7 @@
                             >手动运行项目</el-menu-item
                         >
                     </el-submenu>
-                    <el-submenu index="systemManagement">
+                    <el-submenu :index="menus[5]">
                         <template slot="title">
                             <i class="my-icon-menuF"></i>
                             <span>系统管理</span>
@@ -182,18 +182,17 @@ export default {
         
         this.expiresTime = localStorage.getItem('expiresTime')
         this.toExpiresTime = new Date(this.expiresTime).getTime() - new Date().getTime();
-        console.log(this.toExpiresTime)
+        
         let that = this;
         if(this.toExpiresTime < 5*60*1000){
             this.refreshToken()
         }else{
-            this.tokenTimer = setTimeout(function(){
-                that.refreshToken()
-            }, this.toExpiresTime - 5*60*1000)
+            if(this.toExpiresTime < 24*60*60*1000){   //当过期时间小于一天时才会定时执行，否则会因为过期时间过大无法执行
+                this.tokenTimer = setTimeout(function(){
+                    that.refreshToken()
+                }, this.toExpiresTime - 5*60*1000)
+            }
         }
-        /*if(this.expiresTime && this.toExpiresTime > 0){
-            
-        }*/
     },
     methods: {
         menuFoldHandle(val) {
@@ -245,21 +244,13 @@ export default {
                     if(this.toExpiresTime < 5*60*1000){
                         //this.refreshToken()
                     }else{
-                        this.tokenTimer = setTimeout(function(){
-                            let that = this;
-                            that.refreshToken()
-                        }, this.toExpiresTime - 5*60*1000)
-                    }
-                    /*if(this.expiresTime && this.toExpiresTime > 0){
-                        if(this.toExpiresTime < 5*60*1000){
-                            //this.refreshToken()
-                        }else{
+                        if(this.toExpiresTime < 24*60*60*1000){  
                             this.tokenTimer = setTimeout(function(){
                                 let that = this;
                                 that.refreshToken()
                             }, this.toExpiresTime - 5*60*1000)
                         }
-                    }*/
+                    }
                 }else{
                     if(res.code == 400){  //refreshToken请求返回400则跳回登录页
                         let loginUrl = window.location.origin + '/login'