Q-ABAB hace 1 año
padre
commit
2b73ebb0c5
Se han modificado 2 ficheros con 41 adiciones y 17 borrados
  1. 16 16
      src/App.vue
  2. 25 1
      src/permission.js

+ 16 - 16
src/App.vue

@@ -13,7 +13,6 @@
 </template>
 
 <script>
-import { getToken } from '@/utils/auth'
 export default {
   data() {
     return {};
@@ -23,26 +22,27 @@ export default {
       window.location.href = "http://10.16.30.130/sso/caslogout.jsp";
 
     },
-    userLogin(){
-      this.ajax.post(this.$store.state.api+'/userLogin',{
-        id:getToken(),
-      }).then(res=>{
-        if(res['data']!="ERROR"){
-          this.$store.commit('update',['userInfo',res['data']])
-        }else{
-          console.error("错误")
-        }
-      }).catch(err=>{
-        console.log(err)
-      })
-    },
+    // userLogin(){
+    //   this.ajax.post(this.$store.state.api+'/userLogin',{
+    //     id:getToken(),
+    //   }).then(res=>{
+    //     if(res['data']!="ERROR"){
+    //       this.$store.commit('update',['userInfo',res['data']])
+    //     }else{
+    //       console.error("错误")
+    //     }
+    //   }).catch(err=>{
+    //     console.log(err)
+    //   })
+    // },
     CleanStorage(){
       sessionStorage.clear()
     }
   },
   mounted(){
-
-    if(getToken())this.userLogin();
+    // console.log(getToken())
+    // console.log(this.$store.state.userInfo.userid)
+    // if(getToken()!=this.$store.state.userInfo.userid)this.userLogin();
     window.addEventListener('beforeunload', this.CleanStorage());
   },
   beforeDestroy(){

+ 25 - 1
src/permission.js

@@ -1,7 +1,23 @@
 import router from '@/router'
+import store from '@/config/config'
 import ajax from '@/api/userApi'
-import { setToken } from '@/utils/auth' // get token from cookie
+import { setToken,getToken } from '@/utils/auth' // get token from cookie
 // eslint-disable-next-line prettier/prettier
+
+function userLogin(){
+  ajax.post(store.state.api+'/userLogin',{
+    id:getToken(),
+  }).then(res=>{
+    if(res['data']!="ERROR"){
+        store.commit('update',['userInfo',res['data']])
+    }else{
+      console.error("错误")
+    }
+  }).catch(err=>{
+    console.log(err)
+  })
+}
+
 router.beforeEach(async(to, from, next) => {
     // set page title
     try {
@@ -10,14 +26,22 @@ router.beforeEach(async(to, from, next) => {
         let data = response.data.replaceAll("\'", "\"")
         if (data && JSON.parse(data).uid) {
             setToken(JSON.parse(data).uid);
+            userLogin();
+            // console.log(111)
             next()
         } else {
             // setToken("201901766");
+            // setToken("201901763");
+            // setToken('1270')
+            // userLogin();
             // next();
             window.location.href = "http://10.16.30.130/sso/caslogin.jsp";
         }
     } catch {
         // setToken("201901766");
+        // setToken("201901763");
+        // setToken('1270')
+        // userLogin();
         // next();
         window.location.href = "http://10.16.30.130/sso/caslogin.jsp";
     }