From 650a84730f4418ebbcdc58bbadd4d56f5dd3c8fd Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 14:01:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/store/modules/user.ts | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 40aa7bf..bf396f3 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -42,9 +42,10 @@
return state.userInfo;
},
- // userId(state) {
- // return state.accountInfo.sub;
- // },
+ userId(state) {
+ //TODO
+ return '';
+ },
},
actions: {
setToken(token: string) {
@@ -58,15 +59,16 @@
// 鐢ㄦ埛鐧诲叆
async loginByUsername(params: API.PasswordLoginCommand) {
- let res = await authServices.authPasswordLogin(
+ let res = await authServices.passwordLogin(
{
...params,
password: md5Encrypt(params.password),
- type: EnumUserType.Operation,
- clientType: EnumClientType.PcWeb,
+ type: AppLocalConfig.userType,
+ clientType: AppLocalConfig.clientType,
},
{
showLoading: false,
+ skipErrorHandler: true,
}
);
if (res) {
@@ -107,7 +109,7 @@
Object.assign(this, getDefaultState());
},
- async refreshToken(params: API.AccessRefreshToken) {
+ async refreshToken(params: any) {
return Promise.resolve({
accessToken: '1222',
expiresIn: 1000 * 60 * 24 * 60,
--
Gitblit v1.9.1