版本升级

pom.xml

@@ -2,12 +2,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.zhiwei</groupId>
   <artifactId>media_data_crawler</artifactId>
-  <version>0.1.4-SNAPSHOT</version>
+  <version>0.1.5-SNAPSHOT</version>
   <name>media_data_crawler</name>
   <description>网媒数据抓取，包含百度新闻、搜狗新闻、360新闻、知乎回答列表等</description>
   
   <properties>
-    <crawler-core.version>0.6.1.0-SNAPSHOT</crawler-core.version>
+    <crawler-core.version>0.6.6.3-SNAPSHOT</crawler-core.version>
     <zhiwei-tool.version>0.1.8-SNAPSHOT</zhiwei-tool.version>
     <fastjson.version>1.2.62</fastjson.version>
   </properties>

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

@@ -18,8 +18,8 @@ import org.jsoup.select.Elements;
 import com.zhiwei.async.GroupSync;
 import com.zhiwei.async.TaskBoot;
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.entity.NewsData;
 import com.zhiwei.tools.httpclient.HeaderTool;
 import com.zhiwei.tools.timeparse.TimeParse;

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

@@ -16,8 +16,8 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.data.DataCrawler;
 import com.zhiwei.media_data_crawler.entity.NewsData;
 import com.zhiwei.tools.httpclient.HeaderTool;

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

@@ -17,12 +17,9 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyFactory;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
-import com.zhiwei.media_data_crawler.data.DataCrawler;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.entity.TiebaData;
-import com.zhiwei.proxy.config.SimpleConfig;
 import com.zhiwei.tools.httpclient.HeaderTool;
 import com.zhiwei.tools.timeparse.TimeParse;
 import com.zhiwei.tools.tools.URLCodeUtil;

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

@@ -16,8 +16,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 
 import okhttp3.Response;
 

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

@@ -15,8 +15,8 @@ import org.jsoup.select.Elements;
 
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.data.DataCrawler;
 import com.zhiwei.media_data_crawler.entity.DouBanData;
 import com.zhiwei.tools.httpclient.HeaderTool;

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

@@ -12,8 +12,8 @@ import org.apache.logging.log4j.Logger;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.entity.JianshuUser;
 import com.zhiwei.tools.tools.URLCodeUtil;
 

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

@@ -15,8 +15,8 @@ import org.jsoup.select.Elements;
 
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.data.DataCrawler;
 import com.zhiwei.media_data_crawler.entity.NewsData;
 import com.zhiwei.tools.httpclient.HeaderTool;

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

@@ -14,8 +14,8 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.data.DataCrawler;
 import com.zhiwei.media_data_crawler.entity.NewsData;
 import com.zhiwei.tools.httpclient.HeaderTool;

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

@@ -15,8 +15,8 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.data.DataCrawler;
 import com.zhiwei.media_data_crawler.entity.NewsData;
 import com.zhiwei.tools.httpclient.HeaderTool;

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

@@ -18,8 +18,8 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.data.DataCrawler;
 import com.zhiwei.media_data_crawler.entity.ZhiHuData;
 import com.zhiwei.tools.httpclient.HeaderTool;

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

@@ -13,8 +13,8 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.entity.LunTanData;
 import com.zhiwei.tools.httpclient.HeaderTool;
 import com.zhiwei.tools.timeparse.TimeParse;

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

@@ -12,8 +12,8 @@ import org.apache.logging.log4j.Logger;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.entity.ZhihuAnswerComment;
 
 import okhttp3.Response;

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

@@ -16,8 +16,8 @@ import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.data.DataCrawler;
 import com.zhiwei.media_data_crawler.entity.ZhihuAnswer;
 import com.zhiwei.tools.timeparse.TimeParse;

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

@@ -15,8 +15,8 @@ import org.apache.logging.log4j.Logger;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.data.DataCrawler;
 import com.zhiwei.media_data_crawler.entity.ZhiHuData;
 import com.zhiwei.media_data_crawler.entity.ZhihuAuthor;

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

@@ -13,8 +13,8 @@ import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.crawler.core.HttpBoot;
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.crawler.utils.RequestUtils;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.crawler.core.utils.RequestUtils;
 import com.zhiwei.media_data_crawler.entity.ZhihuAnswer;
 import com.zhiwei.media_data_crawler.entity.ZhihuAuthor;
 import com.zhiwei.tools.tools.URLCodeUtil;

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

@@ -6,9 +6,27 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.zhiwei.crawler.proxy.ProxyHolder;
-import com.zhiwei.media_data_crawler.crawler.*;
-import com.zhiwei.media_data_crawler.entity.*;
+import com.zhiwei.crawler.core.proxy.ProxyHolder;
+import com.zhiwei.media_data_crawler.crawler.BaiduInforCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.BaiduNewsCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.BaiduTiebaCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.BaiduZhidaoCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.DoubanCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.SoCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.SoNewsCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.SougouNewsCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.SougouZhihuCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.TianYaCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.ZhihuAnwserCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.ZhihuCrawlerParse;
+import com.zhiwei.media_data_crawler.crawler.ZhihuUserAnswerCrawlerParse;
+import com.zhiwei.media_data_crawler.entity.DouBanData;
+import com.zhiwei.media_data_crawler.entity.LunTanData;
+import com.zhiwei.media_data_crawler.entity.NewsData;
+import com.zhiwei.media_data_crawler.entity.TiebaData;
+import com.zhiwei.media_data_crawler.entity.ZhiHuData;
+import com.zhiwei.media_data_crawler.entity.ZhihuAnswer;
+import com.zhiwei.media_data_crawler.entity.ZhihuAuthor;
 
 public class DataCrawler {