From a34c10535d130c4be667301434a0e8072ee82716 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 十月 2024 15:21:48 +0800
Subject: [PATCH] 整合代码，修改表单定义按钮排列方式
---
Source/plt-web/plt-web-ui/src/store/modules/user.js | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 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..99a59e2 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
@@ -7,6 +7,7 @@
import {loginByUsername, loginBySocial, loginBySso, getUserInfo, logout, refreshToken, getButtons} from '@/api/user'
import {getTopMenu, getRoutes} from '@/api/system/menu'
import md5 from 'js-md5'
+import func from "@/util/func";
function addPath(ele, first) {
@@ -62,22 +63,32 @@
//鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
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 => {
+ let passwordDes = func.encryptData(userInfo.password,'daliantan0v0vcip')
+ loginByUsername(userInfo.deptId, userInfo.roleId, userInfo.username,passwordDes, 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,
type: 'error'
})
}
- resolve();
+ resolve(data);
}).catch(error => {
reject(error);
})
@@ -137,18 +148,6 @@
commit('CLEAR_LOCK');
}
resolve();
- })
- })
- },
- //鑾峰彇鐢ㄦ埛淇℃伅
- 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);
})
})
},
@@ -213,6 +212,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 +245,8 @@
})
})
},
+
+
//鑾峰彇绯荤粺鎸夐挳
GetButtons({commit}) {
return new Promise((resolve) => {
--
Gitblit v1.9.3