天涯冲突问题

src/main/java/com/zhiwei/media_data_crawler/crawler/TianYaCrawlerParse.java

 package com.zhiwei.media_data_crawler.crawler;
 
-import java.net.Proxy;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -44,7 +43,7 @@ public class TianYaCrawlerParse {
 	 * @return List<TiebaData> 返回类型
 	 */
 	@SuppressWarnings("unchecked")
-	public static List<LunTanData> getLunTanData(String word, Proxy proxy, String endTime) throws Exception {
+	public static List<LunTanData> getLunTanData(String word, ProxyHolder proxy, String endTime) throws Exception {
 		List<LunTanData> list = new ArrayList<LunTanData>();
 		int page = 0;
 		boolean more = true;
@@ -84,7 +83,7 @@ public class TianYaCrawlerParse {
 	 * @param @throws Exception 设定文件 
 	 * @return String 返回类型
 	 */
-	private static String downloadHtml(String word, Proxy proxy,
+	private static String downloadHtml(String word, ProxyHolder proxy,
 			int page) throws Exception{
 		// 获取通用请求头
 		Map<String, String> headerMap = HeaderTool.getCommonHead();
@@ -126,7 +125,7 @@ public class TianYaCrawlerParse {
 	 * @param @throws Exception 设定文件 
 	 * @return Map<String,Object> 返回类型
 	 */
-	private static Map<String, Object> analysisData(String htmlBody, Proxy proxy, String word, String endTime) throws Exception{
+	private static Map<String, Object> analysisData(String htmlBody, ProxyHolder proxy, String word, String endTime) throws Exception{
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		List<LunTanData> list = new ArrayList<LunTanData>();
 		boolean more = true;

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

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