From 8910c864efb2446bc2e38df19a41b0611b26aea2 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Sat, 22 Jun 2019 18:18:57 +0800 Subject: [PATCH] =?UTF-8?q?cacert=E6=96=87=E4=BB=B6=E5=A4=B9=E5=88=9B?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 2 +- .../configuration/proxy/PxyObjKeyringController.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index c5ac32f15..969aa86e7 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -721,7 +721,7 @@ public final class Constants { //证书校验文件 public static final String CERT_VALIDATE_FILE=Configurations.getStringProperty("cert_validate_file", "x509"); public static final String CA_CERT_FILE=Configurations.getStringProperty("ca_cert_file", "cacert.sh"); - public static final String CA_CERT_DIR=Configurations.getStringProperty("ca_cert_dir", "cacert"); + public static final String CA_CERT_DIR=Configurations.getStringProperty("ca_cert_dir", "/home/cacert/"); //证书校验成功关键字 public static final String CERT_VALIDATE_SUCCESS_INFO=Configurations.getStringProperty("cert_validate_success_info", "x509"); //内置证书的isser diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index 47197b77f..69bd8a4ca 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -935,9 +935,9 @@ public class PxyObjKeyringController extends BaseController { .getResource(File.separator + "shell" + File.separator + Constants.CA_CERT_FILE).getPath(); this.execShell("", "chmod", "+x", cacert); logger.info(Constants.CA_CERT_FILE+"脚本分配可执行权限:" + "chmod" + " " + "+x" + " " + cacert); - - resultDirPath = Thread.currentThread().getContextClassLoader() - .getResource(File.separator + Constants.CA_CERT_DIR).getPath(); + + FileUtils.createDirectory(Constants.CA_CERT_DIR); + resultDirPath = Constants.CA_CERT_DIR; logger.info("证书列表解析结果目录"+resultDirPath); this.execShell(cacert, certFilePath,resultDirPath); logger.info("内置证书文件生成："+cacert + " " + certFilePath+" "+resultDirPath);