diff --git a/.env b/.env index b4ae1fd2..5ca9025c 100644 --- a/.env +++ b/.env @@ -19,3 +19,6 @@ SHOPRO_STATIC_URL = https://file.sheepjs.com # 是否开启直播 1 开启直播 | 0 关闭直播 (小程序官方后台未审核开通直播权限时请勿开启) SHOPRO_MPLIVE_ON = 0 + +# 多租户配置 +SHOPRO_TENANT_ID = 1 diff --git a/sheep/api/infra/file.js b/sheep/api/infra/file.js index a4bac46f..1d02b293 100644 --- a/sheep/api/infra/file.js +++ b/sheep/api/infra/file.js @@ -1,4 +1,6 @@ -import { baseUrl, apiPath } from '@/sheep/config'; +import { apiPath, baseUrl } from '@/sheep/config'; + +const tenantId = import.meta.env.TENANT_ID; const FileApi = { // 上传文件 @@ -15,8 +17,8 @@ const FileApi = { name: 'file', header: { // Accept: 'text/json', - Accept : '*/*', - 'tenant-id' :'1', + Accept: '*/*', + 'tenant-id': tenantId, // Authorization: 'Bearer test247', }, success: (uploadFileRes) => { diff --git a/sheep/config/index.js b/sheep/config/index.js index 209a9dcd..90f21c12 100644 --- a/sheep/config/index.js +++ b/sheep/config/index.js @@ -11,9 +11,11 @@ console.log(`[芋道商城 ${version}] http://doc.iocoder.cn`); export const apiPath = import.meta.env.SHOPRO_API_PATH; export const staticUrl = import.meta.env.SHOPRO_STATIC_URL; +export const tenantId = import.meta.env.SHOPRO_TENANT_ID; export default { baseUrl, apiPath, staticUrl, + tenantId }; diff --git a/sheep/request/index.js b/sheep/request/index.js index 99c38a4f..0f42a169 100644 --- a/sheep/request/index.js +++ b/sheep/request/index.js @@ -4,7 +4,7 @@ */ import Request from 'luch-request'; -import { baseUrl, apiPath } from '@/sheep/config'; +import { baseUrl, apiPath, tenantId } from '@/sheep/config'; import $store from '@/sheep/store'; import $platform from '@/sheep/platform'; import { @@ -97,8 +97,8 @@ http.interceptors.request.use( } // TODO 芋艿:特殊处理 config.header['Accept'] = '*/*' - config.header['tenant-id'] = '1'; - config.header['terminal'] = '20'; + config.header['tenant-id'] = tenantId; + config.header['terminal'] = '10'; // config.header['Authorization'] = 'Bearer test247'; return config; }, @@ -299,4 +299,4 @@ const request = (config) => { return http.middleware(config); }; -export default request; \ No newline at end of file +export default request;