Merge branch 'dev' of chenweida/jw2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/SvrBaseApplication.java

@@ -3,6 +3,7 @@ package com.yihu.jw;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -17,6 +18,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
        entityManagerFactoryRef="baseEntityManagerFactory",
        transactionManagerRef = "baseTransactionManager"
)
@ComponentScan(basePackages={"com"})
public class SvrBaseApplication {
    public static void main(String[] args) {

svr/svr-demo/src/main/java/com/yihu/jw/DemoApplication.java

@@ -2,12 +2,14 @@ package com.yihu.jw;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
/**
 * Created by chenweida on 2017/11/3.
 */
@SpringBootApplication
@ComponentScan(basePackages={"com"})
public class DemoApplication {
    public static void main(String[] args) {
        SpringApplication.run(DemoApplication.class, args);

web-gateway/src/main/java/com/yihu/jw/WebGateWayAppliaction.java

@@ -9,6 +9,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.netflix.hystrix.EnableHystrix;
import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
import org.springframework.context.annotation.ComponentScan;
/**
 * Created by chenweida on 2017/5/10.
@@ -20,6 +21,7 @@ import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
//@EnableZuulProxy //启动zuul代理 路由
@EnableFeignClients //声名式的客户端
@EnableCircuitBreaker
@ComponentScan(basePackages={"com"})
public class WebGateWayAppliaction {
    public static void main(String[] args) {