From 6f994bf94166b3b900eb43edcba07611017a6474 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 25 六月 2024 10:21:26 +0800
Subject: [PATCH] 用户管理：分页查询接口，用户角色，密码策略部分查询接口添加
---
Source/plt-web/plt-web-ui/src/store/modules/user.js | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 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..fbbaba8 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,15 +62,24 @@
//鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
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.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.sessionInfo.token);
+ // commit('SET_REFRESH_TOKEN', data.obj.sessionInfo.token);
+
+ commit('SET_TOKEN', data.obj.tokenVO.accessToken);
+ commit('SET_REFRESH_TOKEN', data.obj.tokenVO.accessToken);
commit('DEL_ALL_TAG');
commit('CLEAR_LOCK');
+
+ getUserInfo().then((res) => {
+ const data = res.data;
+ commit('SET_USER_INFO', data.obj);
+ }).catch(err => {
+ console.log(err)
+ })
+
} else {
Message({
message: data.msg,
@@ -140,18 +149,6 @@
})
})
},
- //鑾峰彇鐢ㄦ埛淇℃伅
- GetUserInfo({commit}) {
- return new Promise((resolve, reject) => {
- getUserInfo().then((res) => {
- const data = res.data.data;
- commit('SET_ROLES', data.roles);
- resolve(data);
- }).catch(err => {
- reject(err);
- })
- })
- },
//鍒锋柊token
refreshToken({state, commit}, userInfo) {
window.console.log('handle refresh token');
@@ -213,6 +210,21 @@
})
})
},
+
+ //鑾峰彇鐢ㄦ埛淇℃伅
+ GetUserInfo({commit}) {
+ return new Promise((resolve, reject) => {
+ getUserInfo().then((res) => {
+ const data = res.data.data;
+ console.log('user',res)
+ // commit('SET_USER_INFO', data.roles);
+ resolve(data);
+ }).catch(err => {
+ reject(err);
+ })
+ })
+ },
+
//鑾峰彇绯荤粺鑿滃崟
GetMenu({commit, dispatch}, topMenuId) {
return new Promise(resolve => {
@@ -231,6 +243,8 @@
})
})
},
+
+
//鑾峰彇绯荤粺鎸夐挳
GetButtons({commit}) {
return new Promise((resolve) => {
--
Gitblit v1.9.3