liyangzheng 2 年之前
父节点
当前提交
60b7a9a6be
共有 3 个文件被更改,包括 14 次插入13 次删除
  1. 1 1
      src/layout/components/SideBar/UserIcon.vue
  2. 12 7
      src/utils/request.js
  3. 1 5
      src/views/login/Login.vue

+ 1 - 1
src/layout/components/SideBar/UserIcon.vue

@@ -96,8 +96,8 @@ export default {
       this.fmtTime = formatDate(time).split(' ')
     },
     async outUser() {
-      console.log(1);
       localStorage.removeItem('userInfo')
+      localStorage.removeItem('userToken')
       let res = await loginOut({sessionid:this.userToken})
       if(res ==='ok'){
         this.$router.push("/login")

+ 12 - 7
src/utils/request.js

@@ -2,7 +2,8 @@ import axios from 'axios'
 import md5 from 'js-md5'
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth'
-
+import vue from "vue"
+import router from '@/router'
 // 请求url
 const service = axios.create({
   // baseURL: window.STATIC_CONFIG.proxyUrl, // url = base url + request url
@@ -61,7 +62,7 @@ service.interceptors.request.use(
   error => {
     // do something with request error
     console.log('请求前拦截error=', error) // for debug
-    return Promise.reject(error)
+    // return Promise.reject(error)
   }
 )
 
@@ -72,11 +73,15 @@ service.interceptors.response.use(
     return res
   },
   error => {
-    console.log('request.js err=', error) // for debug
-    console.log('request.js err.response=', error.response) // for debug
-    // if (error.response.data) {
-    //   error.response.data.message = error.response.data.message || '未知错误'
-    // }
+    if (error.response.status===401) {
+      Message({
+        message:"登陆已过期,请重新登录",
+        type:"error"
+      })
+      router.push("login")
+      localStorage.removeItem('userInfo')
+      localStorage.removeItem('userToken')
+    }
     // Message({
     //   message: '' + error.response.data.message,
     //   type: 'error',

+ 1 - 5
src/views/login/Login.vue

@@ -65,12 +65,7 @@ export default {
             if (this.form.username != '' && this.form.password != "") {
                 if (!this.userBlur && !this.passBlur) {
                     const wordType = this.encryptPassword(this.form.password)
-                    // console.log(100);
                     let res = await login({ login_account: this.form.username, pwd: wordType })
-                    // console.log(105);
-                    // this.$router.push("/")
-                    // localStorage.setItem('userInfo', JSON.stringify(res.data))
-                    // this.rememberUser = false
                     if (res.returncode == 200) {
                         this.$message({
                             type: "success",
@@ -78,6 +73,7 @@ export default {
                         })
                         this.$router.push("/")
                         localStorage.setItem('userInfo', JSON.stringify(res.data))
+                        localStorage.setItem('userToken', JSON.stringify(res.data.sessionid))
                         this.rememberUser = false
                     } else if (res.returncode == 500) {
                         console.log(500);