diff --git a/src/Login.vue b/src/Login.vue
index 19619264..8455effb 100644
--- a/src/Login.vue
+++ b/src/Login.vue
@@ -77,7 +77,7 @@ export default {
             if (!this.$_.isEmpty(res.data.theme)) {
               localStorage.setItem(storageKey.theme, res.data.theme)
             }
-            res.loginSuccessPath = this.loginSuccessPath
+            res.loginSuccessPath = this.loginSuccessPath ? this.loginSuccessPath : localStorage.getItem(storageKey.tokenExpireCurrentPath)
             this.loginSuccess(res)
             localStorage.setItem(storageKey.username, this.username)
           } else if (res.code === 518005) {
diff --git a/src/permission.js b/src/permission.js
index 5648abfa..b728ae09 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -11,6 +11,9 @@ const loginWhiteList = ['/login', '/'] // 免登陆白名单
 const permissionWhiteList = [...loginWhiteList, '/entityDetail'] // 权限白名单
 
 router.beforeEach(async (to, from, next) => {
+  if (to.path.indexOf('/login') == -1) {
+    localStorage.setItem(storageKey.tokenExpireCurrentPath, to.fullPath)
+  }
   // 加载iso-3166-2资源
   loadGeoData()
   // 加载baseUrl
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 470e8fea..55b4e4d8 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -24,7 +24,8 @@ export const storageKey = {
   unsavedChange: 'cn-unsaved-change',
   entitySearchHistory: 'cn-entity-search-history',
   echartLegendFontSize: 'echartLegendFontSize',
-  echartLabelFontSize: 'echartLabelFontSize'
+  echartLabelFontSize: 'echartLabelFontSize',
+  tokenExpireCurrentPath: 'token-expire-current-path'
 }
 
 // 统一定义跳转来源