Merge branch 'master' of http://git.zhiweidata.top/zhangzhiwei/toutiao.git

pom.xml

@@ -9,13 +9,13 @@
 		<dependency>
 			<groupId>com.zhiwei.tools</groupId>
 			<artifactId>zhiwei-tools</artifactId>
-			<version>0.1.3-SNAPSHOT</version>
+			<version>0.1.4-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.zhiwei.crawler</groupId>
 			<artifactId>crawler-core</artifactId>
-			<version>0.3.6-RELEASE</version>
+			<version>0.5.2-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

src/main/java/com/zhiwei/toutiao/bean/TouTiaoArticle.java

@@ -34,9 +34,17 @@ public class TouTiaoArticle implements Serializable{
 	private String playCount;
 	private String readNum;
 	private String shareNum;
+	private String likeNum;
 	private List<String> labelList;
 	private String articleType;
 	
+	public String getLikeNum() {
+		return likeNum;
+	}
+	public void setLikeNum(String likeNum) {
+		this.likeNum = likeNum;
+	}
+
 	public String getArticleType() {
 		return articleType;
 	}
@@ -121,7 +129,7 @@ public class TouTiaoArticle implements Serializable{
 	public TouTiaoArticle(String url,String title,String user_id,
 			String source,Date time,String content,String commentCount,
 			String playCount,String readNum, String shareNum,String type
-			,String articleType)
+			,String articleType,String likeNum)
 	{
 		this.url = url ;
 		this.title = title;
@@ -135,6 +143,7 @@ public class TouTiaoArticle implements Serializable{
 		this.shareNum = shareNum;
 		this.commentCount = commentCount;
 		this.articleType = articleType;
+		this.likeNum = likeNum;
 	}
 	
 	public String toString()

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

@@ -222,6 +222,7 @@ public class TouTiaoArticleParse {
 			String user_id = null;
 			String articleType = null;
 			List<String> labelList = null;
+			String likeNum = null;
 			for (int i = 0; i < jsonArray.size(); i++) {
 				try {
 					JSONObject data = jsonArray.getJSONObject(i);
@@ -240,7 +241,7 @@ public class TouTiaoArticleParse {
 						user_id = data.getLong("creator_uid") + "";
 						articleType = data.getString("chinese_tag");
 						TouTiaoArticle tt = new TouTiaoArticle(href, title, user_id, source, date, content, commentNum,
-								playNum, readNum, shareNum, "今日头条", articleType);
+								playNum, readNum, shareNum, "今日头条", articleType,likeNum);
 						if (data.containsKey("label")) {
 							labelList = data.getJSONArray("label").toJavaList(String.class);
 							tt.setLabelList(labelList);
@@ -289,6 +290,7 @@ public class TouTiaoArticleParse {
 			String source = null;
 			String articleType = null;
 			List<String> labelList = null;
+			String likeNum = null;
 			for (int i = 0; i < jsonArray.size(); i++) {
 				try {
 					JSONObject data = jsonArray.getJSONObject(i);
@@ -306,7 +308,7 @@ public class TouTiaoArticleParse {
 						source = data.getString("source");
 						articleType = data.getString("chinese_tag");
 						TouTiaoArticle tt = new TouTiaoArticle(href, title, user_id, source, date, content, commentNum,
-								playNum, readNum, shareNum, "今日头条", articleType);
+								playNum, readNum, shareNum, "今日头条", articleType,likeNum);
 						if (data.containsKey("label")) {
 							labelList = data.getJSONArray("label").toJavaList(String.class);
 							tt.setLabelList(labelList);
@@ -505,6 +507,7 @@ public class TouTiaoArticleParse {
 			String commentNum = null;
 			String playNum = null;
 			String user_id = null;
+			String likeNum = null;
 			String articleType = null;
 			int count = 16;
 			for (int i = 0; i < jsonArray.size(); i++) {
@@ -525,6 +528,7 @@ public class TouTiaoArticleParse {
 						source = comment_base.getJSONObject("user").getJSONObject("info").getString("name");
 						content = dataJSON.getString("content");
 						readNum = dataJSON.getJSONObject("action").getInteger("read_count") + "";
+						likeNum = dataJSON.getJSONObject("action").getInteger("digg_count")+"";
 						commentNum = dataJSON.getJSONObject("action").getInteger("comment_count") + "";
 						user_id = comment_base.getJSONObject("user").getJSONObject("info").getString("user_id");
 						if (content != null && !"".equals(content)) {
@@ -541,6 +545,7 @@ public class TouTiaoArticleParse {
 						content = dataJSON.getString("content");
 						readNum = dataJSON.getInteger("read_count") + "";
 						commentNum = dataJSON.getInteger("comment_count") + "";
+						likeNum = dataJSON.getInteger("digg_count")+"";
 						user_id = dataJSON.getJSONObject("user").getString("user_id");
 						if (content != null && !"".equals(content)) {
 							if (content.length() < 16) {
@@ -550,7 +555,7 @@ public class TouTiaoArticleParse {
 						}
 					}
 					TouTiaoArticle tt = new TouTiaoArticle(href, title, user_id, source, date, content, commentNum,
-							playNum, readNum, "0", "微头条", articleType);
+							playNum, readNum, "0", "微头条", articleType,likeNum);
 					dataList.add(tt);
 				} catch (Exception e) {
 					continue;

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

@@ -119,7 +119,7 @@ public class TouTiaoParse {
 					String shareNum = data.getString("share_count");
 					
 					if (endData.before(date)) {
-						TouTiaoArticle tt = new TouTiaoArticle(href, title, null,source, date, content, commentNum, playNum, readNum, shareNum,"今日头条",null);
+						TouTiaoArticle tt = new TouTiaoArticle(href, title, null,source, date, content, commentNum, playNum, readNum, shareNum,"今日头条",null,null);
 						dataList.add(tt);
 					}else
 					{

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

@@ -95,7 +95,7 @@ public class TouTiaoSearchParse {
 					String user_id = jso.getString("user_id");
 					
 					Date date = TimeParse.stringFormartDate(time);
-					TouTiaoArticle tt = new TouTiaoArticle(url, title, user_id,source, date, content, comment_count, "-1", "-1", "-1","今日头条",null);	
+					TouTiaoArticle tt = new TouTiaoArticle(url, title, user_id,source, date, content, comment_count, "-1", "-1", "-1","今日头条",null,null);	
 					ttList.add(tt);
 				} catch (JSONException e) {
 					logger.debug("解析数据出现问题 {}", e);