From 0c7005a79b6dfccc2d25d98defb350de99c672d2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 十一月 2024 16:22:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/store/modules/user.js | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 cc12802..d4a78eb 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,9 +63,10 @@
//鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
LoginByUsername({commit}, userInfo) {
return new Promise((resolve, reject) => {
- loginByUsername(userInfo.deptId, userInfo.roleId, userInfo.username, 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.code === 200) {
+ if (data.obj.failCode === 'loginSuccess') {
commit('SET_TOKEN', data.obj.tokenVO.accessToken);
commit('SET_REFRESH_TOKEN', data.obj.tokenVO.accessToken);
commit('DEL_ALL_TAG');
@@ -76,15 +78,10 @@
}).catch(err => {
console.log(err)
})
-
- } else {
- Message({
- message: data.msg,
- type: 'error'
- })
}
- resolve();
+ resolve(data);
}).catch(error => {
+ // console.log(error)
reject(error);
})
})
--
Gitblit v1.9.3