From a90d1e68ee9cbc3705223457b8a86f071b150968 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 25 Oct 2024 21:47:28 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=85=AC=E5=85=B1ZeroSSL=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin-cert/src/plugin/cert-plugin/base.ts | 2 +- .../plugin-cert/src/plugin/cert-plugin/index.ts | 4 ++-- .../plugins/cert/dns-provider-selector/index.vue | 6 +++--- .../certd-client/src/views/sys/plugin/config.vue | 14 +++++++++++--- .../src/plugins/plugin-host/access/ssh-access.ts | 2 +- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts index e42b235b..ec3b7cbe 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts @@ -40,7 +40,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { name: "a-input", vModel: "value", }, - rules: [{ type: "email" }], + rules: [{ type: "email", message: "请输入正确的邮箱" }], required: true, order: -1, helper: "请输入邮箱", diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts index 34037a17..2c842da4 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts @@ -162,7 +162,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { maybeNeed: true, required: false, helper: - "需要提供EAB授权\nZeroSSL:请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials'\n Google:请查看[google获取eab帮助文档](https://gitee.com/certd/certd/blob/v2/doc/google/google.md),用过一次后会绑定邮箱,后续复用EAB要用同一个邮箱", + "需要提供EAB授权\nZeroSSL:请前往[zerossl开发者中心](https://app.zerossl.com/developer),生成 'EAB Credentials'\n Google:请查看[google获取eab帮助文档](https://certd.docmirror.cn/guide/use/google/),用过一次后会绑定邮箱,后续复用EAB要用同一个邮箱", mergeScript: ` return { show: ctx.compute(({form})=>{ @@ -182,7 +182,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { maybeNeed: true, required: false, helper: - "google服务账号授权与EAB授权选填其中一个,[服务账号授权获取方法](https://gitee.com/certd/certd/blob/v2/doc/google/google.md)\n服务账号授权需要配置代理或者服务器本身在海外", + "google服务账号授权与EAB授权选填其中一个,[服务账号授权获取方法](https://certd.docmirror.cn/guide/use/google/)\n服务账号授权需要配置代理或者服务器本身在海外", mergeScript: ` return { show: ctx.compute(({form})=>{ diff --git a/packages/ui/certd-client/src/components/plugins/cert/dns-provider-selector/index.vue b/packages/ui/certd-client/src/components/plugins/cert/dns-provider-selector/index.vue index 74a241bd..201631a4 100644 --- a/packages/ui/certd-client/src/components/plugins/cert/dns-provider-selector/index.vue +++ b/packages/ui/certd-client/src/components/plugins/cert/dns-provider-selector/index.vue @@ -28,9 +28,9 @@ export default { }); } options.value = array; - if (props.modelValue == null && options.value.length > 0) { - ctx.emit("update:modelValue", options.value[0].value); - } + // if (props.modelValue == null && options.value.length > 0) { + // ctx.emit("update:modelValue", options.value[0].value); + // } } onCreate(); diff --git a/packages/ui/certd-client/src/views/sys/plugin/config.vue b/packages/ui/certd-client/src/views/sys/plugin/config.vue index dc4565c4..bc7fa447 100644 --- a/packages/ui/certd-client/src/views/sys/plugin/config.vue +++ b/packages/ui/certd-client/src/views/sys/plugin/config.vue @@ -11,9 +11,17 @@
设置公共Google EAB授权给用户使用,避免用户自己去翻墙获取Google EAB授权
- - 获取Google EAB授权方法 - + 获取Google EAB授权方法 +
+
+ + + + +
+
设置公共ZeroSSL EAB授权给用户使用,避免用户自己去翻墙获取Zero EAB授权,注意:ZeroSSL免费证书有数量限制
+
+ zerossl开发者中心获取EAB
diff --git a/packages/ui/certd-server/src/plugins/plugin-host/access/ssh-access.ts b/packages/ui/certd-server/src/plugins/plugin-host/access/ssh-access.ts index 9fc59140..f5cc66eb 100644 --- a/packages/ui/certd-server/src/plugins/plugin-host/access/ssh-access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-host/access/ssh-access.ts @@ -78,7 +78,7 @@ export class SshAccess extends BaseAccess implements ConnectConfig { @AccessInput({ title: '是否Windows', - helper: '如果是Windows主机,请勾选此项\n并且需要windows[安装OpenSSH](https://gitee.com/certd/certd/blob/v2/doc/host/host.md)', + helper: '如果是Windows主机,请勾选此项\n并且需要windows[安装OpenSSH](https://certd.docmirror.cn/guide/use/host/windows.html)', component: { name: 'a-switch', vModel: 'checked',