From 7532a960851b84d4f2cc3dba02353c5235e1a364 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 30 Sep 2024 00:22:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E8=A2=AB=E5=B1=8F=E8=94=BD=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=BF=80=E6=B4=BB=E4=B8=93=E4=B8=9A=E7=89=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/pipeline/src/utils/util.request.ts | 3 ++- packages/ui/certd-server/.env.development.yaml | 3 ++- packages/ui/certd-server/.env.production.yaml | 3 +-- packages/ui/certd-server/src/config/config.default.ts | 2 +- .../certd-server/src/modules/basic/service/plus-service.ts | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/core/pipeline/src/utils/util.request.ts b/packages/core/pipeline/src/utils/util.request.ts index c76c6b79..735eadb2 100644 --- a/packages/core/pipeline/src/utils/util.request.ts +++ b/packages/core/pipeline/src/utils/util.request.ts @@ -8,7 +8,7 @@ export class HttpError extends Error { status?: number; statusText?: string; code?: string; - request?: { url: string; method: string; params?: any; data?: any }; + request?: { baseURL: string; url: string; method: string; params?: any; data?: any }; response?: { data: any }; cause?: any; constructor(error: any) { @@ -23,6 +23,7 @@ export class HttpError extends Error { this.status = error.response?.status; this.statusText = error.response?.statusText; this.request = { + baseURL: error.config?.baseURL, url: error.config?.url, method: error.config?.method, params: error.config?.params, diff --git a/packages/ui/certd-server/.env.development.yaml b/packages/ui/certd-server/.env.development.yaml index aeeac74f..992ae443 100644 --- a/packages/ui/certd-server/.env.development.yaml +++ b/packages/ui/certd-server/.env.development.yaml @@ -3,9 +3,10 @@ #plus: # server: # baseUrl: 'http://127.0.0.1:11007' + plus: server: - baseUrl: 'https://api.ai.handsfree.work' + baseUrls: ['https://api.ai.handsfree.work', 'https://api.ai.docmirror.cn'] #typeorm: # dataSource: # default: diff --git a/packages/ui/certd-server/.env.production.yaml b/packages/ui/certd-server/.env.production.yaml index db3436c4..98c5d969 100644 --- a/packages/ui/certd-server/.env.production.yaml +++ b/packages/ui/certd-server/.env.production.yaml @@ -9,8 +9,7 @@ typeorm: plus: server: - baseUrl: 'https://api.ai.handsfree.work' - + baseUrls: ['https://api.ai.handsfree.work', 'https://api.ai.docmirror.cn'] account: server: baseUrl: 'https://ai.handsfree.work/subject' diff --git a/packages/ui/certd-server/src/config/config.default.ts b/packages/ui/certd-server/src/config/config.default.ts index d5a1ffc0..7d6be59d 100644 --- a/packages/ui/certd-server/src/config/config.default.ts +++ b/packages/ui/certd-server/src/config/config.default.ts @@ -86,7 +86,7 @@ const development = { resetAdminPasswd: false, }, plus: { - serverBaseUrl: 'http://127.0.0.1:11007', + serverBaseUrls: ['http://127.0.0.1:11007'], }, } as MidwayConfig; mergeConfig(development, 'development'); diff --git a/packages/ui/certd-server/src/modules/basic/service/plus-service.ts b/packages/ui/certd-server/src/modules/basic/service/plus-service.ts index 6021d60f..14164124 100644 --- a/packages/ui/certd-server/src/modules/basic/service/plus-service.ts +++ b/packages/ui/certd-server/src/modules/basic/service/plus-service.ts @@ -9,8 +9,8 @@ import { logger } from '../../../utils/logger.js'; export class PlusService { @Inject() sysSettingsService: SysSettingsService; - @Config('plus.server.baseUrl') - plusServerBaseUrl; + @Config('plus.server.baseUrls') + plusServerBaseUrls: string[]; plusRequestService: PlusRequestService; @@ -18,7 +18,7 @@ export class PlusService { async init() { const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo); this.plusRequestService = new PlusRequestService({ - plusServerBaseUrl: this.plusServerBaseUrl, + plusServerBaseUrls: this.plusServerBaseUrls, http: http, logger, subjectId: installInfo.siteId,