From cacdce74c8db0720e7e10203e07793500768e8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 14 Aug 2023 16:14:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=AE=88=E6=8A=A4=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PC/InterFace.Dash/src/permission.js | 16 +++++++++++++--- PC/UI.WinIn.FasterZ.Job/src/permission.js | 16 +++++++++++++--- PC/UI.WinIn.FasterZ.Store/src/permission.js | 16 +++++++++++++--- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/PC/InterFace.Dash/src/permission.js b/PC/InterFace.Dash/src/permission.js index 4834b3e..9f995ce 100644 --- a/PC/InterFace.Dash/src/permission.js +++ b/PC/InterFace.Dash/src/permission.js @@ -33,6 +33,8 @@ router.beforeEach(async (to, from, next) => { await store.dispatch('definition/getDefinitionConfig') } + // 是否已尝试过自动登录 + const alreadyTryLogin = localStorage.getItem('alreadyTryLogin') // 是否有用户信息： const userInfo = store.getters.currentUserInfo // 判断是否自动登录 @@ -47,11 +49,15 @@ router.beforeEach(async (to, from, next) => { next() }else{ console.log('-------当前路由不是登录页-------') - if(userInfo){ - console.log('-------当前有用户信息-------',userInfo) + if((userInfo && userInfo.id) || alreadyTryLogin == 'true'){ + if(userInfo && userInfo.id){ + console.log('-------当前有用户信息-------',userInfo) + }else{ + console.log('-------当前没有用户信息，但是已尝试过登录-------') + } next() }else{ - console.log('-------当前没有用户信息-------',userInfo) + console.log('-------当前没有用户信息-------') if(isAutoLogin || to.query.loginName){ let _username = to.query.loginName || localStorage.getItem("isLoginName") || localStorage.getItem("userNameOrEmailAddress") console.log('-------要求自动登录-------',isAutoLogin,to.query.loginName,_username) @@ -66,6 +72,7 @@ router.beforeEach(async (to, from, next) => { // login(loginForm).then(()=>{ await store.dispatch('user/getUserInfo',_username).then(()=>{ console.log("-------用户信息获取成功-------") + localStorage.setItem('alreadyTryLogin',true) next({ ...to, query:{ @@ -76,6 +83,7 @@ router.beforeEach(async (to, from, next) => { replace: true }) }).catch(()=>{ + localStorage.setItem('alreadyTryLogin',true) next() // next({ // path:'/login', @@ -108,6 +116,8 @@ router.beforeEach(async (to, from, next) => { } } } + + localStorage.setItem('alreadyTryLogin',false) }) router.afterEach(() => { diff --git a/PC/UI.WinIn.FasterZ.Job/src/permission.js b/PC/UI.WinIn.FasterZ.Job/src/permission.js index 4834b3e..9f995ce 100644 --- a/PC/UI.WinIn.FasterZ.Job/src/permission.js +++ b/PC/UI.WinIn.FasterZ.Job/src/permission.js @@ -33,6 +33,8 @@ router.beforeEach(async (to, from, next) => { await store.dispatch('definition/getDefinitionConfig') } + // 是否已尝试过自动登录 + const alreadyTryLogin = localStorage.getItem('alreadyTryLogin') // 是否有用户信息： const userInfo = store.getters.currentUserInfo // 判断是否自动登录 @@ -47,11 +49,15 @@ router.beforeEach(async (to, from, next) => { next() }else{ console.log('-------当前路由不是登录页-------') - if(userInfo){ - console.log('-------当前有用户信息-------',userInfo) + if((userInfo && userInfo.id) || alreadyTryLogin == 'true'){ + if(userInfo && userInfo.id){ + console.log('-------当前有用户信息-------',userInfo) + }else{ + console.log('-------当前没有用户信息，但是已尝试过登录-------') + } next() }else{ - console.log('-------当前没有用户信息-------',userInfo) + console.log('-------当前没有用户信息-------') if(isAutoLogin || to.query.loginName){ let _username = to.query.loginName || localStorage.getItem("isLoginName") || localStorage.getItem("userNameOrEmailAddress") console.log('-------要求自动登录-------',isAutoLogin,to.query.loginName,_username) @@ -66,6 +72,7 @@ router.beforeEach(async (to, from, next) => { // login(loginForm).then(()=>{ await store.dispatch('user/getUserInfo',_username).then(()=>{ console.log("-------用户信息获取成功-------") + localStorage.setItem('alreadyTryLogin',true) next({ ...to, query:{ @@ -76,6 +83,7 @@ router.beforeEach(async (to, from, next) => { replace: true }) }).catch(()=>{ + localStorage.setItem('alreadyTryLogin',true) next() // next({ // path:'/login', @@ -108,6 +116,8 @@ router.beforeEach(async (to, from, next) => { } } } + + localStorage.setItem('alreadyTryLogin',false) }) router.afterEach(() => { diff --git a/PC/UI.WinIn.FasterZ.Store/src/permission.js b/PC/UI.WinIn.FasterZ.Store/src/permission.js index 4834b3e..9f995ce 100644 --- a/PC/UI.WinIn.FasterZ.Store/src/permission.js +++ b/PC/UI.WinIn.FasterZ.Store/src/permission.js @@ -33,6 +33,8 @@ router.beforeEach(async (to, from, next) => { await store.dispatch('definition/getDefinitionConfig') } + // 是否已尝试过自动登录 + const alreadyTryLogin = localStorage.getItem('alreadyTryLogin') // 是否有用户信息： const userInfo = store.getters.currentUserInfo // 判断是否自动登录 @@ -47,11 +49,15 @@ router.beforeEach(async (to, from, next) => { next() }else{ console.log('-------当前路由不是登录页-------') - if(userInfo){ - console.log('-------当前有用户信息-------',userInfo) + if((userInfo && userInfo.id) || alreadyTryLogin == 'true'){ + if(userInfo && userInfo.id){ + console.log('-------当前有用户信息-------',userInfo) + }else{ + console.log('-------当前没有用户信息，但是已尝试过登录-------') + } next() }else{ - console.log('-------当前没有用户信息-------',userInfo) + console.log('-------当前没有用户信息-------') if(isAutoLogin || to.query.loginName){ let _username = to.query.loginName || localStorage.getItem("isLoginName") || localStorage.getItem("userNameOrEmailAddress") console.log('-------要求自动登录-------',isAutoLogin,to.query.loginName,_username) @@ -66,6 +72,7 @@ router.beforeEach(async (to, from, next) => { // login(loginForm).then(()=>{ await store.dispatch('user/getUserInfo',_username).then(()=>{ console.log("-------用户信息获取成功-------") + localStorage.setItem('alreadyTryLogin',true) next({ ...to, query:{ @@ -76,6 +83,7 @@ router.beforeEach(async (to, from, next) => { replace: true }) }).catch(()=>{ + localStorage.setItem('alreadyTryLogin',true) next() // next({ // path:'/login', @@ -108,6 +116,8 @@ router.beforeEach(async (to, from, next) => { } } } + + localStorage.setItem('alreadyTryLogin',false) }) router.afterEach(() => {