diff --git a/src/main/java/com/cym/controller/adminPage/CertController.java b/src/main/java/com/cym/controller/adminPage/CertController.java index 0e81f952ce63c3c2961bd45562c5368e016a4768..ab37d9750afa911c3a6b3f11f643dd53af43e943 100644 --- a/src/main/java/com/cym/controller/adminPage/CertController.java +++ b/src/main/java/com/cym/controller/adminPage/CertController.java @@ -221,10 +221,14 @@ public class CertController extends BaseController { cert.setMakeTime(System.currentTimeMillis()); sqlHelper.updateById(cert); + //复制fullchain.cer改为域名.crt 如果存在强制覆盖 + confController.cpCert(certDir,domain); // 续签,重载nginx使证书生效 if (type.equals("renew")) { confController.reload(null, null, null); + //证书续签成功执行目录下reload.sh脚本 + confController.reloadSH(certDir,domain); } isInApply = false; diff --git a/src/main/java/com/cym/controller/adminPage/ConfController.java b/src/main/java/com/cym/controller/adminPage/ConfController.java index fb1510c99e7d43308f79784740eb7891b71d5a8d..153ee658be3125c8408ffbbc035bd325c1e9c68a 100644 --- a/src/main/java/com/cym/controller/adminPage/ConfController.java +++ b/src/main/java/com/cym/controller/adminPage/ConfController.java @@ -276,6 +276,40 @@ public class ConfController extends BaseController { return renderSuccess(); } + + + @Mapping(value = "cpCert") + public synchronized void cpCert(String certDir,String domain) { + try { + String cer=certDir + "fullchain.cer"; + String cpCmd="cp -rf "+cer+" "+certDir+domain+ ".crt"; + String cp = RuntimeUtil.execForStr(cpCmd); + + } catch (Exception e) { + logger.error(e.getMessage(), e); + } + + } + + @Mapping(value = "reloadSH") + public synchronized void reloadSH(String certDir,String domain) { + logger.info("start running reload.sh"); + try { + String reload=homeConfig.home+"reload.sh"; + File reloadFile=new File(reload); + if(reloadFile.exists()){ + cpCert(certDir,domain); + String cmd="sh "+reload; + String rs = RuntimeUtil.execForStr(cmd); + logger.info(rs); + } + + } catch (Exception e) { + logger.error(e.getMessage(), e); + } + + } + @Mapping(value = "reload") public synchronized JsonResult reload(String nginxPath, String nginxExe, String nginxDir) { if (nginxPath == null) {