Explorar el Código

feat:更新子系统id

yf_zhb hace 2 años
padre
commit
70b6848f56
Se han modificado 3 ficheros con 35 adiciones y 5 borrados
  1. 5 2
      src/api/menu.js
  2. 15 0
      src/utils/auth.js
  3. 15 3
      src/utils/sso.js

+ 5 - 2
src/api/menu.js

@@ -1,10 +1,13 @@
 import request from '@/utils/request';
 import request from '@/utils/request';
 
 
+import { getSysMenuConfigID } from '@/utils/auth';
+
 // 获取路由
 // 获取路由
 export const getRouters = () => {
 export const getRouters = () => {
   return request({
   return request({
     url: '/getRouters',
     url: '/getRouters',
-    method: 'get'
+    method: 'get',
+    params: { menucfgId: getSysMenuConfigID() }
   });
   });
 };
 };
 
 
@@ -13,6 +16,6 @@ export const getMenus = () => {
   return request({
   return request({
     url: '/getMenus',
     url: '/getMenus',
     method: 'get',
     method: 'get',
-    params: { menucfgId: process.env.VUE_APP_SYS_APP_MENUCFGID }
+    params: { menucfgId: getSysMenuConfigID() }
   });
   });
 };
 };

+ 15 - 0
src/utils/auth.js

@@ -4,6 +4,7 @@ const TokenKey = 'SY-Token';
 const SSOConfigKey = 'SY-SSOCONFIG';
 const SSOConfigKey = 'SY-SSOCONFIG';
 const MenuVisibleKey = 'SY-MENUS-VISIBLE';
 const MenuVisibleKey = 'SY-MENUS-VISIBLE';
 const PlatformTokenKey = 'PLATFORM-Token';
 const PlatformTokenKey = 'PLATFORM-Token';
+const SYSTEMAPPMENUCFGID = 'SYS_WPR_MENUCFGID';
 
 
 export function getToken() {
 export function getToken() {
   return Cookies.get(TokenKey);
   return Cookies.get(TokenKey);
@@ -52,3 +53,17 @@ export function setPlatformToken(token) {
 export function removePlatformToken() {
 export function removePlatformToken() {
   return Cookies.remove(PlatformTokenKey);
   return Cookies.remove(PlatformTokenKey);
 }
 }
+
+export function getSysMenuConfigID() {
+  return (
+    Cookies.get(SYSTEMAPPMENUCFGID) || process.env.VUE_APP_SYS_APP_MENUCFGID
+  );
+}
+
+export function setSysMenuConfigID(token) {
+  return Cookies.set(SYSTEMAPPMENUCFGID, token);
+}
+
+export function removeSysMenuConfigID() {
+  return Cookies.remove(SYSTEMAPPMENUCFGID);
+}

+ 15 - 3
src/utils/sso.js

@@ -1,5 +1,9 @@
 import request from '@/utils/request';
 import request from '@/utils/request';
-import { getSSOConfig, setPlatformToken } from '@/utils/auth';
+import {
+  getSSOConfig,
+  setPlatformToken,
+  setSysMenuConfigID
+} from '@/utils/auth';
 import { defaults, omit } from 'lodash-es';
 import { defaults, omit } from 'lodash-es';
 const baseURL = process.env.VUE_APP_BASE_API;
 const baseURL = process.env.VUE_APP_BASE_API;
 const APP_PORT = process.env.port || process.env.npm_config_port || 8008; // 端口
 const APP_PORT = process.env.port || process.env.npm_config_port || 8008; // 端口
@@ -143,7 +147,11 @@ export function getResdirectAppUrl(ssoToken) {
 
 
 export function parseSSoToken(store, next, to) {
 export function parseSSoToken(store, next, to) {
   updateSSOConfig();
   updateSSOConfig();
-  const { token, siblingToken, redirect } = to.query;
+  const { token, siblingToken, subid } = to.query;
+
+  if (subid) {
+    setSysMenuConfigID(subid);
+  }
 
 
   if (token) {
   if (token) {
     let ssoToken = token;
     let ssoToken = token;
@@ -201,7 +209,11 @@ export function parseSSoToken(store, next, to) {
   } else if (siblingToken) {
   } else if (siblingToken) {
     //
     //
     return store.dispatch('SaveSiblingToken', siblingToken).then(() => {
     return store.dispatch('SaveSiblingToken', siblingToken).then(() => {
-      router.replace(to.path);
+      router.replace({
+        path: to.path,
+        query: omit(to.query, ['siblingToken', 'subid'])
+      });
+
       return true;
       return true;
     });
     });
   } else {
   } else {