diff --git a/packages/libs/lib-server/src/system/settings/service/models.ts b/packages/libs/lib-server/src/system/settings/service/models.ts index d7fa1c5d7..b6aa632f7 100644 --- a/packages/libs/lib-server/src/system/settings/service/models.ts +++ b/packages/libs/lib-server/src/system/settings/service/models.ts @@ -133,12 +133,12 @@ export class SysPrivateSettings extends BaseSettings { // 内置项不在此配置 Directory URL:其端点由运行时按加密算法(pkType)通过 acme.getDirectoryUrl 获取, // 例如 ZeroSSL、SSL.com 的 RSA 与 EC 证书使用不同的端点,写死单一 URL 会导致 EC 申请走错端点。 customAcmeProviders?: CustomAcmeProvider[] = [ - { sslProvider: "letsencrypt", title: "Let's Encrypt", directoryUrl: "", needEAB: false, builtIn: true }, - { sslProvider: "letsencrypt_staging", title: "Let's Encrypt测试环境", directoryUrl: "", needEAB: false, builtIn: true }, + { sslProvider: "letsencrypt", title: "Let's Encrypt(支持7天IP证书)", directoryUrl: "", needEAB: false, builtIn: true }, { sslProvider: "google", title: "Google", directoryUrl: "", needEAB: true, builtIn: true }, { sslProvider: "zerossl", title: "ZeroSSL", directoryUrl: "", needEAB: true, builtIn: true }, - { sslProvider: "litessl", title: "litessl", directoryUrl: "", needEAB: true, builtIn: true }, + { sslProvider: "litessl", title: "Litessl", directoryUrl: "", needEAB: true, builtIn: true }, { sslProvider: "sslcom", title: "SSL.com", directoryUrl: "", needEAB: true, builtIn: true }, + { sslProvider: "letsencrypt_staging", title: "Let's Encrypt测试环境(只能生成测试证书)", directoryUrl: "", needEAB: false, builtIn: true }, ]; removeSecret() { diff --git a/packages/ui/certd-client/src/store/plugin/index.ts b/packages/ui/certd-client/src/store/plugin/index.ts index b9f375aa2..5de4fdfb4 100644 --- a/packages/ui/certd-client/src/store/plugin/index.ts +++ b/packages/ui/certd-client/src/store/plugin/index.ts @@ -26,6 +26,14 @@ export function fillPluginDefine(plugin: any) { if (plugin.sysSetting?.metadata) { merge(plugin.input, plugin.sysSetting.metadata?.input || {}); + const keys = Object.keys(plugin.input); + for (const key of keys) { + //修复旧版本错误引入的key导致报错的问题 【多引入进了一个type=CertApply】 + const column = plugin.input[key]; + if (typeof column != "object") { + delete plugin.input[key]; + } + } // 应用选项映射 for (const key of Object.keys(plugin.input)) { const inputDef = plugin.input[key]; diff --git a/packages/ui/certd-client/src/views/sys/plugin/config-editor.vue b/packages/ui/certd-client/src/views/sys/plugin/config-editor.vue index a593a94b3..200343b4c 100644 --- a/packages/ui/certd-client/src/views/sys/plugin/config-editor.vue +++ b/packages/ui/certd-client/src/views/sys/plugin/config-editor.vue @@ -68,7 +68,7 @@ const labelCol = ref({ }, }); const wrapperCol = ref({ span: 16 }); -const configForm: any = reactive({ type: props.plugin.fullName || props.plugin.name }); +const configForm: any = reactive({}); const showDict = dict({ data: [ @@ -306,7 +306,6 @@ provide("get:scope", () => { return getScope(); }); provide("get:plugin:type", () => { - debugger; return props.plugin.pluginType; });