From 7e952a339cca0dd65e01f2d0b11fd27c570f6607 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 28 九月 2023 23:26:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/store/modules/user.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/store/modules/user.js b/Source/UBCS-WEB/src/store/modules/user.js
index fed7910..ac03016 100644
--- a/Source/UBCS-WEB/src/store/modules/user.js
+++ b/Source/UBCS-WEB/src/store/modules/user.js
@@ -5,6 +5,7 @@
import {deepClone} from '@/util/util'
import website from '@/config/website'
import {loginByUsername, loginBySocial, loginBySso, getUserInfo, logout, refreshToken, getButtons} from '@/api/user'
+import {ssoLogin} from "@/api/system/user.js"
import {getTopMenu, getRoutes} from '@/api/system/menu'
import md5 from 'js-md5'
@@ -109,9 +110,9 @@
})
},
//鏍规嵁鍗曠偣淇℃伅鐧诲綍
- LoginBySso({commit}, userInfo) {
+ LoginBySso({commit},{PathString}) {
return new Promise((resolve) => {
- loginBySso(userInfo.state,).then(res => {
+ ssoLogin(PathString).then(res => {
const data = res.data;
if (data.error_description) {
Message({
@@ -224,6 +225,7 @@
return new Promise((resolve) => {
getButtons().then(res => {
const data = res.data.data;
+ // console.log(data);
commit('SET_PERMISSION', data);
resolve();
})
--
Gitblit v1.9.3