From 7fab3cfc7499b82a72937459d6441f320a62222b Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Tue, 16 Jun 2026 10:56:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EgetBaseGateway=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=8A=A8=E6=80=81=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=9F=BA=E7=A1=80=E6=8E=A5=E5=8F=A3=E7=9A=84gateway?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/LeftTree/Department/Gwj/index.js | 8 ++++---- src/components/Select/Personnel/Gwj/index.js | 4 ++-- src/components/SelectTree/Department/Gwj/index.js | 8 ++++---- src/hooks/useDeleteFile/index.js | 5 +++-- src/hooks/useGetFile/index.js | 4 ++-- src/hooks/useGetUserInfo/index.js | 3 ++- src/hooks/useUploadFile/index.js | 3 ++- src/utils/index.d.ts | 6 ++++++ src/utils/index.js | 9 ++++++++- 9 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/components/LeftTree/Department/Gwj/index.js b/src/components/LeftTree/Department/Gwj/index.js index 09ff964..9be6c89 100644 --- a/src/components/LeftTree/Department/Gwj/index.js +++ b/src/components/LeftTree/Department/Gwj/index.js @@ -1,6 +1,6 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useEffect, useState } from "react"; -import { executeWithCache } from "../../../../utils"; +import { executeWithCache, getBaseGateway } from "../../../../utils"; import BasicLeftTree from "../../Basic"; /** @@ -19,19 +19,19 @@ function DepartmentLeftTree(props) { let requestUrl = ""; const actualParams = { ...params, time: new Date().getTime() }; if (searchType === "current") { - requestUrl = "/basicInfo/department/listTree"; + requestUrl = `/${getBaseGateway()}/department/listTree`; delete actualParams.inType; delete actualParams.enterpriseType; } if (searchType === "all") { - requestUrl = "/basicInfo/department/listAllTree"; + requestUrl = `/${getBaseGateway()}/department/listAllTree`; delete actualParams.inType; delete actualParams.enterpriseType; delete actualParams.eqCorpinfoId; delete actualParams.eqParentId; } if (searchType === "inType") { - requestUrl = "/basicInfo/department/listAllTreeByCorpType"; + requestUrl = `/${getBaseGateway()}/department/listAllTreeByCorpType`; delete actualParams.eqCorpinfoId; delete actualParams.eqParentId; if (actualParams.enterpriseType && !Array.isArray(actualParams.enterpriseType)) { diff --git a/src/components/Select/Personnel/Gwj/index.js b/src/components/Select/Personnel/Gwj/index.js index 7903915..b70162f 100644 --- a/src/components/Select/Personnel/Gwj/index.js +++ b/src/components/Select/Personnel/Gwj/index.js @@ -1,6 +1,6 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useEffect, useState } from "react"; -import { executeWithCache } from "../../../../utils"; +import { executeWithCache, getBaseGateway } from "../../../../utils"; import BasicSelect from "../../Basic"; /** @@ -42,7 +42,7 @@ function PersonnelSelect(props) { const cacheKey = { params, extraParams: actualExtraParams }; await executeWithCache(cacheKey, async () => { - const { data } = await request("/basicInfo/user/listAll", "get", { ...params, ...actualExtraParams, time: new Date().getTime() }); + const { data } = await request(`/${getBaseGateway()}/user/listAll`, "get", { ...params, ...actualExtraParams, time: new Date().getTime() }); return data; }, setData); }; diff --git a/src/components/SelectTree/Department/Gwj/index.js b/src/components/SelectTree/Department/Gwj/index.js index 394996e..cbd8c44 100644 --- a/src/components/SelectTree/Department/Gwj/index.js +++ b/src/components/SelectTree/Department/Gwj/index.js @@ -1,6 +1,6 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useEffect, useState } from "react"; -import { executeWithCache } from "../../../../utils"; +import { executeWithCache, getBaseGateway } from "../../../../utils"; import BasicSelectTree from "../../Basic"; /** @@ -29,19 +29,19 @@ function DepartmentSelectTree(props) { let requestUrl = ""; const actualParams = { ...params, time: new Date().getTime() }; if (searchType === "current") { - requestUrl = "/basicInfo/department/listTree"; + requestUrl = `/${getBaseGateway()}/department/listTree`; delete actualParams.inType; delete actualParams.enterpriseType; } if (searchType === "all") { - requestUrl = "/basicInfo/department/listAllTree"; + requestUrl = `/${getBaseGateway()}/department/listAllTree`; delete actualParams.inType; delete actualParams.enterpriseType; delete actualParams.eqCorpinfoId; delete actualParams.eqParentId; } if (searchType === "inType") { - requestUrl = "/basicInfo/department/listAllTreeByCorpType"; + requestUrl = `/${getBaseGateway()}/department/listAllTreeByCorpType`; delete actualParams.eqCorpinfoId; delete actualParams.eqParentId; if (actualParams.enterpriseType && !Array.isArray(actualParams.enterpriseType)) { diff --git a/src/hooks/useDeleteFile/index.js b/src/hooks/useDeleteFile/index.js index ff7b564..f2d1b60 100644 --- a/src/hooks/useDeleteFile/index.js +++ b/src/hooks/useDeleteFile/index.js @@ -1,5 +1,6 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useState } from "react"; +import { getBaseGateway } from "../../utils"; /** * 删除文件 @@ -73,8 +74,8 @@ function useDeleteFile(returnType = "object") { // 发送请求 request( single - ? `/basicInfo/imgFiles/delete?filePath=${files[0].filePath}` - : `/basicInfo/imgFiles/ids?ids=${files.filter(f => f.id).map(f => f.id)}`, + ? `/${getBaseGateway()}/imgFiles/delete?filePath=${files[0].filePath}` + : `/${getBaseGateway()}/imgFiles/ids?ids=${files.filter(f => f.id).map(f => f.id)}`, "delete", ) .then((res) => { diff --git a/src/hooks/useGetFile/index.js b/src/hooks/useGetFile/index.js index 186c908..d320051 100644 --- a/src/hooks/useGetFile/index.js +++ b/src/hooks/useGetFile/index.js @@ -1,7 +1,7 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useState } from "react"; import { UPLOAD_FILE_TYPE_ENUM } from "../../enum/uploadFile/gwj"; -import { addingPrefixToFile } from "../../utils"; +import { addingPrefixToFile, getBaseGateway } from "../../utils"; /** * 获取文件 @@ -67,7 +67,7 @@ function useGetFile(returnType = "object") { // 发送请求 request( - "/basicInfo/imgFiles/listAll", + `/${getBaseGateway()}/imgFiles/listAll`, "get", params, ) diff --git a/src/hooks/useGetUserInfo/index.js b/src/hooks/useGetUserInfo/index.js index ab18fb7..143b98a 100644 --- a/src/hooks/useGetUserInfo/index.js +++ b/src/hooks/useGetUserInfo/index.js @@ -1,5 +1,6 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useState } from "react"; +import { getBaseGateway } from "../../utils"; /** * 获取用户信息 @@ -21,7 +22,7 @@ function useGetUserInfo(returnType = "object") { return new Promise((resolve, reject) => { // 发送请求 request( - "/basicInfo/user/getInfo", + `/${getBaseGateway()}/user/getInfo`, "get", {}, ) diff --git a/src/hooks/useUploadFile/index.js b/src/hooks/useUploadFile/index.js index 0d9567f..f79298b 100644 --- a/src/hooks/useUploadFile/index.js +++ b/src/hooks/useUploadFile/index.js @@ -1,6 +1,7 @@ import { request } from "@cqsjjb/jjb-common-lib/http.js"; import { useState } from "react"; import { UPLOAD_FILE_PATH_ENUM, UPLOAD_FILE_TYPE_ENUM } from "../../enum/uploadFile/gwj"; +import { getBaseGateway } from "../../utils"; /** * 上传文件 @@ -116,7 +117,7 @@ function useUploadFile(returnType = "object") { // 发送请求 request( - single ? "/basicInfo/imgFiles/save" : "/basicInfo/imgFiles/batchSave", + single ? `/${getBaseGateway()}/imgFiles/save` : `/${getBaseGateway()}/imgFiles/batchSave`, "post", formData, { "Content-Type": "multipart/form-data" }, diff --git a/src/utils/index.d.ts b/src/utils/index.d.ts index 4f6776d..19ae39b 100644 --- a/src/utils/index.d.ts +++ b/src/utils/index.d.ts @@ -273,6 +273,12 @@ export function getIndexColumn(pagination: false | BasePaginationConfig): { * 获取文件url */ export function getFileUrl(): string; + +/** + * 获取基础接口放在哪个gateway服务下 + */ +export function getBaseGateway(): string; + /** * 从服务器获取文件url */ diff --git a/src/utils/index.js b/src/utils/index.js index aecfa9f..db97762 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -606,13 +606,20 @@ export function getFileUrl() { return window.fileUrl || process.env.app["fileUrl"]; } +/** + * 获取基础接口放在哪个gateway服务下 + */ +export function getBaseGateway() { + return window.baseGateway || "basicInfo"; +} + /** * 从服务器获取文件url */ export async function getFileUrlFromServer() { if (window.fileUrl) return; - const { data } = await request("/basicInfo/imgFiles/getImagePath", "get"); + const { data } = await request(`/${getBaseGateway()}/imgFiles/getImagePath`, "get"); window.fileUrl = data; }