From 6bdd659dcba1cf3a4f0041cb050e3495861609c0 Mon Sep 17 00:00:00 2001 From: jinnrry Date: Wed, 3 Jul 2024 20:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=87=AA=E5=8A=A8DNS?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=AA=8C=E8=AF=81=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/src/i18n/i18n.js | 8 +- fe/src/views/SetupView.vue | 2 +- server/config/config.go | 18 +- server/config/config.json | 1 - server/controllers/setup.go | 41 +- server/go.mod | 214 +- server/go.sum | 2278 ------------------ server/services/setup/ssl/dnsProvide.go | 130 +- server/services/setup/ssl/dnsProvide_test.go | 69 +- server/services/setup/ssl/ssl.go | 35 +- 10 files changed, 156 insertions(+), 2640 deletions(-) diff --git a/fe/src/i18n/i18n.js b/fe/src/i18n/i18n.js index aa25e37..d973653 100644 --- a/fe/src/i18n/i18n.js +++ b/fe/src/i18n/i18n.js @@ -63,11 +63,11 @@ var lang = { "web_domain": "Web Domain", "dns_desc": "Please add the following information to your DNS records", "ssl_auto": "Automatically configure SSL certificates (recommended)", - "wait_desc":"HTTP challenge mode completes in approximately 1 minute and DNS API challenge mode completes in approximately 10 minutes.", + "wait_desc": "HTTP challenge mode completes in approximately 1 minute.", "ssl_challenge_type":"Challenge Type", "ssl_auto_http":"Http Request", "ssl_auto_dns":"DNS Records", - "challenge_typ_desc":"If PMail uses port 80 directly, it is recommended that you use the HTTP challenge method. If PMail does not use port 80 directly, it is recommended to use DNS challenge method, DNS API key to ask your domain name service provider to apply.", + "challenge_typ_desc": "If PMail uses port 80 directly, it is recommended that you use the HTTP challenge method.", "oomain_service_provider":"Domain Name Service Provider", "ssl_manuallyf": "Manually configure an SSL certificate", "ssl_key_path": "ssl key file path", @@ -175,8 +175,8 @@ var zhCN = { "ssl_auto_dns":"DNS记录", "ssl_challenge_type":"验证方式", "ssl_manuallyf": "手动配置SSL证书", - "challenge_typ_desc":"如果PMail直接使用80端口，建议使用HTTP验证方式。如果PMail没有直接使用80端口，建议使用DNS验证方式，DNS API Key找你的域名服务商申请", - "wait_desc":"HTTP验证模式大约1分钟完成，DNS API验证模式大约15分钟完成。", + "challenge_typ_desc": "如果PMail直接使用80端口，建议使用HTTP验证方式。", + "wait_desc": "HTTP验证模式大约1分钟完成", "ssl_key_path": "ssl key文件位置", "ssl_crt_path": "ssl crt文件位置", "group_settings": "分组", diff --git a/fe/src/views/SetupView.vue b/fe/src/views/SetupView.vue index 6fb226e..f43831d 100644 --- a/fe/src/views/SetupView.vue +++ b/fe/src/views/SetupView.vue @@ -142,7 +142,7 @@ - +