Merge branch 'v0.0.1-day-subject' into 'dev'

添加,feo-common2

See merge request !2

src/main/java/com/tanpu/feo/feojob/FeoJobApplication.java

@@ -7,17 +7,25 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
 
 @SpringBootApplication
+@EnableDiscoveryClient
+@EnableHystrix
 @EnableFeignClients
-@MapperScan(basePackages = "com.tanpu.feo.**.mapper")
+@EnableTransactionManagement
+//@MapperScan(basePackages = "com.tanpu.feo.**.mapper")
+@ComponentScan({"com.tanpu.common","com.tanpu.feo.feojob"})
 @Slf4j
 @EnableScheduling //开启定时任务
 public class FeoJobApplication implements CommandLineRunner {