Merge branch 'FSHJOB1.2' into 'master'

Fshjob1.2

See merge request !41
This commit is contained in:
虞继恩
2018-12-30 11:03:31 +08:00
11 changed files with 138 additions and 23 deletions
+20 -1
View File
@@ -82,7 +82,12 @@
<artifactId>fastjson</artifactId>
<version>1.2.51</version>
</dependency>
<!-- add the x-pack jar as a dependency -->
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>x-pack-transport</artifactId>
<version>6.4.2</version>
</dependency>
</dependencies>
<build>
@@ -97,4 +102,18 @@
</plugin>
</plugins>
</build>
<repositories>
<!-- add the elasticsearch repo -->
<repository>
<id>elasticsearch-releases</id>
<url>https://artifacts.elastic.co/maven</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
</project>
@@ -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;
}
}
@@ -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}")
@@ -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++;
@@ -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
@@ -34,11 +34,11 @@
overwrite="true" event-trace-rdb-data-source="elasticJobLog"> -->
<!-- 二手成交数据导入ES任务 -->
<!-- <job:simple id="esfDealPriceSyncEsJob" class="com.fangjia.job.basicdata.job.EsfDealPriceSyncEsJob" registry-center-ref="regCenter"
<job:simple id="esfDealPriceSyncEsJob" class="com.fangjia.job.basicdata.job.EsfDealPriceSyncEsJob" registry-center-ref="regCenter"
sharding-total-count="1" cron="0/10 * * * * ?" sharding-item-parameters=""
failover="true" description="【基础数据处理任务】二手成交数据导入ES任务"
overwrite="true" event-trace-rdb-data-source="elasticJobLog"> -->
overwrite="true" event-trace-rdb-data-source="elasticJobLog">
</job:simple>
<!-- 拍卖数据导入ES任务 -->
<!-- <job:simple id="auctionDataSyncEsJob" class="com.fangjia.job.basicdata.job.AuctionDataSyncEsJob" registry-center-ref="regCenter"
sharding-total-count="1" cron="0/10 * * * * ?" sharding-item-parameters=""
@@ -5,13 +5,16 @@ package com.fangjia.job.fsh;
* @author yinjihuan
*/
import java.util.concurrent.CountDownLatch;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.annotation.ImportResource;
import com.fangjia.job.fsh.config.InitBeanConfig;
@SpringBootApplication
@SpringBootApplication(exclude = {MongoAutoConfiguration.class,MongoDataAutoConfiguration.class})
@ImportResource(locations = { "classpath:applicationContext*.xml" })
public class FshJobApp {
@@ -1,7 +1,9 @@
package com.fangjia.job.fsh.config;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.mongodb.MongoDbFactory;
@@ -10,15 +12,19 @@ import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper;
import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import com.mongodb.MongoClient;
import com.mongodb.MongoClientOptions;
import com.mongodb.MongoCredential;
import com.mongodb.ServerAddress;
@Configuration
public class SpringMongoConfig {
public @Bean MongoDbFactory mongoDbFactory() throws Exception {
List<ServerAddress> seeds = Arrays.asList(new ServerAddress("mongo.db.fangjia.com", 27017));
List<ServerAddress> seeds = Arrays.asList(
new ServerAddress("mongo.db.fangjia.com", 28017),
new ServerAddress("secondary.mongo.db.fangjia.com", 28017));
MongoClientOptions.Builder builder = new MongoClientOptions.Builder();
int connPerHost = 10;
builder.connectionsPerHost(connPerHost);
@@ -29,7 +35,9 @@ public class SpringMongoConfig {
int timeOut = 60000;
builder.connectTimeout(timeOut);
MongoClientOptions options = builder.build();
MongoClient mongoClient = new MongoClient(seeds, options);
List<MongoCredential> cres = new ArrayList<>();
cres.add(MongoCredential.createCredential("developer", "admin", "G00IDCDEV12385".toCharArray()));
MongoClient mongoClient = new MongoClient(seeds, cres, options);
return new SimpleMongoDbFactory(mongoClient, "fangjia_fsh");
}
@@ -1,19 +1,13 @@
spring.data.mongodb.uri=mongodb://mongo.db.fangjia.com/fangjia_fsh
spring.datasource.url=jdbc:mysql://mysql.db.fangjia.com:4306/fangjia_fsh
spring.datasource.username=sa
spring.datasource.password=G00jia
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
#spring.datasource.log.url=jdbc:mysql://192.168.0.41:4306/batch_log
#spring.datasource.log.username=root
#spring.datasource.log.password=Ga041243
#spring.datasource.log.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.log.url=jdbc:mysql://192.168.0.132:4306/batch_log
spring.datasource.log.url=jdbc:mysql://mysql.db.fangjia.com:4306/batch_log
spring.datasource.log.username=sa
spring.datasource.log.password=G00jia
spring.datasource.log.driver-class-name=com.mysql.jdbc.Driver
fsh.url=http://fsh.fangjia.com
zk.server-lists=192.168.0.45:2181,192.168.0.46:2181,192.168.0.109:2181
zk.server-lists=192.168.0.207:2181,192.168.0.24:2181,192.168.0.25:2181
zk.namespace=fangjia-job-fsh
@@ -1,5 +1,6 @@
package com.fangjia.job.youfang.config;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -17,6 +18,7 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import com.mongodb.MongoClient;
import com.mongodb.MongoClientOptions;
import com.mongodb.MongoCredential;
import com.mongodb.ServerAddress;
@Configuration
@@ -43,7 +45,9 @@ public class SpringMongoConfig {
@Primary
@Bean
public MongoDbFactory mongoDbFactory() throws Exception {
List<ServerAddress> seeds = Arrays.asList(new ServerAddress(youfangUrl, youfangPort));
List<ServerAddress> seeds = Arrays.asList(
new ServerAddress("mongo.db.fangjia.com", 28017),
new ServerAddress("secondary.mongo.db.fangjia.com", 28017));
MongoClientOptions.Builder builder = new MongoClientOptions.Builder();
int connPerHost = 10;
builder.connectionsPerHost(connPerHost);
@@ -54,7 +58,9 @@ public class SpringMongoConfig {
int timeOut = 10000;
builder.connectTimeout(timeOut);
MongoClientOptions options = builder.build();
MongoClient mongoClient = new MongoClient(seeds, options);
List<MongoCredential> cres = new ArrayList<>();
cres.add(MongoCredential.createCredential("developer", "admin", "G00IDCDEV12385".toCharArray()));
MongoClient mongoClient = new MongoClient(seeds, cres, options);
return new SimpleMongoDbFactory(mongoClient, youfangName);
}
+2 -2
View File
@@ -91,12 +91,12 @@
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>6.0.0</version>
<version>6.4.2</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>6.0.0</version>
<version>6.4.2</version>
</dependency>
</dependencies>