Merge branch 'working' into 'master'

升级爬虫核心包

See merge request !77

pom.xml

@@ -6,7 +6,7 @@
   <name>各平台热搜榜单采集程序</name>
   <description>各平台热搜榜单采集程序
 目前包含：1.微博时时热搜采集程序、2.知乎热搜采集程序</description>
-  
+
   <properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -20,9 +20,9 @@
 			<email>zhangzhiwei@zhiweidata.com</email>
 		</developer>
 	</developers>
-  
+
   <dependencies>
-		
+
 		<!-- 数据解析jar -->
 
   		<dependency>
@@ -30,7 +30,7 @@
   			<artifactId>mongo-java-driver</artifactId>
   			<version>3.12.2</version>
   		</dependency>
-  		
+
   		<dependency>
 		  <groupId>com.zhiwei</groupId>
 		  <artifactId>sendmail</artifactId>
@@ -44,18 +44,13 @@
 	  <dependency>
 		  <groupId>com.zhiwei.crawler</groupId>
 		  <artifactId>crawler-core</artifactId>
-		  <version>0.6.0.4-RELEASE</version>
+		  <version>0.6.7.4-SNAPSHOT</version>
 	  </dependency>
 	  <dependency>
 		  <groupId>org.projectlombok</groupId>
 		  <artifactId>lombok</artifactId>
 		  <version>1.18.8</version>
 	  </dependency>
-	  <dependency>
-		  <groupId>com.zhiwei.crawler</groupId>
-		  <artifactId>crawler-core</artifactId>
-		  <version>0.6.0.4-RELEASE</version>
-	  </dependency>
 <!--	  <dependency>-->
 <!--		  <groupId>org.quartz-scheduler</groupId>-->
 <!--		  <artifactId>quartz</artifactId>-->
@@ -120,7 +115,7 @@
 	  </dependency>
 
   </dependencies>
-  
+
   <build>
 		<plugins>
 			<plugin>
@@ -198,5 +193,5 @@
 			</plugin>
 		</plugins>
 	</build>
-  
-</project>
\ No newline at end of file
+
+</project>

src/main/resources/proxyip.properties

-registry=zookeeper://192.168.0.203:2182?backup=192.168.0.104:2182,192.168.0.105:2182
+registry=zookeeper://192.168.0.203:2182?backup=192.168.0.104:2182,192.168.0.105:2182&timeout=60000
 group=hangzhou
 ########################################################
-#registry=zookeeper://192.168.0.11:2181?backup=192.168.0.30:2181,192.168.0.35:2181
-#group=local
\ No newline at end of file
+#registry=zookeeper://192.168.0.35:2181?backup=192.168.0.30:2181,192.168.0.11:2181&timeout=60000
+#group=local