From bb95939f0bdcff7f8040e37eab3fe2be60a65d97 Mon Sep 17 00:00:00 2001 From: 15733181556 Date: Wed, 8 Jun 2022 21:07:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=20=E4=BF=AE=E6=94=B9=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E5=A4=9A-d=20domain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cym/controller/adminPage/CertController.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cym/controller/adminPage/CertController.java b/src/main/java/com/cym/controller/adminPage/CertController.java index 9b3d418c..6e57dbb6 100644 --- a/src/main/java/com/cym/controller/adminPage/CertController.java +++ b/src/main/java/com/cym/controller/adminPage/CertController.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.noear.solon.annotation.Controller; @@ -121,7 +122,10 @@ public class CertController extends BaseController { String[] env = getEnv(cert); if (type.equals("issue")) { - + String[] split = cert.getDomain().split(","); + StringBuffer sb = new StringBuffer(); + Arrays.stream(split).forEach(s -> sb.append(" -d ").append(s)); + String domain = sb.toString(); // 申请 if (cert.getType() == 0) { String dnsType = ""; @@ -136,13 +140,12 @@ public class CertController extends BaseController { } else if (cert.getDnsType().equals("hw")) { dnsType = "dns_huaweicloud"; } - - cmd = homeConfig.acmeSh + " --issue --force --dns " + dnsType + " -d " + cert.getDomain() + keylength + " --server letsencrypt"; + cmd = homeConfig.acmeSh + " --issue --force --dns " + dnsType + domain + keylength + " --server letsencrypt"; } else if (cert.getType() == 2) { if (certService.hasCode(cert.getId())) { - cmd = homeConfig.acmeSh + " --renew --force --dns -d " + cert.getDomain() + " --server letsencrypt --yes-I-know-dns-manual-mode-enough-go-ahead-please"; + cmd = homeConfig.acmeSh + " --renew --force --dns" + domain + " --server letsencrypt --yes-I-know-dns-manual-mode-enough-go-ahead-please"; } else { - cmd = homeConfig.acmeSh + " --issue --force --dns -d " + cert.getDomain() + keylength + " --server letsencrypt --yes-I-know-dns-manual-mode-enough-go-ahead-please"; + cmd = homeConfig.acmeSh + " --issue --force --dns" + domain + keylength + " --server letsencrypt --yes-I-know-dns-manual-mode-enough-go-ahead-please"; } } -- Gitee