Merge branch 'main' into feat/multiple-certificate-formats

ui/src/i18n/locales/zh/nls.access.json

@@ -69,7 +69,7 @@
   "access.authorization.form.ssh_key_passphrase.placeholder": "请输入 Key 口令",
   "access.authorization.form.webhook_url.label": "Webhook URL",
   "access.authorization.form.webhook_url.placeholder": "请输入 Webhook URL",
-  "access.authorization.form.k8s_kubeconfig.label": "KubeConfig",
+  "access.authorization.form.k8s_kubeconfig.label": "KubeConfig（不选将使用Pod的ServiceAccount）",
   "access.authorization.form.k8s_kubeconfig.placeholder": "请输入 KubeConfig",
   "access.authorization.form.k8s_kubeconfig_file.placeholder": "请选择文件",
 

ui/src/i18n/locales/zh/nls.common.json

@@ -51,19 +51,26 @@
   "common.errmsg.host_invalid": "请输入正确的域名或 IP 地址",
   "common.errmsg.ip_invalid": "请输入正确的 IP 地址",
   "common.errmsg.url_invalid": "请输入正确的 URL",
+  "common.errmsg.zoneid_invalid": "请输入正确的 Zone ID",
+
   "common.provider.aliyun": "阿里云",
-  "common.provider.aliyun.oss": "阿里云 - OSS",
-  "common.provider.aliyun.cdn": "阿里云 - CDN",
-  "common.provider.aliyun.dcdn": "阿里云 - DCDN",
+  "common.provider.aliyun.oss": "阿里云 - 对象存储 OSS",
+  "common.provider.aliyun.cdn": "阿里云 - 内容分发网络 CDN",
+  "common.provider.aliyun.dcdn": "阿里云 - 全站加速 DCDN",
+  "common.provider.aliyun.clb": "阿里云 - 传统型负载均衡 CLB",
+  "common.provider.aliyun.alb": "阿里云 - 应用型负载均衡 ALB",
+  "common.provider.aliyun.nlb": "阿里云 - 网络型负载均衡 NLB",
   "common.provider.tencent": "腾讯云",
-  "common.provider.tencent.cos": "腾讯云 - COS",
-  "common.provider.tencent.cdn": "腾讯云 - CDN",
-  "common.provider.tencent.clb": "腾讯云 - CLB",
+  "common.provider.tencent.cos": "腾讯云 - 对象存储 COS",
+  "common.provider.tencent.cdn": "腾讯云 - 内容分发网络 CDN",
+  "common.provider.tencent.ecdn": "腾讯云 - 全站加速网络 ECDN",
+  "common.provider.tencent.clb": "腾讯云 - 负载均衡 CLB",
+  "common.provider.tencent.teo": "腾讯云 - 边缘安全加速平台 EO",
   "common.provider.huaweicloud": "华为云",
-  "common.provider.huaweicloud.cdn": "华为云 - CDN",
-  "common.provider.huaweicloud.elb": "华为云 - ELB",
+  "common.provider.huaweicloud.cdn": "华为云 - 内容分发网络 CDN",
+  "common.provider.huaweicloud.elb": "华为云 - 弹性负载均衡 ELB",
   "common.provider.qiniu": "七牛云",
-  "common.provider.qiniu.cdn": "七牛云 - CDN",
+  "common.provider.qiniu.cdn": "七牛云 - 内容分发网络 CDN",
   "common.provider.aws": "AWS",
   "common.provider.cloudflare": "Cloudflare",
   "common.provider.namesilo": "Namesilo",
@@ -73,9 +80,11 @@
   "common.provider.local": "本地部署",
   "common.provider.ssh": "SSH 部署",
   "common.provider.webhook": "Webhook",
+  "common.provider.serverchan": "Server酱",
   "common.provider.kubernetes": "Kubernetes",
   "common.provider.kubernetes.secret": "Kubernetes - Secret",
   "common.provider.dingtalk": "钉钉",
   "common.provider.telegram": "Telegram",
   "common.provider.lark": "飞书"
 }
+

ui/src/i18n/locales/zh/nls.domain.json

@@ -61,6 +61,36 @@
   "domain.deployment.form.aliyun_oss_endpoint.placeholder": "请输入 Endpoint",
   "domain.deployment.form.aliyun_oss_bucket.label": "存储桶",
   "domain.deployment.form.aliyun_oss_bucket.placeholder": "请输入存储桶名",
+  "domain.deployment.form.aliyun_clb_region.label": "地域",
+  "domain.deployment.form.aliyun_clb_region.placeholder": "请输入地域（如 cn-hangzhou）",
+  "domain.deployment.form.aliyun_clb_resource_type.label": "替换方式",
+  "domain.deployment.form.aliyun_clb_resource_type.placeholder": "请选择替换方式",
+  "domain.deployment.form.aliyun_clb_resource_type.option.loadbalancer.label": "替换指定负载均衡器的全部监听的证书（仅支持 HTTPS 监听）",
+  "domain.deployment.form.aliyun_clb_resource_type.option.listener.label": "替换指定负载均衡监听的证书",
+  "domain.deployment.form.aliyun_clb_loadbalancer_id.label": "负载均衡器 ID",
+  "domain.deployment.form.aliyun_clb_loadbalancer_id.placeholder": "请输入负载均衡器 ID",
+  "domain.deployment.form.aliyun_clb_listener_port.label": "监听端口",
+  "domain.deployment.form.aliyun_clb_listener_port.placeholder": "请输入监听端口",
+  "domain.deployment.form.aliyun_alb_region.label": "地域",
+  "domain.deployment.form.aliyun_alb_region.placeholder": "请输入地域（如 cn-hangzhou）",
+  "domain.deployment.form.aliyun_alb_resource_type.label": "替换方式",
+  "domain.deployment.form.aliyun_alb_resource_type.placeholder": "请选择替换方式",
+  "domain.deployment.form.aliyun_alb_resource_type.option.loadbalancer.label": "替换指定负载均衡器的全部监听的证书（仅支持 HTTPS/QUIC 监听）",
+  "domain.deployment.form.aliyun_alb_resource_type.option.listener.label": "替换指定监听器的证书",
+  "domain.deployment.form.aliyun_alb_loadbalancer_id.label": "负载均衡器 ID",
+  "domain.deployment.form.aliyun_alb_loadbalancer_id.placeholder": "请输入负载均衡器 ID",
+  "domain.deployment.form.aliyun_alb_listener_id.label": "监听器 ID",
+  "domain.deployment.form.aliyun_alb_listener_id.placeholder": "请输入监听器 ID",
+  "domain.deployment.form.aliyun_nlb_region.label": "地域",
+  "domain.deployment.form.aliyun_nlb_region.placeholder": "请输入地域（如 cn-hangzhou）",
+  "domain.deployment.form.aliyun_nlb_resource_type.label": "替换方式",
+  "domain.deployment.form.aliyun_nlb_resource_type.placeholder": "请选择替换方式",
+  "domain.deployment.form.aliyun_nlb_resource_type.option.loadbalancer.label": "替换指定负载均衡器的全部监听的证书（仅支持 TCPSSL 监听）",
+  "domain.deployment.form.aliyun_nlb_resource_type.option.listener.label": "替换指定监听器的证书",
+  "domain.deployment.form.aliyun_nlb_loadbalancer_id.label": "负载均衡器 ID",
+  "domain.deployment.form.aliyun_nlb_loadbalancer_id.placeholder": "请输入负载均衡器 ID",
+  "domain.deployment.form.aliyun_nlb_listener_id.label": "监听器 ID",
+  "domain.deployment.form.aliyun_nlb_listener_id.placeholder": "请输入监听器 ID",
   "domain.deployment.form.tencent_cos_region.label": "地域",
   "domain.deployment.form.tencent_cos_region.placeholder": "请输入地域（如 ap-guangzhou）",
   "domain.deployment.form.tencent_cos_bucket.label": "存储桶",
@@ -73,19 +103,23 @@
   "domain.deployment.form.tencent_clb_listener.placeholder": "请输入监听器 ID（如 lb-xxxxxxxx）",
   "domain.deployment.form.tencent_clb_domain.label": "部署到域名（支持泛域名）",
   "domain.deployment.form.tencent_clb_domain.placeholder": "请输入部署到的域名, 如未开启 SNI, 可置空忽略此项",
+  "domain.deployment.form.tencent_teo_zone_id.label": "Zone ID",
+  "domain.deployment.form.tencent_teo_zone_id.placeholder": "请输入 Zone ID",
+  "domain.deployment.form.tencent_teo_domain.label": "部署到域名（支持泛域名, 应与服务器上配置的域名完全一致, 每行一个域名）",
+  "domain.deployment.form.tencent_teo_domain.placeholder": "请输入部署到的域名",
   "domain.deployment.form.huaweicloud_elb_region.label": "地域",
   "domain.deployment.form.huaweicloud_elb_region.placeholder": "请输入地域（如 cn-north-1）",
-  "domain.deployment.form.huaweicloud_elb_resource_type.label": "资源类型替换方式",
-  "domain.deployment.form.huaweicloud_elb_resource_type.placeholder": "请选择资源类型替换方式",
-  "domain.deployment.form.huaweicloud_elb_resource_type.option.certificate.label": "按证书替换",
-  "domain.deployment.form.huaweicloud_elb_resource_type.option.loadbalancer.label": "按负载均衡器替换",
-  "domain.deployment.form.huaweicloud_elb_resource_type.option.listener.label": "按监听器替换",
+  "domain.deployment.form.huaweicloud_elb_resource_type.label": "替换方式",
+  "domain.deployment.form.huaweicloud_elb_resource_type.placeholder": "请选择替换方式",
+  "domain.deployment.form.huaweicloud_elb_resource_type.option.certificate.label": "替换指定证书",
+  "domain.deployment.form.huaweicloud_elb_resource_type.option.loadbalancer.label": "替换指定负载均衡器的全部监听器的证书（仅支持 HTTPS 监听）",
+  "domain.deployment.form.huaweicloud_elb_resource_type.option.listener.label": "替换指定监听器",
   "domain.deployment.form.huaweicloud_elb_certificate_id.label": "证书 ID",
-  "domain.deployment.form.huaweicloud_elb_certificate_id.placeholder": "请输入证书 ID（可从华为云控制面板获取）",
+  "domain.deployment.form.huaweicloud_elb_certificate_id.placeholder": "请输入证书 ID",
   "domain.deployment.form.huaweicloud_elb_loadbalancer_id.label": "负载均衡器 ID",
-  "domain.deployment.form.huaweicloud_elb_loadbalancer_id.placeholder": "请输入负载均衡器 ID（可从华为云控制面板获取）",
+  "domain.deployment.form.huaweicloud_elb_loadbalancer_id.placeholder": "请输入负载均衡器 ID",
   "domain.deployment.form.huaweicloud_elb_listener_id.label": "监听器 ID",
-  "domain.deployment.form.huaweicloud_elb_listener_id.placeholder": "请输入监听器 ID（可从华为云控制面板获取）",
+  "domain.deployment.form.huaweicloud_elb_listener_id.placeholder": "请输入监听器 ID",
   "domain.deployment.form.file_format.label": "证书格式",
   "domain.deployment.form.file_format.placeholder": "请选择证书格式",
   "domain.deployment.form.file_cert_path.label": "证书保存路径",

ui/src/i18n/locales/zh/nls.settings.json

@@ -35,6 +35,7 @@
   "settings.notification.config.push.test.message.success.message": "推送测试消息成功",
   "settings.notification.dingtalk.secret.placeholder": "加签的签名",
   "settings.notification.url.errmsg.invalid": "URL 格式不正确",
+  "settings.notification.serverchan.url.placeholder": "Url, 形如: https://sctapi.ftqq.com/****************.send",
 
   "settings.ca.tab": "证书颁发机构（CA）",
   "settings.ca.provider.errmsg.empty": "请选择证书分发机构",