Shannon_mu 3 лет назад
Родитель
Сommit
b60332511b

+ 1 - 0
login/src/components/ToggleTenant.vue

@@ -33,6 +33,7 @@ export default {
                 this.$parent.toggleTenant();
                 return;
             }
+            debugger;
             if (this.$route.path == '/nav') {
                 this.$parent.selectTenant(item);
             } else {

+ 2 - 1
login/src/main.js

@@ -27,8 +27,9 @@ Vue.prototype.$http = http;
 //使用钩子函数对路由进行权限跳转
 router.beforeEach((to, from, next) => {
     if(!/^(\/|\/login)$/.test(to.path)) {
+        debugger;
         // 判断是否登录
-        if(localStorage.getItem('UMIS_token')) {
+        if(localStorage.getItem('SC_token')) {
             next();
         } else {
             next('/');

+ 5 - 5
login/src/router/index.js

@@ -11,12 +11,12 @@ import Router from 'vue-router';
 Vue.use(Router);
 
 export default new Router({
-    mode:'history',
-    base: process.env.BASE_URL,
+    mode: 'history',
+    base: process.env.BASE_URL,
     routes: [
         {
             path: '/',
-            redirect:'/login',
+            redirect: '/login',
         },
         {
             path: '/login',
@@ -28,8 +28,8 @@ export default new Router({
         //     component:()=>import(/* webpackChunkName: "nav" */ '@views/Nav'),
         // },
         {
-            path:'/nav',
-            component:()=>import(/* webpackChunkName: "nav" */ '@views/NewNav'),
+            path: '/nav',
+            component: () => import(/* webpackChunkName: "nav" */ '@views/NewNav'),
         }
     ]
 });

+ 5 - 5
login/src/utils/http.js

@@ -16,7 +16,7 @@ http.interceptors.request.use(
         // 所有请求都添加/user-auth前缀,方便接口代理
         // config.url = `/user-auth${config.url}`;
         config.url = `${config.url.indexOf('/user-center') == 0 ? '' : '/user-auth'}${config.url}`;
-        config.headers[localStorage.getItem('UMIS_token') && 'Authorization'] = 'Bearer ' + localStorage.getItem('UMIS_token');
+        config.headers[localStorage.getItem('SC_token') && 'Authorization'] = 'Bearer ' + localStorage.getItem('SC_token');
         // 全局添加cancelToken
         config.cancelToken = source.token;
         return config;
@@ -33,7 +33,7 @@ http.interceptors.response.use(
     err => {
         if (err&&err.response.status == 401) {
             axios({
-                url:'/user-auth/user/getUserStatus?accessToken='+localStorage.getItem('UMIS_token'),
+                url:'/user-auth/user/getUserStatus?accessToken='+localStorage.getItem('SC_token'),
                 method:'get'
             }).then((response)=>{
               if (window.relogin) return false;
@@ -47,7 +47,7 @@ http.interceptors.response.use(
                         .then(() => {
                             window.open(config.baseUrl, '_self');//弹出的窗口替换本身
                             window.relogin = false;
-                            localStorage.removeItem('UMIS_token');
+                            localStorage.removeItem('SC_token');
                             sessionStorage.removeItem("tabs");
                             localStorage.removeItem('menupath');
                         })
@@ -60,7 +60,7 @@ http.interceptors.response.use(
                         .then(() => {
                             window.open(config.baseUrl, '_self');
                             window.relogin = false;
-                            localStorage.removeItem('UMIS_token');
+                            localStorage.removeItem('SC_token');
                             sessionStorage.removeItem("tabs");
                             localStorage.removeItem('menupath');
                         })
@@ -73,7 +73,7 @@ http.interceptors.response.use(
                         .then(() => {
                             window.open(config.baseUrl, '_self');
                             window.relogin = false;
-                            localStorage.removeItem('UMIS_token');
+                            localStorage.removeItem('SC_token');
                             localStorage.removeItem('menupath');
                             sessionStorage.removeItem("tabs");
                         })

+ 2 - 2
login/src/views/Login/index.vue

@@ -394,7 +394,7 @@ export default {
             }
             this.$http.postForm('/user/smsCodeLogin', params).then(({ status, data, msg }) => {
                 if (status === 0 && data) {
-                    localStorage.setItem('UMIS_token', data.token.access_token);
+                    localStorage.setItem('SC_token', data.token.access_token);
                     this.loginInfoArr = data.loginInfo;
                     if (data.loginInfo.length > 1) {
                         this.isSelectTenant = true;
@@ -434,7 +434,7 @@ export default {
         this.refreshCode();
         localStorage.removeItem('menupath');
         localStorage.removeItem('ms_username');
-        localStorage.removeItem('UMIS_token');
+        localStorage.removeItem('SC_token');
         sessionStorage.removeItem('tabs');
 
         const accountNumberName = localStorage.getItem('accountNumberName') || '';

+ 3 - 3
login/src/views/Nav/index.vue

@@ -65,14 +65,14 @@ export default {
             this.navList[index].menuImage=this.menuImage
         },
         logout() {
-            var access_token = localStorage.getItem('UMIS_token');
+            var access_token = localStorage.getItem('SC_token');
             this.$http.postForm('/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
                 if (0 === status) {
                     this.$message({
                         type: 'success',
                         message: '您已退出登录'
                     });
-                    localStorage.removeItem('UMIS_token');
+                    localStorage.removeItem('SC_token');
                     localStorage.removeItem('menupath');
                     localStorage.removeItem('ms_username');
                     this.$store.commit('setloginInfo', '');
@@ -161,7 +161,7 @@ export default {
     created() {
         let { phone, tenantId } = this.$route.query;
         this.$http.postForm('/user/login', { mobile: phone, tenatId: tenantId }).then(({ status, data, msg }) => {
-            localStorage.setItem('UMIS_token', data.token);
+            localStorage.setItem('SC_token', data.token);
             localStorage.setItem('customerID', data.customerId);
             if (data.enableState === '0') {
                 this.$alert('你的账号已被停用,如有问题请联系管理员', '', 'warning', {

+ 3 - 3
login/src/views/NewNav/index.vue

@@ -60,14 +60,14 @@ export default {
     },
     methods: {
         logout() {
-            var access_token = localStorage.getItem('UMIS_token');
+            var access_token = localStorage.getItem('SC_token');
             this.$http.postForm('/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
                 if (0 === status) {
                     this.$message({
                         type: 'success',
                         message: '您已退出登录'
                     });
-                    localStorage.removeItem('UMIS_token');
+                    localStorage.removeItem('SC_token');
                     localStorage.removeItem('menupath');
                     localStorage.removeItem('ms_username');
                     this.$store.commit('setloginInfo', '');
@@ -176,7 +176,7 @@ export default {
             });
 
             this.$http
-                .postForm('/user/login', { mobile: phone, tenatId: tenantId, token: localStorage.getItem('UMIS_token') })
+                .postForm('/user/login', { mobile: phone, tenatId: tenantId, token: localStorage.getItem('SC_token') })
                 .then(({ status, data, msg }) => {
                     // localStorage.setItem('UMIS_token', data.token);
                     localStorage.setItem('customerID', data.customerId);

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

@@ -128,14 +128,14 @@ export default {
         },
         // 退出登录
         logOut() {
-            var access_token = localStorage.getItem('UMIS_token');
+            var access_token = localStorage.getItem('SC_token');
             this.$http.postForm('/user-auth/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
                 if (0 === status) {
                     this.$message({
                         type: 'success',
                         message: '您已退出登录'
                     });
-                    localStorage.removeItem('UMIS_token');
+                    localStorage.removeItem('SC_token');
                     this.$store.commit('setloginInfo', '');
                     this.$store.dispatch("tags", []);
                     sessionStorage.removeItem("tabs");

+ 1 - 1
userCenter/src/main.js

@@ -83,7 +83,7 @@ new Vue({
     store,
     render: h => h(App),
     created() {
-        if (localStorage.getItem('UMIS_token')) {
+        if (localStorage.getItem('SC_token')) {
             this.routerLoad.loadMenus();
         }
     }

+ 5 - 5
userCenter/src/utils/http.js

@@ -32,7 +32,7 @@ http.interceptors.request.use(
             config.url = `/user-center${config.url}`;
         }
         // config.headers['Accept'] = '*/*'
-        config.headers[localStorage.getItem('UMIS_token') && 'Authorization'] = 'Bearer ' + localStorage.getItem('UMIS_token');
+        config.headers[localStorage.getItem('SC_token') && 'Authorization'] = 'Bearer ' + localStorage.getItem('SC_token');
         // 全局添加cancelToken
         config.cancelToken = source.token;
         return config;
@@ -49,7 +49,7 @@ http.interceptors.response.use(
     (err) => {
         if (err.response.status == 401) {
             axios({
-                url: '/user-auth/user/getUserStatus?accessToken=' + localStorage.getItem('UMIS_token'),
+                url: '/user-auth/user/getUserStatus?accessToken=' + localStorage.getItem('SC_token'),
                 method: 'get'
             }).then((response) => {
                 if (window.relogin) return false;
@@ -64,7 +64,7 @@ http.interceptors.response.use(
                     }).then(() => {
                         window.open(config.loginUrl, '_self');
                         window.relogin = false;
-                        localStorage.removeItem('UMIS_token');
+                        localStorage.removeItem('SC_token');
                     }).catch(() => { });
                 } else if (data == 1) {
                     Vue.prototype.$msgBox('该账号已在其他地址登录,如需访问请重新登录', '', 'warning', {
@@ -75,7 +75,7 @@ http.interceptors.response.use(
                     }).then(() => {
                         window.open(config.loginUrl, '_self');
                         window.relogin = false;
-                        localStorage.removeItem('UMIS_token');
+                        localStorage.removeItem('SC_token');
                     }).catch(() => { });
                 } else {
                     Vue.prototype.$msgBox('你的账号已被停用,如有问题请联系管理员', '', 'warning', {
@@ -86,7 +86,7 @@ http.interceptors.response.use(
                     }).then(() => {
                         window.open(config.loginUrl, '_self');
                         window.relogin = false;
-                        localStorage.removeItem('UMIS_token');
+                        localStorage.removeItem('SC_token');
                     }).catch(() => { });
                 }
             })

+ 1 - 1
userCenter/src/views/sysManage/appVersionManage/popups/addAppVersionManage.vue

@@ -49,7 +49,7 @@ export default {
   data() {
     return {
       token: {
-          [localStorage.getItem('UMIS_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('UMIS_token')
+          [localStorage.getItem('SC_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('SC_token')
       },
       uploads: {
         filePath:''

+ 1 - 1
userCenter/src/views/sysManage/deviceManage/popups/addOrEditScene.vue

@@ -168,7 +168,7 @@ export default {
     data() {
         return {
             token: {
-                [localStorage.getItem('UMIS_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('UMIS_token')
+                [localStorage.getItem('SC_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('SC_token')
             },
             getCityName: '',
             envConfig: envConfig,

+ 1 - 1
userCenter/src/views/system/menus/popups/AddOrEdit.vue

@@ -109,7 +109,7 @@ export default {
         return {
             envConfig:envConfig,
             token:{
-                [localStorage.getItem('UMIS_token') && 'Authorization']:'Bearer ' + localStorage.getItem('UMIS_token')
+                [localStorage.getItem('SC_token') && 'Authorization']:'Bearer ' + localStorage.getItem('SC_token')
             },
             defaultProps: {
                 value: 'id', // 唯一标识

+ 1 - 1
userCenter/src/views/system/menus/popups/EditForm.vue

@@ -128,7 +128,7 @@ export default {
         return {
             envConfig: envConfig,
             token: {
-                [localStorage.getItem('UMIS_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('UMIS_token')
+                [localStorage.getItem('SC_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('SC_token')
             },
             defaultProps: {
                 value: 'id', // 唯一标识

+ 1 - 1
userCenter/src/views/system/tenants/popups/AddOrEdit.vue

@@ -93,7 +93,7 @@ export default {
             ],
             envConfig: envConfig,
             token: {
-                [localStorage.getItem('UMIS_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('UMIS_token')
+                [localStorage.getItem('SC_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('SC_token')
             },
             // 租户菜单
             tenantsTree: [],

+ 1 - 1
userCenter/src/views/system/users/popups/AddOrEditUserInfo.vue

@@ -97,7 +97,7 @@ export default {
     data() {
         return {
             token: {
-                [localStorage.getItem('UMIS_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('UMIS_token')
+                [localStorage.getItem('SC_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('SC_token')
             },
             isLoginUser:false,
             envConfig: envConfig,

+ 2 - 2
userCenter/src/views/system/users/popups/edituser.vue

@@ -99,7 +99,7 @@ export default {
     data() {
         return {
             token: {
-                [localStorage.getItem('UMIS_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('UMIS_token')
+                [localStorage.getItem('SC_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('SC_token')
             },
             envConfig: envConfig,
             organList: [
@@ -223,7 +223,7 @@ export default {
                                 }).then(()=>{
                                     window.open('http://114.135.61.188:18093/login/login', '_self');
                                     window.relogin = false;
-                                    localStorage.removeItem('UMIS_token');
+                                    localStorage.removeItem('SC_token');
                                     return;
                                 });
                             }else{