m

youxiw2000
1 parent 30fb7566
Showing 4 changed files with 54 additions and 47 deletions
trash-admin/src/main/resources/application-dev.yml
trash-ui/src/layout/index.vue
trash-ui/src/layout/index4.vue → trash-ui/src/layout/index5.vue
trash-ui/src/permission.js
@@ -16,7 +16,7 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    remotePath: http://183.66.242.6:6001 
+    remotePath: http://175.6.47.84:8008
     token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
     #remotePath: http://183.66.242.6:14601
     #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-        <tags-view v-if="needTagsView" />
       <app-main />
-      
-      </div>
-  </div>
 </template>
 <script>
 <template>
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container" />
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <tags-view v-if="needTagsView" />
       <app-main />
+      
+      </div>
+  </div>
 </template>
 <script>
@@ -14,8 +14,15 @@ const whiteList = [&#39;/login&#39;, &#39;/auth-redirect&#39;, &#39;/bind&#39;, &#39;/register&#39;]
 // const whiteList = ['/*']
 router.beforeEach((to, from, next) => {
+  debugger;
   NProgress.start()
   var token = getToken();
+
+  if(token && to.query.token.indexOf(token) == -1){
+      removeToken();
+      token = null;
+  }
+
   if(!token){
     if( to.query.token ){
       loginByToken(to.query.token).then(res=>{
@@ -58,49 +65,49 @@ router.beforeEach((to, from, next) =&gt; {
       }
     }
   }else{
-    /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
-    } else {
-      if (store.getters.roles.length === 0) {
-        store.dispatch('GetInfo').then(res => {
-          // 拉取user_info
-          const roles = res.roles
+      /* has token*/
+      if (to.path === '/login') {
+        next({ path: '/' })
+        NProgress.done()
+      } else {
+        if (store.getters.roles.length === 0) {
+          store.dispatch('GetInfo').then(res => {
+            // 拉取user_info
+            const roles = res.roles
-          setToken(res.token)
+            setToken(res.token)
-          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 => {
-          if( to.query.token ){
-               removeToken();
-                          next({path:to })
-                      }else{
+            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 => {
+            if( to.query.token ){
+                 removeToken();
+                            next({path:to })
+                        }else{
-              store.dispatch('FedLogOut').then(() => {
-                Message.error(err)
-                removeToken();
-                next({ path: '/' })
-              })
-             }
-          })
-      } else {
-        next()
-        // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
-        // if (hasPermission(store.getters.roles, to.meta.roles)) {
-        //   next()
-        // } else {
-        //   next({ path: '/401', replace: true, query: { noGoBack: true }})
-        // }
-        // 可删 ↑
-      }
+                store.dispatch('FedLogOut').then(() => {
+                  Message.error(err)
+                  removeToken();
+                  next({ path: '/' })
+                })
+               }
+            })
+        } else {
+          next()
+          // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
+          // if (hasPermission(store.getters.roles, to.meta.roles)) {
+          //   next()
+          // } else {
+          //   next({ path: '/401', replace: true, query: { noGoBack: true }})
+          // }
+          // 可删 ↑
+        }
   }
   }
 })