From 0110dfdb70b12dfb0a7a067717f3773ed75aae7c Mon Sep 17 00:00:00 2001 From: XiaoJun Date: Wed, 5 Mar 2025 21:02:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DCDN=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E6=88=91=E7=88=B1=E4=BA=91=E5=9B=A0=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=BC=E8=87=B4=E9=83=A8=E7=BD=B2=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin-woai/plugins/plugin-deploy-to-cdn.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/ui/certd-server/src/plugins/plugin-woai/plugins/plugin-deploy-to-cdn.ts b/packages/ui/certd-server/src/plugins/plugin-woai/plugins/plugin-deploy-to-cdn.ts index 1972519c..97bdbde7 100644 --- a/packages/ui/certd-server/src/plugins/plugin-woai/plugins/plugin-deploy-to-cdn.ts +++ b/packages/ui/certd-server/src/plugins/plugin-woai/plugins/plugin-deploy-to-cdn.ts @@ -15,9 +15,16 @@ import { WoaiAccess } from '../access.js'; }, }) export class WoaiCdnPlugin extends AbstractTaskPlugin { + @TaskInput({ + title: '接口地址(可留空)', + helper: '请填写我爱云的地址, 默认为 [API](https://console.edeg.sxhjgy.cn) 末尾请不要携带`/`', + component: { name: 'a-input' }, + required: false, + }) + baseApi?: string; @TaskInput({ title: '证书ID', - helper: '请填写 [证书列表](https://console.edge.51vs.club/site/certificate) 中的证书的ID', + helper: '请填写 [证书列表](https://console.edge.sxhjgy.cn/site/certificate) 中的证书的ID', component: { name: 'a-input' }, required: true, }) @@ -42,7 +49,6 @@ export class WoaiCdnPlugin extends AbstractTaskPlugin { required: true, }) accessId!: string; - private readonly baseApi = 'https://console.edeg.51vs.club'; async onInstance() {} @@ -66,8 +72,10 @@ export class WoaiCdnPlugin extends AbstractTaskPlugin { async execute(): Promise { const { certId, cert, accessId } = this; const access = (await this.accessService.getById(accessId)) as WoaiAccess; + // 使用默认值或用户输入的值 + const apiBase = this.baseApi || 'https://console.edeg.sxhjgy.cn'; // 登录获取token - const loginResponse = await this.doRequestApi(`${this.baseApi}/account/login`, { + const loginResponse = await this.doRequestApi(`${apiBase}/account/login`, { username: access.username, password: access.password, }); @@ -75,7 +83,7 @@ export class WoaiCdnPlugin extends AbstractTaskPlugin { this.logger.info('登录成功,获取到Token:', token); // 更新证书 const editCertResponse = await this.doRequestApi( - `${this.baseApi}/certificate/edit`, + `${apiBase}/certificate/edit`, { id: certId, cert: cert.crt, From 5641c19502970f67af19709bddf8c781b1a25bdc Mon Sep 17 00:00:00 2001 From: XiaoJun Date: Wed, 5 Mar 2025 21:20:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DCDN=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E6=88=91=E7=88=B1=E4=BA=91=E5=9B=A0=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=BC=E8=87=B4=E9=83=A8=E7=BD=B2=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/plugin-deploy-to-cdn.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/ui/certd-server/src/plugins/plugin-woai/plugins/plugin-deploy-to-cdn.ts b/packages/ui/certd-server/src/plugins/plugin-woai/plugins/plugin-deploy-to-cdn.ts index 1972519c..60c9604d 100644 --- a/packages/ui/certd-server/src/plugins/plugin-woai/plugins/plugin-deploy-to-cdn.ts +++ b/packages/ui/certd-server/src/plugins/plugin-woai/plugins/plugin-deploy-to-cdn.ts @@ -15,9 +15,16 @@ import { WoaiAccess } from '../access.js'; }, }) export class WoaiCdnPlugin extends AbstractTaskPlugin { + @TaskInput({ + title: '接口地址(可留空)', + helper: '请填写我爱云的地址, 默认为 [API](https://console.edeg.sxhjgy.cn) 末尾请不要携带`/`', + component: { name: 'a-input' }, + required: false, + }) + baseApi?: string; @TaskInput({ title: '证书ID', - helper: '请填写 [证书列表](https://console.edge.51vs.club/site/certificate) 中的证书的ID', + helper: '请填写 [证书列表](https://console.edge.sxhjgy.cn/site/certificate) 中的证书的ID', component: { name: 'a-input' }, required: true, }) @@ -42,7 +49,6 @@ export class WoaiCdnPlugin extends AbstractTaskPlugin { required: true, }) accessId!: string; - private readonly baseApi = 'https://console.edeg.51vs.club'; async onInstance() {} @@ -64,10 +70,12 @@ export class WoaiCdnPlugin extends AbstractTaskPlugin { } async execute(): Promise { - const { certId, cert, accessId } = this; + const { baseApi, certId, cert, accessId } = this; const access = (await this.accessService.getById(accessId)) as WoaiAccess; + // 使用默认值或用户输入的值 + const apiBase = baseApi || 'https://console.edeg.sxhjgy.cn'; // 登录获取token - const loginResponse = await this.doRequestApi(`${this.baseApi}/account/login`, { + const loginResponse = await this.doRequestApi(`${apiBase}/account/login`, { username: access.username, password: access.password, }); @@ -75,7 +83,7 @@ export class WoaiCdnPlugin extends AbstractTaskPlugin { this.logger.info('登录成功,获取到Token:', token); // 更新证书 const editCertResponse = await this.doRequestApi( - `${this.baseApi}/certificate/edit`, + `${apiBase}/certificate/edit`, { id: certId, cert: cert.crt,