2018/10/8 新采集系统上线前版本

pom.xml

@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>com.zhiwei</groupId>
 			<artifactId>es-client</artifactId>
-			<version>1.2</version>
+			<version>1.3</version>
 		</dependency>
 
 		<dependency>

src/main/java/com/zhiwei/messageflow/DirectES4RedisThread.java

@@ -24,7 +24,8 @@ public class DirectES4RedisThread extends Thread {
 	// 定向渠道组list
 	private List<DirectGroup> dgList;
 	// 单个平台单个关键词组每次查询数量
-	private static final int count = 20;
+//	private static final int count = 20;
+	private static final int count = 300;
 
 	private DirectES4RedisTask directES4RedisTask;
 

src/main/java/com/zhiwei/messageflow/ES4RedisThreadNew.java

@@ -29,8 +29,8 @@ public class ES4RedisThreadNew extends Thread {
 	private ES4RedisTask es4RedisTask;
 
 	// 单个平台单个关键词组每次查询数量
-//	private static final int count = 300;
-	private static final int count = 10;
+	private static final int count = 300;
+//	private static final int count = 10;
 	
 	// private static final int max_Thread_num = 40;
 	// private static int Thread_num = 0;

src/main/resources/middleware.properties

 #middleware.zookeeperIp=zookeeper://192.168.0.234:2181
-middleware.zookeeperIp=zookeeper://192.168.0.203:2181
+middleware.zookeeperIp=zookeeper://192.168.0.203:2181;zookeeper://192.168.0.104:2181;zookeeper://192.168.0.105:2181;
\ No newline at end of file

src/main/resources/redis.properties

@@ -2,10 +2,6 @@ redis.maxTotal=2048
 redis.maxIdle=200
 redis.maxWaitMillis=1000
 redis.testOnBorrow=true
-redis.maxTotal=2048
-redis.maxIdle=200
-redis.maxWaitMillis=1000
-redis.testOnBorrow=true
 redis.testOnReturn=true
 redis.ip = 192.168.0.202
 #redis.ip = 202.107.192.94