Merge branch 'v2' into v2-dev

v2-dev-plugin-config
xiaojunnuo 2025-08-25 21:52:50 +08:00
commit 5419b1439a
2 changed files with 4 additions and 5 deletions

View File

@ -91,7 +91,6 @@
"jsonwebtoken": "^9.0.0", "jsonwebtoken": "^9.0.0",
"jszip": "^3.10.1", "jszip": "^3.10.1",
"koa-send": "^5.0.1", "koa-send": "^5.0.1",
"ksyun-sdk-node": "^1.2.4",
"kubernetes-client": "^9.0.0", "kubernetes-client": "^9.0.0",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"log4js": "^6.7.1", "log4js": "^6.7.1",

View File

@ -17,14 +17,14 @@ import { CertApplyPluginNames} from '@certd/plugin-cert';
export class WoaiCdnPlugin extends AbstractTaskPlugin { export class WoaiCdnPlugin extends AbstractTaskPlugin {
@TaskInput({ @TaskInput({
title: '接口地址(可留空)', title: '接口地址(可留空)',
helper: '请填写我爱云的地址, 默认为 [API](https://console.edeg.sxhjgy.cn) 末尾请不要携带`/`', helper: '请填写我爱云的地址, 默认为 [API](https://console.edge.ttzi.cn) 末尾请不要携带`/`',
component: { name: 'a-input' }, component: { name: 'a-input' },
required: false, required: false,
}) })
baseApi?: string; baseApi?: string;
@TaskInput({ @TaskInput({
title: '证书ID', title: '证书ID',
helper: '请填写 [证书列表](https://console.edge.sxhjgy.cn/site/certificate) 中的证书的ID', helper: '请填写 [证书列表](https://console.edge.ttzi.cn/site/certificate) 中的证书的ID',
component: { name: 'a-input' }, component: { name: 'a-input' },
required: true, required: true,
}) })
@ -73,9 +73,9 @@ export class WoaiCdnPlugin extends AbstractTaskPlugin {
const { baseApi, certId, cert, accessId } = this; const { baseApi, certId, cert, accessId } = this;
const access = (await this.getAccess(accessId)) as WoaiAccess; const access = (await this.getAccess(accessId)) as WoaiAccess;
// 使用默认值或用户输入的值 // 使用默认值或用户输入的值
const apiBase = baseApi || 'https://console.edeg.sxhjgy.cn'; const apiBase = baseApi || 'https://console.edge.ttzi.cn';
// 登录获取token // 登录获取token
const loginResponse = await this.doRequestApi(`${apiBase}/account/login`, { const loginResponse = await this.doRequestApi(`${apiBase}/login`, {
username: access.username, username: access.username,
password: access.password, password: access.password,
}); });