From cca719d0cb879a650c743ada280de846a8dfeb6f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 18 六月 2024 16:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/store/modules/user.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/store/modules/user.js b/Source/plt-web/plt-web-ui/src/store/modules/user.js
index 3b04ff9..2506220 100644
--- a/Source/plt-web/plt-web-ui/src/store/modules/user.js
+++ b/Source/plt-web/plt-web-ui/src/store/modules/user.js
@@ -62,13 +62,13 @@
//鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
LoginByUsername({commit}, userInfo) {
return new Promise((resolve, reject) => {
- loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key,).then(res => {
+ loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, userInfo.password, userInfo.type, userInfo.key,).then(res => {
const data = res.data;
- if (data.success) {
- commit('SET_TOKEN', data.obj.sessionInfo.token);
- commit('SET_REFRESH_TOKEN', data.obj.sessionInfo.token);
- commit('SET_TENANT_ID', data.tenant_id);
- commit('SET_USER_INFO', data.obj.sessionInfo);
+ if (data.code === 200) {
+ commit('SET_TOKEN', data.obj.tokenVO.accessToken);
+ commit('SET_REFRESH_TOKEN', data.obj.tokenVO.accessToken);
+ // commit('SET_TENANT_ID', data.tenant_id);
+ // commit('SET_USER_INFO', data.obj.sessionInfo); 鐢ㄦ埛淇℃伅
commit('DEL_ALL_TAG');
commit('CLEAR_LOCK');
} else {
--
Gitblit v1.9.3