Merge branch 'working' into 'master'

更新淘宝爬取程序

See merge request !106

pom.xml

@@ -124,6 +124,11 @@
 			<artifactId>httpclient</artifactId>
 			<version>4.5.6</version>
 		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.7</version>
+		</dependency>
 
 	</dependencies>
 

src/main/java/com/zhiwei/searchhotcrawler/timer/quartz/GatherTimer.java

@@ -520,17 +520,17 @@ public class GatherTimer {
         TipsUtils.addHotList(HotSearchType.快手热榜.name(), kuaiShouList);
         logger.info("快手热榜采集结束...");
     }
-//    /**
-//     *淘宝热搜采集
-//     */
-//    @Async(value = "myScheduler")
-//    @Scheduled(cron = "0 * * * * ? ")
-//    public void crawlerTaoBao(){
-//        logger.info("淘宝热搜开始采集...");
-//        Date date = DateUtils.getMillSecondTime(new Date());
-//        List<HotSearchList> taoBaoList = TaoBaoHotSearchCrawler.taoBaoHotSearch(date);
-//        logger.info("{}, 淘宝热搜此轮采集到的数据量为:{}", new Date(),  taoBaoList != null ?  taoBaoList.size() : 0);
-//        TipsUtils.addHotList(HotSearchType.淘宝热搜.name(), taoBaoList);
-//        logger.info("淘宝热搜采集结束...");
-//    }
+    /**
+     *淘宝热搜采集
+     */
+    @Async(value = "myScheduler")
+    @Scheduled(cron = "0 * * * * ? ")
+    public void crawlerTaoBao(){
+        logger.info("淘宝热搜开始采集...");
+        Date date = DateUtils.getMillSecondTime(new Date());
+        List<HotSearchList> taoBaoList = TaoBaoHotSearchCrawler.taoBaoHotSearch(date);
+        logger.info("{}, 淘宝热搜此轮采集到的数据量为:{}", new Date(),  taoBaoList != null ?  taoBaoList.size() : 0);
+        TipsUtils.addHotList(HotSearchType.淘宝热搜.name(), taoBaoList);
+        logger.info("淘宝热搜采集结束...");
+    }
 }

src/main/java/com/zhiwei/searchhotcrawler/util/TaoBaoUtils.java

 package com.zhiwei.searchhotcrawler.util;
 
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.FileUtils;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
+import java.io.File;
 import java.io.FileReader;
+import java.io.InputStream;
 
 @Log4j2
 public class TaoBaoUtils {
@@ -22,7 +25,14 @@ public class TaoBaoUtils {
             //engine.eval(new StringReader(routeScript));
             //如果js存在文件里
             Resource aesJs = new ClassPathResource("taobao.js");
-            engine.eval(new FileReader(aesJs.getFile()));
+            InputStream inputStream = aesJs.getInputStream();
+            File somethingFile = File.createTempFile("taobao", ".js");
+            try {
+                FileUtils.copyInputStreamToFile(inputStream, somethingFile);
+            } finally {
+                IOUtils.closeQuietly(inputStream);
+            }
+            engine.eval(new FileReader(somethingFile));
 
             //3.将引擎转换为Invocable，这样才可以掉用js的方法
             Invocable invocable = (Invocable) engine;