diff --git a/.env.staging b/.env.staging index 26e033649f107dcea803331b928ff123e711104d..f3fcce6a9dc6cadaa1e58cd60539e620f3ad94fa 100644 --- a/.env.staging +++ b/.env.staging @@ -4,4 +4,4 @@ NODE_ENV = production ENV = 'staging' #gfast管ç†ç³»ç»Ÿ/测试环境 -VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1' +VUE_APP_BASE_API = '/api/v1' diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index ad876b51b6d604298a80b6379bb34dd056793bc2..48231bd79c5b6459ea1fb6581fef68c535f418ab 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -145,9 +145,9 @@ export default { let ssa = window.location.host let ht = document.location.protocol if(ssa =='localhost:1024'){ - window.location.href=ht+'//'+this.ssourl +'/logout?redirect='+ht+'//'+ssa+'/login' + window.location.href=ht+'//'+this.ssourl +'/api/v2/logout?redirect='+ht+'//'+ssa+'/login' }else{ - window.location.href=ht+'//'+this.ssourl +'/logout?redirect='+ht+'//'+ssa+'/login' + window.location.href=ht+'//'+this.ssourl +'/api/v2/logout?redirect='+ht+'//'+ssa+'/login' } }) }) diff --git a/src/views/entry/newyuncang.vue b/src/views/entry/newyuncang.vue index 5d69db2260aa757523bcfd0ac63e47f57eb11e82..f62d383bb913c5a9622136a1246dea0430bd8547 100644 --- a/src/views/entry/newyuncang.vue +++ b/src/views/entry/newyuncang.vue @@ -785,14 +785,14 @@ store.dispatch('LogOut').then(() => { let ssa = window.location.host; let ht = document.location.protocol; - window.location.href = ht + '//' + this.ssourl + '/login?redirect=' + ht + '//' + ssa + '/platformlogin' + window.location.href = ht + '//' + this.ssourl + '/login.html?redirect=' + ht + '//' + ssa + '/platformlogin' }) }, // 去登录 toLogin() { let ssa = window.location.host; let ht = document.location.protocol; - window.location.href = ht + '//' + this.ssourl + '/login?redirect=' + ht + '//' + ssa + '/platformlogin' + window.location.href = ht + '//' + this.ssourl + '/login.html?redirect=' + ht + '//' + ssa + '/platformlogin' // window.location.href = 'http://sso.jxhh.com/login?redirect=http://' + window.location.host + '/platformlogin' } diff --git a/src/views/login.vue b/src/views/login.vue index 63accd9e3e04a9a08a5b0f62a8a30f212c63df7f..a7a69b7c2abf07597079ba6ba393a820ef8a1eff 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -67,9 +67,9 @@ export default { var that = this setTimeout(function (){ if(ssa =='localhost:1024'){ - window.location.href=ht+'//'+that.ssourl+'/login?redirect='+ht+'//'+ssa+'/platformlogin' + window.location.href=ht+'//'+that.ssourl+'/login.html?redirect='+ht+'//'+ssa+'/platformlogin' }else{ - window.location.href=ht+'//'+that.ssourl+'/login?redirect='+ht+'//'+ssa+'/platformlogin' + window.location.href=ht+'//'+that.ssourl+'/login.html?redirect='+ht+'//'+ssa+'/platformlogin' } }, 1000) } diff --git a/src/views/platformlogin.vue b/src/views/platformlogin.vue index c5745321cfc2e8b7b37e0bf2bf5b064c08209f43..10aeada8a7608dfbd5ca60f276ea58f696237efb 100644 --- a/src/views/platformlogin.vue +++ b/src/views/platformlogin.vue @@ -89,9 +89,9 @@ let that = this setTimeout(function () { if (ssa == 'localhost:1024') { - window.location.href = ht+'//'+that.ssourl+'/logout?redirect='+ht+'//' + ssa + '/login' + window.location.href = ht+'//'+that.ssourl+'/api/v2/logout?redirect='+ht+'//' + ssa + '/login' } else { - window.location.href = ht+'//'+that.ssourl+'/logout?redirect='+ht+'//' + ssa + '/login' + window.location.href = ht+'//'+that.ssourl+'/api/v2/logout?redirect='+ht+'//' + ssa + '/login' } }, 1000) } @@ -104,9 +104,9 @@ let that = this setTimeout(function () { if (ssa == 'localhost:1024') { - window.location.href = ht+'//'+that.ssourl+'/logout?redirect='+ht+'//' + ssa + '/login' + window.location.href = ht+'//'+that.ssourl+'/api/v2/logout?redirect='+ht+'//' + ssa + '/login' } else { - window.location.href = ht+'//'+that.ssourl+'/logout?redirect='+ht+'//' + ssa + '/login' + window.location.href = ht+'//'+that.ssourl+'/api/v2/logout?redirect='+ht+'//' + ssa + '/login' } }, 1000) this.loading = false diff --git a/src/views/system/settings/setpsd.vue b/src/views/system/settings/setpsd.vue index 482602a5bd8aba107c9a77adca335366140bdfe8..85940532fe230e2f9511e2eb15d8622bf1fc1dfe 100644 --- a/src/views/system/settings/setpsd.vue +++ b/src/views/system/settings/setpsd.vue @@ -366,9 +366,9 @@ var ssa = window.location.host setTimeout(function (){ if(ssa =='localhost:1024'){ - window.location.href='http://sso.jxhh.com/logout?redirect=http://'+ssa+'/login' + window.location.href='http://sso.jxhh.com/api/v2/logout?redirect=http://'+ssa+'/login' }else{ - window.location.href='http://sso.jxhh.com/logout?redirect=http://'+ssa+'/login' + window.location.href='http://sso.jxhh.com/api/v2/logout?redirect=http://'+ssa+'/login' } }, 1000) }) @@ -394,9 +394,9 @@ var ssa = window.location.host setTimeout(function (){ if(ssa =='localhost:1024'){ - window.location.href='http://sso.jxhh.com/logout?redirect=http://'+ssa+'/login' + window.location.href='http://sso.jxhh.com/api/v2/logout?redirect=http://'+ssa+'/login' }else{ - window.location.href='http://sso.jxhh.com/logout?redirect=http://'+ssa+'/login' + window.location.href='http://sso.jxhh.com/api/v2/logout?redirect=http://'+ssa+'/login' } }, 1000) })