|
@@ -137,7 +137,7 @@ export function getResdirectAppUrl(ssoToken) {
|
|
|
? parseTarget(
|
|
? parseTarget(
|
|
|
ssoConfig.ssoLoginUrl + backUrl + `&appid=${ssoConfig.appId}`
|
|
ssoConfig.ssoLoginUrl + backUrl + `&appid=${ssoConfig.appId}`
|
|
|
)
|
|
)
|
|
|
- : '/water/login';
|
|
|
|
|
|
|
+ : process.env.VUE_APP_SYS_BASE_URL + '/login';
|
|
|
// alert( ssoConfig.ssoEnabled );
|
|
// alert( ssoConfig.ssoEnabled );
|
|
|
// alert(redirectUrl);
|
|
// alert(redirectUrl);
|
|
|
// alert(ssoConfig.ssoLoginUrl);
|
|
// alert(ssoConfig.ssoLoginUrl);
|
|
@@ -145,7 +145,7 @@ export function getResdirectAppUrl(ssoToken) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-export function parseSSoToken(store, next, to) {
|
|
|
|
|
|
|
+export function parseSSoToken(store, next, to, router) {
|
|
|
updateSSOConfig();
|
|
updateSSOConfig();
|
|
|
const { token, siblingToken, subid } = to.query;
|
|
const { token, siblingToken, subid } = to.query;
|
|
|
|
|
|
|
@@ -209,9 +209,10 @@ export function parseSSoToken(store, next, to) {
|
|
|
} else if (siblingToken) {
|
|
} else if (siblingToken) {
|
|
|
//
|
|
//
|
|
|
return store.dispatch('SaveSiblingToken', siblingToken).then(() => {
|
|
return store.dispatch('SaveSiblingToken', siblingToken).then(() => {
|
|
|
- next({
|
|
|
|
|
|
|
+ router.replace({
|
|
|
path: to.path,
|
|
path: to.path,
|
|
|
- query: omit(to.query, ['siblingToken', 'subid'])
|
|
|
|
|
|
|
+ query: omit(to.query, ['siblingToken', 'subid']),
|
|
|
|
|
+ replace: true
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
return true;
|
|
return true;
|