Shannon_mu 2 سال پیش
والد
کامیت
624b74a6eb

+ 2 - 2
accessControlSystem/src/components/common/Header.vue

@@ -86,7 +86,7 @@ export default {
         // 退出登录
         logOut() {
             var access_token = localStorage.getItem('SC_token');
-            this.$http.postForm('/user-auth/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
+            this.$http.postForm('/sc-user-auth/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
                 if (0 === status) {
                     this.$message({
                         type: 'success',
@@ -98,7 +98,7 @@ export default {
                     this.$store.dispatch('tags', []);
 
                     sessionStorage.removeItem('tabs');
-                    location.href = this.envConfig.loginUrl;
+                    window.location.href = this.envConfig.loginUrl;
                 } else {
                     this.$message.error(msg);
                 }

+ 1 - 1
accessControlSystem/src/utils/http.js

@@ -56,7 +56,7 @@ http.interceptors.response.use(
     (err) => {
         if (err.response.status == 401) {
             axios({
-                url: '/user-auth/user/getUserStatus?accessToken=' + localStorage.getItem('SC_token'),
+                url: '/sc-user-auth/user/getUserStatus?accessToken=' + localStorage.getItem('SC_token'),
                 method: 'get'
             }).then((response) => {
                 if (window.relogin) return false;

+ 2 - 2
energyManagement/src/components/common/Header.vue

@@ -86,7 +86,7 @@ export default {
         // 退出登录
         logOut() {
             var access_token = localStorage.getItem('SC_token');
-            this.$http.postForm('/user-auth/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
+            this.$http.postForm('/sc-user-auth/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
                 if (0 === status) {
                     this.$message({
                         type: 'success',
@@ -98,7 +98,7 @@ export default {
                     this.$store.dispatch('tags', []);
 
                     sessionStorage.removeItem('tabs');
-                    location.href = this.envConfig.loginUrl;
+                     window.location.href = this.envConfig.loginUrl;
                 } else {
                     this.$message.error(msg);
                 }

+ 1 - 1
energyManagement/src/utils/http.js

@@ -58,7 +58,7 @@ http.interceptors.response.use(
     (err) => {
         if (err.response.status == 401) {
             axios({
-                url: '/user-auth/user/getUserStatus?accessToken=' + localStorage.getItem('SC_token'),
+                url: '/sc-user-auth/user/getUserStatus?accessToken=' + localStorage.getItem('SC_token'),
                 method: 'get'
             }).then((response) => {
                 if (window.relogin) return false;

+ 2 - 2
operationSupport/src/components/common/Header.vue

@@ -113,7 +113,7 @@ export default {
         // 退出登录
         logOut() {
             var access_token = localStorage.getItem('SC_token');
-            this.$http.postForm('/user-auth/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
+            this.$http.postForm('/sc-user-auth/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
                 if (0 === status) {
                     this.$message({
                         type: 'success',
@@ -125,7 +125,7 @@ export default {
                     this.$store.dispatch('tags', []);
 
                     sessionStorage.removeItem('tabs');
-                    location.href = this.envConfig.loginUrl;
+                    window.location.href = this.envConfig.loginUrl;
                 } else {
                     this.$message.error(msg);
                 }

+ 13 - 5
operationSupport/src/utils/http.js

@@ -70,12 +70,20 @@ http.interceptors.response.use(
                             localStorage.removeItem('SC_token');
                         })
                         .catch(() => { });
-                
+
                 } else if (data == 1) {
-                    window.open(config.loginUrl, '_self');
-                    localStorage.setItem('logOut',true)
-                    window.relogin = false;
-                    localStorage.removeItem('SC_token');
+                    ELEMENT.MessageBox('该账号已在其他地址登录,如需访问请重新登录', '提示', 'warning', {
+                        confirmButtonText: '确定',
+                        showClose: false
+                    })
+                        .then(() => {
+                            window.open(config.baseUrl, '_self');
+                            window.relogin = false;
+                            localStorage.removeItem('SC_token');
+                            sessionStorage.removeItem("tabs");
+                            localStorage.removeItem('menupath');
+                        })
+                        .catch(() => { });
                 } else {
                     Vue.prototype
                         .$msgBox('你的账号已被停用,如有问题请联系管理员', '', 'warning', {

+ 1 - 1
userCenter/src/components/common/Header.vue

@@ -112,7 +112,7 @@ export default {
                     this.$store.commit('setloginInfo', '');
                     this.$store.dispatch('tags', []);
                     sessionStorage.removeItem('tabs');
-                    location.href = this.envConfig.loginUrl;
+                      window.location.href = this.envConfig.loginUrl;
                 } else {
                     this.$message.error(msg);
                 }