From b3cd0b749e427c5c8e4dba8e9f01c6cff51d07d7 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 19 一月 2026 12:47:44 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/i18n/en.js | 2 +-
zy-acs-framework/src/main/java/com/zy/acs/framework/common/R.java | 6 +++---
zy-acs-flow/src/i18n/zh.js | 2 +-
zy-acs-flow/src/config/authProvider.js | 37 ++++++++++++++++++-------------------
zy-acs-flow/src/api/auth/index.js | 5 +----
5 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/zy-acs-flow/src/api/auth/index.js b/zy-acs-flow/src/api/auth/index.js
index 8030bdf..68bd7ea 100644
--- a/zy-acs-flow/src/api/auth/index.js
+++ b/zy-acs-flow/src/api/auth/index.js
@@ -18,10 +18,7 @@
export async function login(_params) {
const res = await request.post('/login', _params);
- if (res.data.code === 200) {
- return res.data.data;
- }
- return Promise.reject(new Error(res.data.msg));
+ return res.data;
}
export async function register(_params) {
diff --git a/zy-acs-flow/src/config/authProvider.js b/zy-acs-flow/src/config/authProvider.js
index b74bab3..97820b0 100644
--- a/zy-acs-flow/src/config/authProvider.js
+++ b/zy-acs-flow/src/config/authProvider.js
@@ -6,31 +6,30 @@
const AuthProvider = {
// login
- login: async ({ username, password }) => {
-
- const { accessToken, user } = await login({
+ login: async ({ username, password, tenantId }) => {
+ const { code, msg, data } = await login({
username: username,
password: password,
- hostId: 1,
- });
+ tenantId: tenantId,
+ })
- if (user && accessToken) {
- const userToPersist = {
- avatar: avatar,
- fullName: user.nickname,
- id: user.id,
- username: user.username
+ if (code === 200) {
+ const { accessToken, user, tenant } = data;
+ if (user && accessToken) {
+ const userToPersist = {
+ avatar: avatar,
+ fullName: user.nickname,
+ id: user.id,
+ username: user.username,
+ tenant: tenant,
+ }
+ setToken(accessToken);
+ localStorage.setItem("user", JSON.stringify(userToPersist));
+ return Promise.resolve();
}
- setToken(accessToken);
- localStorage.setItem("user", JSON.stringify(userToPersist));
- return Promise.resolve();
}
- return Promise.reject(
- new HttpError("Unauthorized", 401, {
- message: "Invalid username or password",
- }),
- );
+ return Promise.reject({ code, msg, data });
},
// logout
logout: () => {
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 3de40c3..5e2ec9b 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -601,7 +601,7 @@
page: {
login: {
title: 'Welcome to',
- footer: 'footer',
+ footer: 'version 3.7.1',
tenant: 'Company',
email: 'Email Address',
username: 'Username',
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 20c8866..b9db6c8 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -601,7 +601,7 @@
page: {
login: {
title: '娆㈣繋浣跨敤',
- footer: 'footer',
+ footer: 'version 3.7.1',
tenant: '鍏徃',
email: '閭鍦板潃',
username: '鐧诲綍璐﹀彿',
diff --git a/zy-acs-framework/src/main/java/com/zy/acs/framework/common/R.java b/zy-acs-framework/src/main/java/com/zy/acs/framework/common/R.java
index 491497b..80590a4 100644
--- a/zy-acs-framework/src/main/java/com/zy/acs/framework/common/R.java
+++ b/zy-acs-framework/src/main/java/com/zy/acs/framework/common/R.java
@@ -52,9 +52,9 @@
return parse(BaseRes.ERROR);
}
String[] msg = message.split("-");
- if(msg.length==2){
- return new R(Integer.parseInt(msg[0]),msg[1]);
- }else{
+ if (msg.length == 2) {
+ return new R(Integer.parseInt(msg[0].replaceAll(" ", "")), msg[1]);
+ } else {
return parse("500-".concat(message));
}
}
--
Gitblit v1.9.1