Commit 351a08d9 authored by 郑建's avatar 郑建

修改key文件读取方式

parent a16693a8
......@@ -60,6 +60,13 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......
......@@ -23,9 +23,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.util.ClassUtils;
import javax.net.ssl.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.*;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.security.KeyManagementException;
......@@ -91,7 +89,7 @@ public class HttpClientConfig {
return true;
HttpClientContext clientContext = HttpClientContext.adapt(arg2);
HttpRequest request = clientContext.getRequest();
if (!(request instanceof HttpEntityEnclosingRequest)) // 如果请求被认为是幂等的,那么就重试。即重复执行不影响程序其他效果的
if (!(request instanceof HttpEntityEnclosingRequest)) // 如果请求被认为是幂等的,那么就重试。即重复执行不影响程序其他效果的
return true;
return false;
}
......@@ -125,11 +123,11 @@ public class HttpClientConfig {
return null;
}
};
String classesPath = this.getClass().getClassLoader().getResource("niwodai/").getPath();
String classesPath = "/niwodai";
KeyStore keyStore = KeyStore.getInstance("PKCS12");
keyStore.load(new FileInputStream(new File(classesPath + "qg-keystore.jks")), "password".toCharArray());
keyStore.load(new FileInputStream(asFile(readJarFile(classesPath + "/qg-keystore.jks"))), "password".toCharArray());
SSLContext sslcontext = SSLContexts.custom()
.loadTrustMaterial(new File(classesPath + "qg-truststore.jks"), "password".toCharArray(), new TrustSelfSignedStrategy())
.loadTrustMaterial(asFile(readJarFile(classesPath + "/qg-truststore.jks")), "password".toCharArray(), new TrustSelfSignedStrategy())
.loadKeyMaterial(keyStore, "password".toCharArray())
.build();
SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
......@@ -169,4 +167,21 @@ public class HttpClientConfig {
.setKeepAliveStrategy(keepAliveStrategy)
.build();
}
private static InputStream readJarFile(String fileName) throws IOException
{
return HttpClientConfig.class.getResourceAsStream(fileName);
}
public static File asFile(InputStream inputStream) throws IOException{
File tmp = File.createTempFile("trustKey", ".jks", new File(""));
OutputStream os = new FileOutputStream(tmp);
int bytesRead = 0;
byte[] buffer = new byte[8192];
while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
os.write(buffer, 0, bytesRead);
}
inputStream.close();
return tmp;
}
}
package com.quantgroup.asset.distribution.model.entity.fund;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class FundConfigSimulationVO implements Serializable {
private static final long serialVersionUID = 1L;
private List<FundConfigCondition> conditionsCase;
private List<FundConfigCondition.Condition> conditionsType;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment