From b8795df41dbcdbca0e023f99ffeec5ce519cee0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 10 Dec 2018 13:42:01 +0800 Subject: [PATCH] =?UTF-8?q?es=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangjia-job/fangjia-job-basicdata/pom.xml | 21 ++++- .../basicdata/config/ElasticSearchConfig.java | 84 +++++++++++++++++++ .../job/basicdata/config/SpringEsConfig.java | 2 +- .../basicdata/job/EsfDealPriceSyncEsJob.java | 3 +- .../main/resources/application-dev.properties | 4 +- .../src/main/resources/applicationContext.xml | 6 +- fangjia-job/pom.xml | 4 +- 7 files changed, 114 insertions(+), 10 deletions(-) create mode 100644 fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/config/ElasticSearchConfig.java diff --git a/fangjia-job/fangjia-job-basicdata/pom.xml b/fangjia-job/fangjia-job-basicdata/pom.xml index 9b3c029..0dead40 100644 --- a/fangjia-job/fangjia-job-basicdata/pom.xml +++ b/fangjia-job/fangjia-job-basicdata/pom.xml @@ -82,7 +82,12 @@ fastjson 1.2.51 - + + + org.elasticsearch.client + x-pack-transport + 6.4.2 + @@ -97,4 +102,18 @@ + + + + + elasticsearch-releases + https://artifacts.elastic.co/maven + + true + + + false + + + diff --git a/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/config/ElasticSearchConfig.java b/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/config/ElasticSearchConfig.java new file mode 100644 index 0000000..80441af --- /dev/null +++ b/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/config/ElasticSearchConfig.java @@ -0,0 +1,84 @@ +package com.fangjia.job.basicdata.config; + +import java.net.InetAddress; + +import org.elasticsearch.client.transport.TransportClient; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.transport.TransportAddress; +import org.elasticsearch.xpack.client.PreBuiltXPackTransportClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +@Configuration +public class ElasticSearchConfig { + + private Logger logger = LoggerFactory.getLogger(ElasticSearchConfig.class); + + /** + * ES集群名称 + */ + @Value("${spring.data.elasticsearch.cluster-name:fangjia}") + private String clusterName; + + /** + * ES用户名 + */ + @Value("${spring.data.elasticsearch.username:elastic}") + private String username; + + /** + * ES密码 + */ + @Value("${spring.data.elasticsearch.password:goojia123456}") + private String password; + + /** + * ES证书地址 + */ + @Value("${spring.data.elasticsearch.keystore-path:C:\\opt\\settings\\elastic-certificates.p12}") + private String keystorePath; + + /** + * ES集群节点 + */ + @Value("${spring.data.elasticsearch.cluster-nodes:192.168.0.228:9300}") + private String clusterNodes; + + /** + * ES心跳间隔 + */ + @Value("${spring.data.elasticsearch.ping_timeout:5s}") + private String pingTimeout; + + @SuppressWarnings("resource") + @Bean + @Primary + public TransportClient transportClient() { + try { + Settings.Builder builder = Settings.builder() + .put("client.transport.ping_timeout", pingTimeout) + .put("cluster.name", clusterName) + .put("xpack.security.user", username + ":" + password) + .put("xpack.security.transport.ssl.enabled", "true") + .put("xpack.security.transport.ssl.truststore.path", keystorePath) + .put("xpack.security.transport.ssl.keystore.path", keystorePath) + .put("xpack.security.transport.ssl.verification_mode", "certificate"); + Settings settings = builder.build(); + String[] nodes = clusterNodes.split(","); + TransportAddress[] addressArray = new TransportAddress[nodes.length]; + for (int i = 0; i < nodes.length; i++) { + String[] nodeArray = nodes[i].split(":"); + addressArray[i] = new TransportAddress(InetAddress.getByName(nodeArray[0]), Integer.parseInt(nodeArray[1])); + } + return new PreBuiltXPackTransportClient(settings).addTransportAddresses(addressArray); + } catch (Exception e) { + logger.error("初始化ESClient异常", e); + } + return null; + } + +} diff --git a/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/config/SpringEsConfig.java b/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/config/SpringEsConfig.java index bd96515..9a42c1a 100644 --- a/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/config/SpringEsConfig.java +++ b/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/config/SpringEsConfig.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -@Configuration +//@Configuration public class SpringEsConfig { @Value("${es.url}") diff --git a/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/job/EsfDealPriceSyncEsJob.java b/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/job/EsfDealPriceSyncEsJob.java index 675eaa0..c3e52d3 100644 --- a/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/job/EsfDealPriceSyncEsJob.java +++ b/fangjia-job/fangjia-job-basicdata/src/main/java/com/fangjia/job/basicdata/job/EsfDealPriceSyncEsJob.java @@ -34,6 +34,7 @@ public class EsfDealPriceSyncEsJob implements SimpleJob { private MongoTemplate businessMongoTemplate; @Autowired + @Qualifier("transportClient") private TransportClient transportClient; @Override @@ -48,7 +49,7 @@ public class EsfDealPriceSyncEsJob implements SimpleJob { ac.incrementAndGet(); String id = data.get("_id").toString(); data.removeField("_id"); - bulkRequest.add(transportClient.prepareIndex("esf_deal_price_ls","doc") + bulkRequest.add(transportClient.prepareIndex("esf_deal_price","doc") .setSource(JsonUtils.toJson(data), XContentType.JSON) .setId(id)); index++; diff --git a/fangjia-job/fangjia-job-basicdata/src/main/resources/application-dev.properties b/fangjia-job/fangjia-job-basicdata/src/main/resources/application-dev.properties index 0abfbe4..d15c35f 100644 --- a/fangjia-job/fangjia-job-basicdata/src/main/resources/application-dev.properties +++ b/fangjia-job/fangjia-job-basicdata/src/main/resources/application-dev.properties @@ -1,4 +1,4 @@ -mongo.business.url=114.80.150.198 +mongo.business.url=192.168.0.136 mongo.business.name=business mongo.business.port=27017 @@ -14,7 +14,7 @@ spring.datasource.log.driver-class-name=com.mysql.jdbc.Driver zk.server-lists=192.168.10.124:2181 zk.namespace=fangjia-job-basicdata -es.url=192.168.0.45 +es.url=192.168.0.228 es.cluster.name=fangjia es.206.url=192.168.0.206 diff --git a/fangjia-job/fangjia-job-basicdata/src/main/resources/applicationContext.xml b/fangjia-job/fangjia-job-basicdata/src/main/resources/applicationContext.xml index 02060fe..72d91c2 100644 --- a/fangjia-job/fangjia-job-basicdata/src/main/resources/applicationContext.xml +++ b/fangjia-job/fangjia-job-basicdata/src/main/resources/applicationContext.xml @@ -34,11 +34,11 @@ overwrite="true" event-trace-rdb-data-source="elasticJobLog"> --> - - + overwrite="true" event-trace-rdb-data-source="elasticJobLog"> +