Browse Source

修复单点登录退出失效的问题

fix_bug_pro20231227
smallchill 1 year ago
parent
commit
1e3017737d
  1. 4
      package.json
  2. 4
      src/config/website.js
  3. 2
      src/permission.js
  4. 4
      src/router/avue-router.js
  5. 4
      src/utils/auth.js
  6. 16
      yarn.lock

4
package.json

@ -26,7 +26,7 @@
"vite-plugin-mock": "^2.9.4",
"vue": "^3.2.40",
"vue-i18n": "^9.1.9",
"vue-router": "^4.1.5",
"vue-router": "^4.2.4",
"vuex": "^4.0.2"
},
"devDependencies": {
@ -35,7 +35,7 @@
"prettier": "^2.8.7",
"sass": "^1.37.5",
"unplugin-auto-import": "^0.11.2",
"vite": "^2.4.4",
"vite": "^2.9.16",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-vue-setup-extend": "^0.4.0"
}

4
src/config/website.js

@ -55,6 +55,6 @@ export default {
reportUrl: 'http://localhost:8108/ureport',
// 单点登录系统认证(blade-auth服务的地)
ssoUrl: 'http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=',
// 单点登录回调地址(Saber服务的地址)
redirectUri: 'http://localhost:1888',
// 单点登录回调地址(Saber服务的登录界面地址)
redirectUri: 'http://localhost:2888/login',
};

2
src/permission.js

@ -10,7 +10,7 @@ router.beforeEach((to, from, next) => {
const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
store.commit('SET_IS_MENU', isMenu === undefined);
if (getToken()) {
if (store.getters.isLock && to.path != lockPage) {
if (store.getters.isLock && to.path !== lockPage) {
//如果系统激活锁屏,全部跳转到锁屏页
next({ path: lockPage });
} else if (to.path === '/login') {

4
src/router/avue-router.js

@ -130,7 +130,7 @@ export const formatPath = (ele, first) => {
const propsDefault = website.menu;
const icon = ele[propsDefault.icon];
ele[propsDefault.icon] = !icon ? propsDefault.iconDefault : icon;
ele.meta = { keepAlive: ele.isOpen == 2 };
ele.meta = { keepAlive: ele.isOpen === 2 };
const iframeComponent = 'components/iframe/main';
const iframeSrc = href => {
return href.replace(/&/g, '#');
@ -147,7 +147,7 @@ export const formatPath = (ele, first) => {
ele[propsDefault.children] &&
ele[propsDefault.children].forEach(child => {
child.component = 'views' + child[propsDefault.path];
child.meta = { keepAlive: child.isOpen == 2 };
child.meta = { keepAlive: child.isOpen === 2 };
if (isURL(child[propsDefault.href])) {
let href = child[propsDefault.href];
child[propsDefault.path] = ele[propsDefault.path] + '/' + child.code;

4
src/utils/auth.js

@ -2,6 +2,8 @@ import Cookies from 'js-cookie';
const TokenKey = 'saber3-access-token';
const RefreshTokenKey = 'saber3-refresh-token';
const SessionId = 'JSESSIONID';
const UserId = 'b-user-id';
export function getToken() {
return Cookies.get(TokenKey);
@ -20,6 +22,8 @@ export function setRefreshToken(token) {
}
export function removeToken() {
Cookies.remove(SessionId);
Cookies.remove(UserId);
return Cookies.remove(TokenKey);
}

16
yarn.lock

@ -1643,10 +1643,10 @@ vite-plugin-vue-setup-extend@^0.4.0:
"@vue/compiler-sfc" "^3.2.29"
magic-string "^0.25.7"
vite@^2.4.4:
version "2.9.15"
resolved "https://registry.npmjs.org/vite/-/vite-2.9.15.tgz#2858dd5b2be26aa394a283e62324281892546f0b"
integrity sha512-fzMt2jK4vQ3yK56te3Kqpkaeq9DkcZfBbzHwYpobasvgYmP2SoAr6Aic05CsB4CzCZbsDv4sujX3pkEGhLabVQ==
vite@^2.9.16:
version "2.9.16"
resolved "https://registry.npmmirror.com/vite/-/vite-2.9.16.tgz#daf7ba50f5cc37a7bf51b118ba06bc36e97898e9"
integrity sha512-X+6q8KPyeuBvTQV8AVSnKDvXoBMnTx8zxh54sOwmmuOdxkjMmEJXH2UEchA+vTMps1xw9vL64uwJOWryULg7nA==
dependencies:
esbuild "^0.14.27"
postcss "^8.4.13"
@ -1670,10 +1670,10 @@ vue-i18n@^9.1.9:
"@intlify/vue-devtools" "9.2.2"
"@vue/devtools-api" "^6.2.1"
vue-router@^4.1.5:
version "4.2.1"
resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.2.1.tgz#f8ab85c89e74682cad71519480fdf2b855e8c9e0"
integrity sha512-nW28EeifEp8Abc5AfmAShy5ZKGsGzjcnZ3L1yc2DYUo+MqbBClrRP9yda3dIekM4I50/KnEwo1wkBLf7kHH5Cw==
vue-router@^4.2.4:
version "4.2.4"
resolved "https://registry.npmmirror.com/vue-router/-/vue-router-4.2.4.tgz#382467a7e2923e6a85f015d081e1508052c191b9"
integrity sha512-9PISkmaCO02OzPVOMq2w82ilty6+xJmQrarYZDkjZBfl4RvYAlt4PKnEX21oW4KTtWfa9OuO/b3qk1Od3AEdCQ==
dependencies:
"@vue/devtools-api" "^6.5.0"

Loading…
Cancel
Save