Merge branch 'mlbWork' into 'master'

spring-aop与spring-content冲突解决

See merge request !29

pom.xml

@@ -154,7 +154,7 @@
 									<resource>META-INF/spring.tooling</resource>
 								</transformer>
 								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>concert.Main</mainClass>
+									<mainClass>com.zhiwei.searchhotcrawler.run.HotSearchRun.Main</mainClass>
 								</transformer>
 							</transformers>
 						</configuration>