From 1b602ba053af06651d5c8f50146866d98f82934c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 三月 2025 11:12:29 +0800
Subject: [PATCH] #修改 1.库位size字段,修改为长,宽, 高(完成 2.货架批量处理(完成 3.库位初始化功能(完成 4.筛选导出(完成 5.库位可绑定多种类型(中,高,低),可使用类型批量修改库位信息(完成 6.库位信息添加一个使用状态 (出库预约,入库预约,在库,空库,禁用, 空板)(完成 7.物料模板导出添加扩展字段

---
 rsf-admin/src/config/authProvider.js |   37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/rsf-admin/src/config/authProvider.js b/rsf-admin/src/config/authProvider.js
index b74bab3..97820b0 100644
--- a/rsf-admin/src/config/authProvider.js
+++ b/rsf-admin/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: () => {

--
Gitblit v1.9.1