From 96def3b411546abe5e3e704138e64fa35926bb28 Mon Sep 17 00:00:00 2001 From: xudan Date: Mon, 16 Jun 2025 16:00:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?token=E5=92=8C=E7=A7=9F=E6=88=B7ID=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +++++- src/services/http.ts | 28 +++++++++++++++++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index df9a476..953bb31 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,7 @@ ENV_APP_TITLE=运输控制系统(开发) # ENV_HTTP_BASE=/mocks -ENV_WEBSOCKET_BASE=/ws \ No newline at end of file +ENV_WEBSOCKET_BASE=/ws + +# 开发环境token配置 - 可以手动设置或从另一个项目获取后填入 +ENV_DEV_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3NTAzMzkwMTcsInVzZXJuYW1lIjoiYWRtaW4ifQ.uGWMIPH9-sdyEwr0bQBMKQSTAjYBZhlIVDRHGtheENE +ENV_DEV_TENANT_ID=1000 \ No newline at end of file diff --git a/src/services/http.ts b/src/services/http.ts index 845ca40..1c0ff06 100644 --- a/src/services/http.ts +++ b/src/services/http.ts @@ -11,15 +11,29 @@ export default http; // 添加请求拦截器 http.interceptors.request.use( - (config) => { + async (config) => { try { - const token = - JSON.parse(localStorage.getItem('VWED_AMR调度系统__PRODUCTION__3.7.1__COMMON__LOCAL__KEY__') || '{}')?.value - .TOKEN__.value || ''; + let token = ''; + let tenantId = ''; + + // 开发环境处理逻辑 + if (import.meta.env.DEV) { + try { + token = import.meta.env.ENV_DEV_TOKEN; + tenantId = import.meta.env.ENV_DEV_TENANT_ID; + } catch (error) { + console.error('获取开发环境token失败:', error); + } + } else { + // 生产环境直接从localStorage获取 + const localStorageData = JSON.parse( + localStorage.getItem('VWED_AMR调度系统__PRODUCTION__3.7.1__COMMON__LOCAL__KEY__') || '{}', + ); + token = localStorageData?.value?.TOKEN__?.value || ''; + tenantId = localStorageData?.value?.TENANT_ID?.value || ''; + } + config.headers['x-access-token'] = token; - const tenantId = - JSON.parse(localStorage.getItem('VWED_AMR调度系统__PRODUCTION__3.7.1__COMMON__LOCAL__KEY__') || '{}')?.value - .TENANT_ID.value || ''; config.headers['x-tenant-id'] = tenantId; console.log(config); } catch (error) {