From 91fc1cd7353be4a22be951239ed70b38baebc74e Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 11 Oct 2024 03:13:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8BbindUrl=E5=A4=B1=E8=B4=A5=E7=9A=84bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/system/basic/service/plus-service.ts | 24 ++++++----- packages/ui/certd-server/.env.commdev.yaml | 22 +++++----- packages/ui/certd-server/.env.commpro.yaml | 40 +++++++++++++++++++ packages/ui/certd-server/package.json | 1 + 4 files changed, 65 insertions(+), 22 deletions(-) create mode 100644 packages/ui/certd-server/.env.commpro.yaml diff --git a/packages/libs/lib-server/src/system/basic/service/plus-service.ts b/packages/libs/lib-server/src/system/basic/service/plus-service.ts index 1c288860..803308d6 100644 --- a/packages/libs/lib-server/src/system/basic/service/plus-service.ts +++ b/packages/libs/lib-server/src/system/basic/service/plus-service.ts @@ -1,4 +1,4 @@ -import { Config, Init, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core'; +import { Config, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core'; import { AppKey, PlusRequestService, verify } from '@certd/pipeline'; import { logger } from '@certd/basic'; import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from '../../settings/index.js'; @@ -11,26 +11,26 @@ export class PlusService { @Config('plus.server.baseUrls') plusServerBaseUrls: string[]; - plusRequestService: PlusRequestService; - - @Init() - async init() { + async getPlusRequestService() { const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo); - this.plusRequestService = new PlusRequestService({ + return new PlusRequestService({ plusServerBaseUrls: this.plusServerBaseUrls, subjectId: installInfo.siteId, }); } async requestWithoutSign(config: any) { - return await this.plusRequestService.requestWithoutSign(config); + const plusRequestService = await this.getPlusRequestService(); + return await plusRequestService.requestWithoutSign(config); } async request(config: any) { - return await this.plusRequestService.request(config); + const plusRequestService = await this.getPlusRequestService(); + return await plusRequestService.request(config); } async active(formData: { code: any; appKey: string; subjectId: string }) { - return await this.plusRequestService.requestWithoutSign({ + const plusRequestService = await this.getPlusRequestService(); + return await plusRequestService.requestWithoutSign({ url: '/activation/active', method: 'post', data: formData, @@ -55,16 +55,18 @@ export class PlusService { const licenseInfo: SysLicenseInfo = await this.sysSettingsService.getSetting(SysLicenseInfo); const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo); + const plusRequestService = await this.getPlusRequestService(); return await verify({ subjectId: installInfo.siteId, license: licenseInfo.license, - plusRequestService: this.plusRequestService, + plusRequestService: plusRequestService, bindUrl: installInfo?.bindUrl, }); } async bindUrl(subjectId: string, url: string) { - return await this.plusRequestService.request({ + const plusRequestService = await this.getPlusRequestService(); + return await plusRequestService.request({ url: '/activation/subject/urlBind', data: { subjectId, diff --git a/packages/ui/certd-server/.env.commdev.yaml b/packages/ui/certd-server/.env.commdev.yaml index 33b3b677..db01752f 100644 --- a/packages/ui/certd-server/.env.commdev.yaml +++ b/packages/ui/certd-server/.env.commdev.yaml @@ -22,19 +22,19 @@ typeorm: default: database: './data/db-comm.sqlite' -plus: - server: - baseUrls: ['https://api.ai.handsfree.work', 'https://api.ai.docmirror.cn'] - -account: - server: - baseUrl: 'https://ai.handsfree.work/subject' - -# #plus: # server: -# baseUrls: ['http://127.0.0.1:11007'] +# baseUrls: ['https://api.ai.handsfree.work', 'https://api.ai.docmirror.cn'] # #account: # server: -# baseUrl: 'http://127.0.0.1:1017/subject' +# baseUrl: 'https://ai.handsfree.work/subject' + + +plus: + server: + baseUrls: ['http://127.0.0.1:11007'] + +account: + server: + baseUrl: 'http://127.0.0.1:1017/subject' diff --git a/packages/ui/certd-server/.env.commpro.yaml b/packages/ui/certd-server/.env.commpro.yaml new file mode 100644 index 00000000..4494c90d --- /dev/null +++ b/packages/ui/certd-server/.env.commpro.yaml @@ -0,0 +1,40 @@ +# key: ./data/ssl/cert.key +# cert: ./data/ssl/cert.crt +#plus: +# server: +# baseUrl: 'http://127.0.0.1:11007' + +#flyway: +# scriptDir: './db/migration-pg' + +#typeorm: +# dataSource: +# default: +# type: postgres +# host: localhost +# port: 5433 +# username: postgres +# password: root +# database: postgres + +typeorm: + dataSource: + default: + database: './data/db-comm-pro.sqlite' + +plus: + server: + baseUrls: ['https://api.ai.handsfree.work', 'https://api.ai.docmirror.cn'] + +account: + server: + baseUrl: 'https://ai.handsfree.work/subject' + +# +#plus: +# server: +# baseUrls: ['http://127.0.0.1:11007'] +# +#account: +# server: +# baseUrl: 'http://127.0.0.1:1017/subject' diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 09f5dfa5..16792984 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -8,6 +8,7 @@ "start": "cross-env NODE_ENV=production node ./bootstrap.js", "dev": "cross-env NODE_ENV=local mwtsc --watch --run @midwayjs/mock/app", "commdev": "cross-env NODE_ENV=commdev mwtsc --watch --run @midwayjs/mock/app", + "commpro": "cross-env NODE_ENV=commpro mwtsc --watch --run @midwayjs/mock/app", "pgdev": "cross-env NODE_ENV=pgdev mwtsc --watch --run @midwayjs/mock/app", "test": "cross-env NODE_ENV=unittest mocha", "cov": "cross-env c8 --all --reporter=text --reporter=lcovonly npm run test",