From 27da83b45be7ac51c8ae16537db40fbf445d8ad3 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sat, 9 Jul 2022 18:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=93=E5=8C=85=E5=90=8E?=
 =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0jks=E6=96=87=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/TomcatSslConnectorProperties.java  | 25 ++++++++++++++++---
 .../src/main/resources/application-dev.yml    |  2 +-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/config/TomcatSslConnectorProperties.java b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/config/TomcatSslConnectorProperties.java
index 204e17a35..13658cad2 100644
--- a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/config/TomcatSslConnectorProperties.java
+++ b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/config/TomcatSslConnectorProperties.java
@@ -1,23 +1,30 @@
 package com.jero.config;
 
+import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl;
 import lombok.Data;
 import org.apache.catalina.connector.Connector;
+import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.PropertySource;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 
 //@PropertySource("classpath:config/tomcat.https.properties")
 @ConfigurationProperties(prefix = "jero.tomcat.https")
 @Data
 public class TomcatSslConnectorProperties {
 
+    @Value("${jero.path.upload}")
+    private String tempStoreJks;
+
     private Integer port;
     private Boolean ssl = true;
     private Boolean secure = true;
     private String scheme = "https";
-    private File keystore;
+    private String keystore;
     private String keystorePassword;
     private String keystoreType;
     //这里为了节省空间，省略了getters和setters，读者在实践的时候要加上
@@ -36,8 +43,20 @@ public class TomcatSslConnectorProperties {
             connector.setProperty("SSLEnabled", ssl.toString());
         }
 
-        if (keystore != null && keystore.exists()) {
-            connector.setProperty("keystoreFile", keystore.getAbsolutePath());
+        InputStream inputStream = ProjectLawsInventoryEOServiceImpl.class.getClassLoader().getResourceAsStream(keystore);
+
+        String keystorePath = tempStoreJks + File.separator + keystore;
+        File keystoreFile = new File(keystorePath);
+        if (!keystoreFile.exists()){
+            try {
+                FileUtils.copyInputStreamToFile(inputStream, keystoreFile);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (keystoreFile != null && keystoreFile.exists()) {
+            connector.setProperty("keystoreFile", keystorePath);
             connector.setProperty("keystorePass", keystorePassword);
             connector.setProperty("keystoreType", keystoreType);
         }
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index 73617b813..05c434846 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -209,7 +209,7 @@ jero :
       secure: true
       scheme: https
       ssl: true
-      keystore: classpath:grp.jks
+      keystore: grp.jks
       keystorePassword: 501937
       keystoreType: JKS
   shiro: