Commit a5f5a270 by [zhangzhiwei]

修改部分命名不规范及升级版本

parent 22ad3587
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.zhiwei</groupId> <groupId>com.zhiwei</groupId>
<artifactId>toutiao</artifactId> <artifactId>toutiao</artifactId>
<version>0.3.6-SNAPSHOT</version> <version>0.3.7-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
......
...@@ -139,12 +139,12 @@ public class TouTiaoAccountParse { ...@@ -139,12 +139,12 @@ public class TouTiaoAccountParse {
* @return List<TouTiaoAccount> 返回类型 * @return List<TouTiaoAccount> 返回类型
*/ */
@Deprecated @Deprecated
public static List<TouTiaoAccount> getFriendsList(String userid,Proxy proxy,long sleep){ public static List<TouTiaoAccount> getFriendsList(String userId,Proxy proxy,long sleep){
List<TouTiaoAccount> ttaList = new ArrayList<>(); List<TouTiaoAccount> ttaList = new ArrayList<>();
boolean more = true; boolean more = true;
int page = 0; int page = 0;
while(more){ while(more){
String url = "http://it-hl.snssdk.com/user/relation/following/v2/?user_id="+userid+"&device_id=54560738994&cursor=&iid=53238029655&offset="+page*50+"&count=50&ts="+System.currentTimeMillis()/1000; String url = "http://it-hl.snssdk.com/user/relation/following/v2/?user_id="+ userId +"&device_id=54560738994&cursor=&iid=53238029655&offset="+page*50+"&count=50&ts="+System.currentTimeMillis()/1000;
page++; page++;
headerMap = Tools.getTouTiaoHeader(); headerMap = Tools.getTouTiaoHeader();
headerMap.put("User-Agent", "Dalvik/2.1.0 (Linux; U; Android 8.1.0; MI 8 MIUI/V10.0.11.0.OEACNFH) NewsArticle/7.0.1 cronet/TTNetVersion:pre_blink_merge-277498-gd2bb364e 2018-08-24"); headerMap.put("User-Agent", "Dalvik/2.1.0 (Linux; U; Android 8.1.0; MI 8 MIUI/V10.0.11.0.OEACNFH) NewsArticle/7.0.1 cronet/TTNetVersion:pre_blink_merge-277498-gd2bb364e 2018-08-24");
...@@ -173,15 +173,15 @@ public class TouTiaoAccountParse { ...@@ -173,15 +173,15 @@ public class TouTiaoAccountParse {
} }
public static List<TouTiaoAccount> getFriendsList(String userid, ProxyHolder proxy){ public static List<TouTiaoAccount> getFriendsList(String userId, ProxyHolder proxy){
List<TouTiaoAccount> ttaList = new ArrayList<>(); List<TouTiaoAccount> ttaList = new ArrayList<>();
Signature signature = new Signature(userid, "0"); Signature signature = new Signature(userId, "0");
String signatureStr = signature.getSignature(); String signatureStr = signature.getSignature();
boolean more = true; boolean more = true;
while(more){ while(more){
String url = "https://www.toutiao.com/c/user/following/?user_id="+userid+"&cursor=0&count=100&_signature="+ signatureStr; String url = "https://www.toutiao.com/c/user/following/?user_id="+ userId +"&cursor=0&count=100&_signature="+ signatureStr;
headerMap = Tools.getTouTiaoHeader(); headerMap = Tools.getTouTiaoHeader();
headerMap.put("referer", "ihttps://www.toutiao.com/c/user/relation/"+ userid +"/?tab=following"); headerMap.put("referer", "ihttps://www.toutiao.com/c/user/relation/"+ userId +"/?tab=following");
headerMap.put("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.80 Safari/537.36"); headerMap.put("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.80 Safari/537.36");
for(int i=0;i<3;i++){ for(int i=0;i<3;i++){
try { try {
......
...@@ -138,9 +138,9 @@ public class TouTiaoCommentParse { ...@@ -138,9 +138,9 @@ public class TouTiaoCommentParse {
* @return int 返回类型 * @return int 返回类型
* @throws Exception * @throws Exception
*/ */
private static int getPage(String group_id,Proxy proxy) throws Exception private static int getPage(String groupId,Proxy proxy) throws Exception
{ {
String urlNew = "http://www.toutiao.com/api/comment/list/?group_id="+group_id+"&item_id=0&count=20&offset=0"; String urlNew = "http://www.toutiao.com/api/comment/list/?group_id="+ groupId +"&item_id=0&count=20&offset=0";
//设置头信息 //设置头信息
Map<String,String> headerMap = Tools.getTouTiaoHeader(); Map<String,String> headerMap = Tools.getTouTiaoHeader();
String htmlBody = downloadHtml(urlNew, proxy, headerMap); String htmlBody = downloadHtml(urlNew, proxy, headerMap);
......
...@@ -24,7 +24,6 @@ import org.jsoup.nodes.Document; ...@@ -24,7 +24,6 @@ import org.jsoup.nodes.Document;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zhiwei.crawler.core.HttpBoot;
import com.zhiwei.tools.timeparse.TimeParse; import com.zhiwei.tools.timeparse.TimeParse;
import com.zhiwei.toutiao.bean.TouTiaoArticle; import com.zhiwei.toutiao.bean.TouTiaoArticle;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment