修改zhiwei-tools的包版本

pom.xml

@@ -7,9 +7,9 @@
 	<dependencies>
     	
 		<dependency>
-			<groupId>com.zhiwei</groupId>
-			<artifactId>zhiweiTools</artifactId>
-			<version>0.0.7-SNAPSHOT</version>
+			<groupId>com.zhiwei.tools</groupId>
+			<artifactId>zhiwei-tools</artifactId>
+			<version>0.0.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	

src/main/java/com/zhiwei/toutiao/parse/TouTiaoAccountParse.java

@@ -11,27 +11,28 @@ import org.slf4j.LoggerFactory;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.tools.httpclient.HttpClientTemplateOK;
+import com.zhiwei.tools.tools.URLCodeUtil;
+import com.zhiwei.tools.tools.ZhiWeiTools;
 import com.zhiwei.toutiao.bean.TouTiaoAccount;
 import com.zhiwei.toutiao.util.Tools;
-import com.zhiwei.zhiweiTools.httpClient.HttpClientTemplateOK;
-import com.zhiwei.zhiweiTools.tools.URLCodeUtil;
-import com.zhiwei.zhiweiTools.tools.ZhiWeiTools;
 
 /**
  * @ClassName: TouTiaoAccountParse 
- * @Description: TODO(今日头条帐号采集) 
+ * @Description: 今日头条帐号采集
  * @author hero 
  * @date 2017年10月17日 下午3:36:54
  */
 public class TouTiaoAccountParse {
 	
+	private TouTiaoAccountParse() {}
 	private static Map<String, String> headerMap;
 	private static Logger logger = LoggerFactory.getLogger(TouTiaoAccountParse.class);
 	
 	/**
 	 * @Title: getTouTiaoAccountInfo 
 	 * @author hero 
-	 * @Description: TODO(根据帐号名获取帐号信息) 
+	 * @Description: 根据帐号名获取帐号信息
 	 * @param @param word
 	 * @param @param proxy
 	 * @param @return 设定文件 
@@ -64,7 +65,7 @@ public class TouTiaoAccountParse {
 			}
 		} catch (Exception e) {
 			e.fillInStackTrace();
-			logger.error("获取今日头条帐号数据连接超时", e.fillInStackTrace());
+			logger.error("获取今日头条帐号数据连接超时", e);
 			return null;
 		}
 		return tta;
@@ -84,7 +85,7 @@ public class TouTiaoAccountParse {
 			}
 		} catch (Exception e) {
 			e.fillInStackTrace();
-			logger.error("获取今日头条帐号数据连接超时", e.fillInStackTrace());
+			logger.error("获取今日头条帐号数据连接超时", e);
 			return null;
 		}
 		return tta;
@@ -95,7 +96,7 @@ public class TouTiaoAccountParse {
 	/**
 	 * @Title: getTouTiaoAccountInfoByWord 
 	 * @author hero 
-	 * @Description: TODO(根据关键词查询今日头条帐号信息) 
+	 * @Description: 根据关键词查询今日头条帐号信息
 	 * @param @param word
 	 * @param @param proxy
 	 * @param @return 设定文件 
@@ -103,7 +104,7 @@ public class TouTiaoAccountParse {
 	 */
 	public static List<TouTiaoAccount> getTouTiaoAccountInfoByWord(String word, Proxy proxy){
 		
-		List<TouTiaoAccount> list = new ArrayList<TouTiaoAccount>();
+		List<TouTiaoAccount> list = new ArrayList<>();
 		boolean f = true;
 		int page = 0;
 		while(f){
@@ -121,7 +122,7 @@ public class TouTiaoAccountParse {
 				}
 				page++;
 			} catch (Exception e) {
-				logger.error("获取今日头条帐号数据连接超时", e.fillInStackTrace());
+				logger.error("获取今日头条帐号数据连接超时", e);
 				f = false;
 			}
 		}
@@ -141,7 +142,7 @@ public class TouTiaoAccountParse {
 	 * @return List<TouTiaoAccount> 返回类型
 	 */
 	public static List<TouTiaoAccount> getFriendsList(String userid,Proxy proxy,long sleep){
-		List<TouTiaoAccount> ttaList = new ArrayList<TouTiaoAccount>();
+		List<TouTiaoAccount> ttaList = new ArrayList<>();
 		boolean more = true;
 		int page = 0;
 		while(more){
@@ -156,7 +157,7 @@ public class TouTiaoAccountParse {
 					JSONObject json = JSONObject.parseObject(htmlBody);
 					more = json.getJSONObject("data").getBooleanValue("has_more");
 					List<TouTiaoAccount> dataList = parseHtmlByFans(json);
-					if(dataList!=null && dataList.size()>0){
+					if(dataList!=null && !dataList.isEmpty()){
 						ttaList.addAll(dataList);
 					}else{
 						more = false;
@@ -179,7 +180,7 @@ public class TouTiaoAccountParse {
 	/**
 	 * @Title: parseHtmlByAccount 
 	 * @author hero 
-	 * @Description: TODO(解析单个帐号信息) 
+	 * @Description: 解析单个帐号信息
 	 * @param @param htmlBody
 	 * @param @param word
 	 * @param @return 设定文件 
@@ -251,12 +252,12 @@ public class TouTiaoAccountParse {
 	 * @param @return 设定文件 
 	 * @return TouTiaoAccount 返回类型
 	 */
-	private static TouTiaoAccount parseAccountByUserId(String htmlBody,String user_id,Proxy proxy) {
+	private static TouTiaoAccount parseAccountByUserId(String htmlBody,String userId,Proxy proxy) {
 		try {
 			TouTiaoAccount touTiaoAccount = new TouTiaoAccount();;
 			if(htmlBody.contains("var header={")){
 				String name = htmlBody.split("var header")[1].split("name:'")[1].split("',")[0];
-				String img_url = "https:"+htmlBody.split("avtar_img:'")[1].split("',")[0];
+				String imgUrl = "https:"+htmlBody.split("avtar_img:'")[1].split("',")[0];
 				String type = htmlBody.split("type: '")[1].split("'")[0];
 				if(htmlBody.contains("guanzhu")){
 					int guanzhu = Integer.valueOf(htmlBody.split("guanzhu:'")[1].split("',")[0]);
@@ -264,9 +265,9 @@ public class TouTiaoAccountParse {
 					touTiaoAccount.setFriend_count(guanzhu);
 					touTiaoAccount.setFollow_count(fensi);
 				}
-				touTiaoAccount.setId(user_id);
-				touTiaoAccount.setUser_id(Long.valueOf(user_id));
-				touTiaoAccount.setImg_url(img_url);
+				touTiaoAccount.setId(userId);
+				touTiaoAccount.setUser_id(Long.valueOf(userId));
+				touTiaoAccount.setImg_url(imgUrl);
 				touTiaoAccount.setName(name);	
 				touTiaoAccount.setUser_type(type);
 				return touTiaoAccount;
@@ -292,7 +293,7 @@ public class TouTiaoAccountParse {
 	 * @return List<TouTiaoAccount> 返回类型
 	 */
 	private static List<TouTiaoAccount> parseHtmlByWord(JSONObject json, Proxy proxy) {
-		List<TouTiaoAccount> ttaList = new ArrayList<TouTiaoAccount>();
+		List<TouTiaoAccount> ttaList = new ArrayList<>();
 		try {
 			JSONArray jsonArray = json.getJSONArray("data");
 			long user_id = 0;
@@ -355,7 +356,7 @@ public class TouTiaoAccountParse {
 	private static List<TouTiaoAccount> parseHtmlByFans(JSONObject json) {
 		List<TouTiaoAccount> ttaList = null;
 		try {
-			ttaList = new ArrayList<TouTiaoAccount>();
+			ttaList = new ArrayList<>();
 			JSONArray jsonArray = json.getJSONObject("data").getJSONArray("users");
 			Long user_id = null;
 			String name = null;

src/main/java/com/zhiwei/toutiao/parse/TouTiaoArticleParse.java

@@ -18,14 +18,16 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.tools.httpclient.HttpClientTemplateOK;
+import com.zhiwei.tools.timeparse.TimeParse;
 import com.zhiwei.toutiao.bean.TouTiaoArticle;
 import com.zhiwei.toutiao.util.Tools;
-import com.zhiwei.zhiweiTools.httpClient.HttpClientTemplateOK;
-import com.zhiwei.zhiweiTools.timeParse.TimeParse;
 
 /**
  * @Description:头条帐号采集
@@ -33,7 +35,7 @@ import com.zhiwei.zhiweiTools.timeParse.TimeParse;
  * @date 2016年9月2日 上午11:17:44
  */
 public class TouTiaoArticleParse {
-	private static Map<String, String> headerMap;
+	private TouTiaoArticleParse() {}
 	private static Logger logger = LoggerFactory.getLogger(TouTiaoArticleParse.class);
 
 	/***
@@ -53,7 +55,7 @@ public class TouTiaoArticleParse {
 		if(max_behot_time!=null){
 			url = url + "&max_behot_time="+max_behot_time;
 		}
-		headerMap = Tools.getTouTiaoHeader();
+		Map<String,String> headerMap = Tools.getTouTiaoHeader();
 		headerMap.put("Referer", url);
 		String htmlBody = null;
 		try {

src/main/java/com/zhiwei/toutiao/parse/TouTiaoChannelParse.java

@@ -13,14 +13,14 @@ import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.tools.httpclient.HttpClientTemplateOK;
+import com.zhiwei.tools.timeparse.TimeParse;
 import com.zhiwei.toutiao.bean.TouTiaoArticle;
 import com.zhiwei.toutiao.util.Tools;
-import com.zhiwei.zhiweiTools.httpClient.HttpClientTemplateOK;
-import com.zhiwei.zhiweiTools.timeParse.TimeParse;
 
 /**
  * @ClassName: TouTiaoChannel 
- * @Description: TODO(今日头条按照频道采集) 
+ * @Description: 今日头条按照频道采集
  * @author hero 
  * @date 2017年7月24日 下午4:57:22
  */
@@ -31,7 +31,7 @@ public class TouTiaoChannelParse {
 	/**
 	 * @Title: touTiaoChannel 
 	 * @author hero 
-	 * @Description: TODO(解析) 
+	 * @Description: 解析
 	 * @param @param url
 	 * @param @return 设定文件 
 	 * @return Map<String,Object> 返回类型
@@ -57,7 +57,7 @@ public class TouTiaoChannelParse {
 	/**
 	 * @Title: parseHtmlByChannel 
 	 * @author hero 
-	 * @Description: TODO(解析) 
+	 * @Description: 解析
 	 * @param @param htmlBody
 	 * @param @return 设定文件 
 	 * @return Map<String,Object> 返回类型
@@ -113,7 +113,7 @@ public class TouTiaoChannelParse {
 	/**
 	 * @Title: getUrl 
 	 * @author hero 
-	 * @Description: TODO(处理url) 
+	 * @Description: 处理url 
 	 * @param @param url
 	 * @param @return 设定文件 
 	 * @return String 返回类型

src/main/java/com/zhiwei/toutiao/parse/TouTiaoCommentParse.java

@@ -7,18 +7,20 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.tools.httpclient.HttpClientTemplateOK;
+import com.zhiwei.tools.tools.ZhiWeiTools;
 import com.zhiwei.toutiao.bean.TouTiaoComment;
 import com.zhiwei.toutiao.util.Tools;
-import com.zhiwei.zhiweiTools.httpClient.HttpClientTemplateOK;
-import com.zhiwei.zhiweiTools.tools.ZhiWeiTools;
 
 /**
  * @ClassName: TouTiaoComment 
- * @Description: TODO(今日头条评论数据) 
+ * @Description: 今日头条评论数据
  * @author hero 
  * @date 2016年12月9日 下午7:50:28
  */

src/main/java/com/zhiwei/toutiao/parse/TouTiaoParse.java

@@ -27,10 +27,10 @@ import org.slf4j.LoggerFactory;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.tools.httpclient.HttpClientTemplateOK;
+import com.zhiwei.tools.timeparse.TimeParse;
 import com.zhiwei.toutiao.bean.TouTiaoArticle;
 import com.zhiwei.toutiao.util.Tools;
-import com.zhiwei.zhiweiTools.httpClient.HttpClientTemplateOK;
-import com.zhiwei.zhiweiTools.timeParse.TimeParse;
 
 /**
  * @Description:

src/main/java/com/zhiwei/toutiao/parse/TouTiaoQuestionAnswerParse.java

@@ -14,10 +14,10 @@ import org.slf4j.LoggerFactory;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.tools.httpclient.HttpClientTemplateOK;
+import com.zhiwei.tools.timeparse.TimeParse;
 import com.zhiwei.toutiao.bean.TouTiaoQuestionAnswer;
 import com.zhiwei.toutiao.util.Tools;
-import com.zhiwei.zhiweiTools.httpClient.HttpClientTemplateOK;
-import com.zhiwei.zhiweiTools.timeParse.TimeParse;
 
 /**
  * @ClassName: TouTiaoQuestionAnswer 

src/main/java/com/zhiwei/toutiao/parse/TouTiaoQuestionParse.java

@@ -11,10 +11,10 @@ import org.slf4j.LoggerFactory;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.tools.httpclient.HttpClientTemplateOK;
+import com.zhiwei.tools.timeparse.TimeParse;
 import com.zhiwei.toutiao.bean.TouTiaoQuestion;
 import com.zhiwei.toutiao.util.Tools;
-import com.zhiwei.zhiweiTools.httpClient.HttpClientTemplateOK;
-import com.zhiwei.zhiweiTools.timeParse.TimeParse;
 
 /**
  * @ClassName: TouTiaoQuestionParse

src/main/java/com/zhiwei/toutiao/parse/TouTiaoSearchParse.java

@@ -13,10 +13,10 @@ import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.tools.httpclient.HttpClientTemplateOK;
+import com.zhiwei.tools.timeparse.TimeParse;
 import com.zhiwei.toutiao.bean.TouTiaoArticle;
 import com.zhiwei.toutiao.util.Tools;
-import com.zhiwei.zhiweiTools.httpClient.HttpClientTemplateOK;
-import com.zhiwei.zhiweiTools.timeParse.TimeParse;
 
 /**
  * @ClassName: TouTiaoSearch 

src/main/java/com/zhiwei/wangyi/parse/WangyiNewParse.java

@@ -10,11 +10,11 @@ import org.slf4j.LoggerFactory;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.tools.httpclient.HttpClientTemplateOK;
+import com.zhiwei.tools.timeparse.TimeParse;
+import com.zhiwei.tools.tools.ZhiWeiTools;
 import com.zhiwei.toutiao.util.Tools;
 import com.zhiwei.wangyi.bean.WangYiNews;
-import com.zhiwei.zhiweiTools.httpClient.HttpClientTemplateOK;
-import com.zhiwei.zhiweiTools.timeParse.TimeParse;
-import com.zhiwei.zhiweiTools.tools.ZhiWeiTools;
 
 public class WangyiNewParse {
 	private static Logger logger = LoggerFactory.getLogger(WangyiNewParse.class);