解决冲突

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.zhiwei</groupId>
   <artifactId>media_data_crawler</artifactId>
-  <version>0.1.2-SNAPSHOT</version>
+  <version>0.1.3-SNAPSHOT</version>
   <name>media_data_crawler</name>
   <description>网媒数据抓取，包含百度新闻、搜狗新闻、360新闻、知乎回答列表等</description>
   

src/main/java/com/zhiwei/media_data_crawler/data/DataCrawler.java

@@ -329,12 +329,8 @@ public class DataCrawler {
 	 *            设定文件
 	 * @return List<LunTanData> 返回类型
 	 */
-	public static List<LunTanData> getLunTanData(String word, Proxy proxy, String endTime) {
-		try {
-			return TianYaCrawlerParse.getLunTanData(word, proxy, endTime);
-		} catch (Exception e) {
-			return Collections.emptyList();
-		}
+	public static List<LunTanData> getLunTanData(String word, ProxyHolder proxy, String startTime, String endTime) {
+	    return TianYaCrawlerParse.getLunTanData(word, proxy, startTime, endTime);
 	}
 
 	/**