|
@@ -27,31 +27,31 @@ public class ElasticsearchConfig {
|
|
* 连接超时时间
|
|
* 连接超时时间
|
|
*/
|
|
*/
|
|
@Value("${jeecg.elasticsearch.connect-timeout}")
|
|
@Value("${jeecg.elasticsearch.connect-timeout}")
|
|
- private int connectTimeOut = 1000;
|
|
|
|
|
|
+ private String connectTimeOut = "1000";
|
|
|
|
|
|
/**
|
|
/**
|
|
* 连接超时时间
|
|
* 连接超时时间
|
|
*/
|
|
*/
|
|
@Value("${jeecg.elasticsearch.socket-timeout}")
|
|
@Value("${jeecg.elasticsearch.socket-timeout}")
|
|
- private int socketTimeOut = 30000;
|
|
|
|
|
|
+ private String socketTimeOut = "30000";
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取连接的超时时间
|
|
* 获取连接的超时时间
|
|
*/
|
|
*/
|
|
@Value("${jeecg.elasticsearch.connection-request-timeout}")
|
|
@Value("${jeecg.elasticsearch.connection-request-timeout}")
|
|
- private int connectionRequestTimeOut = 500;
|
|
|
|
|
|
+ private String connectionRequestTimeOut = "500";
|
|
|
|
|
|
/**
|
|
/**
|
|
* 最大连接数
|
|
* 最大连接数
|
|
*/
|
|
*/
|
|
@Value("${jeecg.elasticsearch.max-connect-num}")
|
|
@Value("${jeecg.elasticsearch.max-connect-num}")
|
|
- private int maxConnectNum = 100;
|
|
|
|
|
|
+ private String maxConnectNum = "100";
|
|
|
|
|
|
/**
|
|
/**
|
|
* 最大路由连接数
|
|
* 最大路由连接数
|
|
*/
|
|
*/
|
|
@Value("${jeecg.elasticsearch.max-connect-per-route}")
|
|
@Value("${jeecg.elasticsearch.max-connect-per-route}")
|
|
- private int maxConnectPerRoute = 100;
|
|
|
|
|
|
+ private String maxConnectPerRoute = "100";
|
|
|
|
|
|
|
|
|
|
@Bean
|
|
@Bean
|
|
@@ -68,9 +68,9 @@ public class ElasticsearchConfig {
|
|
builder.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
|
|
builder.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
|
|
@Override
|
|
@Override
|
|
public RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder requestConfigBuilder) {
|
|
public RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder requestConfigBuilder) {
|
|
- requestConfigBuilder.setConnectTimeout(connectTimeOut);
|
|
|
|
- requestConfigBuilder.setSocketTimeout(socketTimeOut);
|
|
|
|
- requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeOut);
|
|
|
|
|
|
+ requestConfigBuilder.setConnectTimeout(Integer.parseInt(connectTimeOut));
|
|
|
|
+ requestConfigBuilder.setSocketTimeout(Integer.parseInt(socketTimeOut));
|
|
|
|
+ requestConfigBuilder.setConnectionRequestTimeout(Integer.parseInt(connectionRequestTimeOut));
|
|
return requestConfigBuilder;
|
|
return requestConfigBuilder;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -78,8 +78,8 @@ public class ElasticsearchConfig {
|
|
builder.setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
|
|
builder.setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
|
|
@Override
|
|
@Override
|
|
public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
|
|
public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
|
|
- httpClientBuilder.setMaxConnTotal(maxConnectNum);
|
|
|
|
- httpClientBuilder.setMaxConnPerRoute(maxConnectPerRoute);
|
|
|
|
|
|
+ httpClientBuilder.setMaxConnTotal(Integer.parseInt(maxConnectNum));
|
|
|
|
+ httpClientBuilder.setMaxConnPerRoute(Integer.parseInt(maxConnectPerRoute));
|
|
return httpClientBuilder;
|
|
return httpClientBuilder;
|
|
}
|
|
}
|
|
});
|
|
});
|