Merge branch 'mlbWork' into 'master'

定时器pom发布

See merge request !28

pom.xml

@@ -143,6 +143,19 @@
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<mainClass>com.zhiwei.searchhotcrawler.run.HotSearchRun</mainClass>
 								</transformer>
+								<!-- 不覆盖同名文件，而是追加合并同名文件 -->
+								<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<resource>META-INF/spring.handlers</resource>
+								</transformer>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<resource>META-INF/spring.schemas</resource>
+								</transformer>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<resource>META-INF/spring.tooling</resource>
+								</transformer>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>concert.Main</mainClass>
+								</transformer>
 							</transformers>
 						</configuration>
 					</execution>

src/main/java/com/zhiwei/searchhotcrawler/run/HotSearchRun.java

@@ -46,18 +46,18 @@ public class HotSearchRun {
 
 
 		//采集程序启动
-		new WeiboHotSearchRun().start();
-		new BaiduHotSearchRun().start();
-//		new SougoHotSearchRun().start();
-		new DouyinHotSearchRun().start();
-//		new ZhihuHotSearchRun().start();
-		new WeiboSuperTopicRun().start();
-		new WeiboTopicRun().start();
-//		new ToutiaoHotSearchRun().start();
-//		new ZhihuTopSearchRun().start();
-		new ZhihuChildHotSearchRun().start();
-		new ThreadOneRun().start();
-//		//抖音链接更新
-		new DouYinUrlHotSearchRun().start();
+//		new WeiboHotSearchRun().start();
+//		new BaiduHotSearchRun().start();
+////		new SougoHotSearchRun().start();
+//		new DouyinHotSearchRun().start();
+////		new ZhihuHotSearchRun().start();
+//		new WeiboSuperTopicRun().start();
+//		new WeiboTopicRun().start();
+////		new ToutiaoHotSearchRun().start();
+////		new ZhihuTopSearchRun().start();
+//		new ZhihuChildHotSearchRun().start();
+//		new ThreadOneRun().start();
+////		//抖音链接更新
+//		new DouYinUrlHotSearchRun().start();
 	}
 }

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

@@ -21,9 +21,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-//@Component
-//@EnableScheduling
-//@EnableAsync
+@Component
+@EnableScheduling
+@EnableAsync
 public class GatherTimer {
 
     private Logger logger = LoggerFactory.getLogger(GatherTimer.class);

src/main/resources/applicationContext.xml

@@ -7,9 +7,9 @@
           http://www.springframework.org/schema/context/spring-context-4.2.xsd   
           http://www.springframework.org/schema/beans   
           http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
-          http://www.springframework.org/schema/tx 
+          http://www.springframework.org/schema/tx
 	      http://www.springframework.org/schema/tx/spring-tx-4.2.xsd
-          http://www.springframework.org/schema/aop 
+          http://www.springframework.org/schema/aop
           http://www.springframework.org/schema/aop/spring-aop-4.2.xsd
           http://www.springframework.org/schema/task 
 		  http://www.springframework.org/schema/task/spring-task.xsd">

src/main/resources/log4j2.xml

@@ -8,7 +8,8 @@
 	<Appenders>
 		<!-- 定义日志输出地 -->
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} [%t]  - %msg%n"/>
+<!--			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} [%t]  - %msg%n"/>-->
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n" />
 		</Console>
 		<RollingRandomAccessFile name="LogFile"
 								 fileName="${LOG_HOME}/${LOG_FILE}.log"