diff --git a/internal/applicant/applicant.go b/internal/applicant/applicant.go index eb65de1b..992cf3ad 100644 --- a/internal/applicant/applicant.go +++ b/internal/applicant/applicant.go @@ -54,8 +54,8 @@ type Certificate struct { } type ApplyOption struct { + ContactEmail string `json:"contactEmail"` SubjectAltNames string `json:"subjectAltNames"` - Email string `json:"email"` AccessConfig string `json:"accessConfig"` KeyAlgorithm string `json:"keyAlgorithm"` Nameservers string `json:"nameservers"` @@ -132,8 +132,8 @@ func GetWithApplyNode(node *domain.WorkflowNode) (Applicant, error) { } applyConfig := &ApplyOption{ - Email: node.GetConfigString("email"), - SubjectAltNames: node.GetConfigString("domain"), + ContactEmail: node.GetConfigString("contactEmail"), + SubjectAltNames: node.GetConfigString("subjectAltNames"), AccessConfig: access.Config, KeyAlgorithm: node.GetConfigString("keyAlgorithm"), Nameservers: node.GetConfigString("nameservers"), @@ -209,7 +209,7 @@ func apply(option *ApplyOption, provider challenge.Provider) (*Certificate, erro // link: https://github.com/go-acme/lego/issues/1867 os.Setenv("LEGO_DISABLE_CNAME_SUPPORT", strconv.FormatBool(option.DisableFollowCNAME)) - myUser, err := newApplyUser(sslProvider.Provider, option.Email) + myUser, err := newApplyUser(sslProvider.Provider, option.ContactEmail) if err != nil { return nil, err } diff --git a/internal/domain/domains.go b/internal/domain/domains.go index 6ca5cbd3..4794d338 100644 --- a/internal/domain/domains.go +++ b/internal/domain/domains.go @@ -2,7 +2,7 @@ package domain // Deprecated: TODO: 即将废弃 type ApplyConfig struct { - Email string `json:"email"` + ContactEmail string `json:"contactEmail"` ProviderAccessId string `json:"providerAccessId"` KeyAlgorithm string `json:"keyAlgorithm"` Nameservers string `json:"nameservers"` diff --git a/ui/src/components/workflow/node/ApplyNodeForm.tsx b/ui/src/components/workflow/node/ApplyNodeForm.tsx index d01b7386..dd370ebf 100644 --- a/ui/src/components/workflow/node/ApplyNodeForm.tsx +++ b/ui/src/components/workflow/node/ApplyNodeForm.tsx @@ -29,7 +29,7 @@ const MULTIPLE_INPUT_DELIMITER = ";"; const initFormModel = (): Partial => { return { keyAlgorithm: "RSA2048", - propagationTimeout: 120, + propagationTimeout: 60, disableFollowCNAME: true, }; }; @@ -48,7 +48,7 @@ const ApplyNodeForm = ({ node }: ApplyNodeFormProps) => { .split(MULTIPLE_INPUT_DELIMITER) .every((e) => validDomainName(e, true)); }, t("common.errmsg.domain_invalid")), - email: z.string({ message: t("workflow_node.apply.form.email.placeholder") }).email("common.errmsg.email_invalid"), + email: z.string({ message: t("workflow_node.apply.form.contact_email.placeholder") }).email("common.errmsg.email_invalid"), providerAccessId: z .string({ message: t("workflow_node.apply.form.provider_access.placeholder") }) .min(1, t("workflow_node.apply.form.provider_access.placeholder")), @@ -139,12 +139,12 @@ const ApplyNodeForm = ({ node }: ApplyNodeFormProps) => { } + tooltip={} > - + diff --git a/ui/src/i18n/locales/en/nls.workflow.nodes.json b/ui/src/i18n/locales/en/nls.workflow.nodes.json index 9390da12..defe7b09 100644 --- a/ui/src/i18n/locales/en/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/en/nls.workflow.nodes.json @@ -24,9 +24,9 @@ "workflow_node.apply.form.domains.tooltip": "Wildcard domain: *.example.com", "workflow_node.apply.form.domains.multiple_input_modal.title": "Change domains", "workflow_node.apply.form.domains.multiple_input_modal.placeholder": "Please enter domain", - "workflow_node.apply.form.email.label": "Contact email", - "workflow_node.apply.form.email.placeholder": "Please enter contact email", - "workflow_node.apply.form.email.tooltip": "Contact information required for SSL certificate application. Please pay attention to the rate limits.", + "workflow_node.apply.form.contact_email.label": "Contact email", + "workflow_node.apply.form.contact_email.placeholder": "Please enter contact email", + "workflow_node.apply.form.contact_email.tooltip": "Contact information required for SSL certificate application. Please pay attention to the rate limits.", "workflow_node.apply.form.provider_access.label": "DNS provider authorization", "workflow_node.apply.form.provider_access.placeholder": "Please select an authorization of DNS provider", "workflow_node.apply.form.provider_access.tooltip": "Used to manage DNS records during ACME DNS-01 authentication.", diff --git a/ui/src/i18n/locales/zh/nls.workflow.nodes.json b/ui/src/i18n/locales/zh/nls.workflow.nodes.json index 5966fa2d..ff85f528 100644 --- a/ui/src/i18n/locales/zh/nls.workflow.nodes.json +++ b/ui/src/i18n/locales/zh/nls.workflow.nodes.json @@ -24,9 +24,9 @@ "workflow_node.apply.form.domains.tooltip": "泛域名表示形式为:*.example.com", "workflow_node.apply.form.domains.multiple_input_modal.title": "修改域名", "workflow_node.apply.form.domains.multiple_input_modal.placeholder": "请输入域名", - "workflow_node.apply.form.email.label": "联系邮箱", - "workflow_node.apply.form.email.placeholder": "请输入联系邮箱", - "workflow_node.apply.form.email.tooltip": "申请签发 SSL 证书时所需的联系方式。请注意 Let's Encrypt 账户注册的速率限制。
点此了解更多。", + "workflow_node.apply.form.contact_email.label": "联系邮箱", + "workflow_node.apply.form.contact_email.placeholder": "请输入联系邮箱", + "workflow_node.apply.form.contact_email.tooltip": "申请签发 SSL 证书时所需的联系方式。请注意 Let's Encrypt 账户注册的速率限制。
点此了解更多。", "workflow_node.apply.form.provider_access.label": "DNS 提供商授权", "workflow_node.apply.form.provider_access.placeholder": "请选择 DNS 提供商授权", "workflow_node.apply.form.provider_access.tooltip": "用于 ACME DNS-01 认证时操作域名解析记录,注意与部署阶段所需的主机提供商相区分。",