diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml index 72574b6..215488e 100644 --- a/api-gateway/pom.xml +++ b/api-gateway/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.coderqian api-gateway 0.0.1-SNAPSHOT jar @@ -12,31 +11,12 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - + com.coderqian + spring-cloud-cli + 1.0-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - Dalston.RELEASE - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.cloud spring-cloud-starter-zuul @@ -51,29 +31,6 @@ - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/api-gateway/src/main/resources/application.properties b/api-gateway/src/main/resources/application.properties index a64afc4..6c230fa 100644 --- a/api-gateway/src/main/resources/application.properties +++ b/api-gateway/src/main/resources/application.properties @@ -6,16 +6,14 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka zuul.ignoredServices='*' #zuul.routes.api-a.path=/customer/** -#zuul.routes.api-a.serviceId=eureka-customer +#zuul.routes.api-a.serviceId=service-customer #zuul.routes.api-b.path=/order/** -#zuul.routes.api-b.serviceId=eureka-order +#zuul.routes.api-b.serviceId=service-order # 由网关分发到feign，再经feign负载均衡 -zuul.routes.api-c.path=/feign/** -zuul.routes.api-c.serviceId=feign-server + zuul.routes.api-c.path=/feign/** + zuul.routes.api-c.serviceId=feign-server -#请求连接的超时时间 -#ribbon.ConnectTimeout=6000 -#请求处理的超时时间 -#ribbon.ReadTimeout=6000 \ No newline at end of file +#ribbon.ReadTimeout=60000 +#ribbon.ConnectTimeout=60000 \ No newline at end of file diff --git a/config-server/pom.xml b/config-server/pom.xml index 57fd473..60dd387 100644 --- a/config-server/pom.xml +++ b/config-server/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.coderqian config-server 0.0.1-SNAPSHOT jar @@ -12,52 +11,16 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - + com.coderqian + spring-cloud-cli + 1.0-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - Dalston.RELEASE - - org.springframework.cloud spring-cloud-config-server - - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml index 712f63c..2bc4b33 100644 --- a/eureka-server/pom.xml +++ b/eureka-server/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.coderqian eureka-server 0.0.1-SNAPSHOT jar @@ -12,31 +11,12 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - + com.coderqian + spring-cloud-cli + 1.0-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - Dalston.RELEASE - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.cloud @@ -47,30 +27,6 @@ org.springframework.cloud spring-cloud-starter-config - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/feign-server/pom.xml b/feign-server/pom.xml index db7c6f3..667a2cf 100644 --- a/feign-server/pom.xml +++ b/feign-server/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.coderqian feign-server 0.0.1-SNAPSHOT jar @@ -12,19 +11,11 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - + com.coderqian + spring-cloud-cli + 1.0-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - Dalston.RELEASE - - @@ -51,34 +42,6 @@ org.springframework.cloud spring-cloud-starter-eureka - - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/feign-server/src/main/java/com/coderqian/feignserver/service/TestCustomerService.java b/feign-server/src/main/java/com/coderqian/feignserver/service/TestCustomerService.java index 3c939eb..33ae7b9 100644 --- a/feign-server/src/main/java/com/coderqian/feignserver/service/TestCustomerService.java +++ b/feign-server/src/main/java/com/coderqian/feignserver/service/TestCustomerService.java @@ -13,7 +13,7 @@ * mail: qianlq0824@gmail.com */ -@FeignClient(value = "eureka-customer", fallback = HystrixClientFallback.class) +@FeignClient(value = "service-customer", fallback = HystrixClientFallback.class) @Service public interface TestCustomerService { diff --git a/feign-server/src/main/java/com/coderqian/feignserver/service/TestOrderService.java b/feign-server/src/main/java/com/coderqian/feignserver/service/TestOrderService.java index cd2e7d4..88967e9 100644 --- a/feign-server/src/main/java/com/coderqian/feignserver/service/TestOrderService.java +++ b/feign-server/src/main/java/com/coderqian/feignserver/service/TestOrderService.java @@ -11,7 +11,7 @@ * mail: qianlq0824@gmail.com */ -@FeignClient(value = "eureka-order") +@FeignClient(value = "service-order") public interface TestOrderService { @RequestMapping(value = "/test/result", method = RequestMethod.GET) diff --git a/feign-server/src/main/resources/application.properties b/feign-server/src/main/resources/application.properties index f1ef407..40705bd 100644 --- a/feign-server/src/main/resources/application.properties +++ b/feign-server/src/main/resources/application.properties @@ -4,7 +4,7 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka feign.hystrix.enabled=true -#请求处理的超时时间 -#ribbon.ReadTimeout=120000 -#请求连接的超时时间 -#ribbon.ConnectTimeout=30000 +# 请求处理的超时时间 +# ribbon.ReadTimeout=120000 +# 请求连接的超时时间 +# ribbon.ConnectTimeout=30000 diff --git a/feign-server/src/test/java/com/coderqian/feignserver/FeginServerApplicationTests.java b/feign-server/src/test/java/com/coderqian/feignserver/FeignServerApplicationTests.java similarity index 87% rename from feign-server/src/test/java/com/coderqian/feignserver/FeginServerApplicationTests.java rename to feign-server/src/test/java/com/coderqian/feignserver/FeignServerApplicationTests.java index c37ccde..b8a1110 100644 --- a/feign-server/src/test/java/com/coderqian/feignserver/FeginServerApplicationTests.java +++ b/feign-server/src/test/java/com/coderqian/feignserver/FeignServerApplicationTests.java @@ -7,7 +7,7 @@ @RunWith(SpringRunner.class) @SpringBootTest -public class FeginServerApplicationTests { +public class FeignServerApplicationTests { @Test public void contextLoads() { diff --git a/pom.xml b/pom.xml index bcf61bd..7761e50 100644 --- a/pom.xml +++ b/pom.xml @@ -18,4 +18,53 @@ feign-server zipkin-server + + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + Dalston.RELEASE + + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/service-customer/pom.xml b/service-customer/pom.xml index 904e61b..751cf38 100644 --- a/service-customer/pom.xml +++ b/service-customer/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.coderqian service-customer 0.0.1-SNAPSHOT jar @@ -12,19 +11,11 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - + com.coderqian + spring-cloud-cli + 1.0-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - Dalston.RELEASE - - org.springframework.boot @@ -42,12 +33,6 @@ spring-boot-starter-log4j2 - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.boot spring-boot-starter-jdbc @@ -153,25 +138,4 @@ - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/service-customer/src/main/java/com/coderqian/eurekacustomer/configuration/swagger/Swagger2.java b/service-customer/src/main/java/com/coderqian/eurekacustomer/configuration/swagger/Swagger2.java index 2c6c480..68e9af4 100644 --- a/service-customer/src/main/java/com/coderqian/eurekacustomer/configuration/swagger/Swagger2.java +++ b/service-customer/src/main/java/com/coderqian/eurekacustomer/configuration/swagger/Swagger2.java @@ -47,7 +47,7 @@ public Docket createRestApi() { private ApiInfo apiInfo() { return new ApiInfoBuilder() - .title("eureka-customer") + .title("service-customer") .description("Demo project for Spring Boot") .termsOfServiceUrl("http://com.coderqian") .version("1.0") diff --git a/service-customer/src/main/java/com/coderqian/eurekacustomer/controller/TestController.java b/service-customer/src/main/java/com/coderqian/eurekacustomer/controller/TestController.java index 47037c4..b9a7628 100644 --- a/service-customer/src/main/java/com/coderqian/eurekacustomer/controller/TestController.java +++ b/service-customer/src/main/java/com/coderqian/eurekacustomer/controller/TestController.java @@ -27,7 +27,7 @@ @Api(value = "测试", description = "测试模块", position = 1) public class TestController { - // @Value("${profile}") +// @Value("${profile}") private String profile; // @Value("${mysql}") diff --git a/service-customer/src/main/resources/log4j2.xml b/service-customer/src/main/resources/log4j2.xml index fc4e087..f72998c 100644 --- a/service-customer/src/main/resources/log4j2.xml +++ b/service-customer/src/main/resources/log4j2.xml @@ -6,7 +6,7 @@ %d{yyyy-MM-dd HH:mm:ss} [Thread: %t] [ %-5p] %c{1}:%L - %m%n logs - eureka-customer + service-customer diff --git a/service-order/pom.xml b/service-order/pom.xml index 987fc52..88cf644 100644 --- a/service-order/pom.xml +++ b/service-order/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.coderqian service-order 0.0.1-SNAPSHOT jar @@ -12,31 +11,12 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - + com.coderqian + spring-cloud-cli + 1.0-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - Dalston.RELEASE - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.cloud spring-cloud-starter-eureka @@ -59,28 +39,6 @@ springfox-swagger-ui 2.7.0 - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/service-order/src/main/java/com/coderqian/eurekaorder/configuration/swagger/Swagger2.java b/service-order/src/main/java/com/coderqian/eurekaorder/configuration/swagger/Swagger2.java index 2dc3192..e70fb0b 100644 --- a/service-order/src/main/java/com/coderqian/eurekaorder/configuration/swagger/Swagger2.java +++ b/service-order/src/main/java/com/coderqian/eurekaorder/configuration/swagger/Swagger2.java @@ -45,7 +45,7 @@ public Docket createRestApi(){ private ApiInfo apiInfo(){ return new ApiInfoBuilder() - .title("eureka-order") + .title("service-order") .description("Demo project for Spring Boot") .termsOfServiceUrl("http://com.coderqian") .version("1.0") diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml index e067261..7ae1798 100644 --- a/zipkin-server/pom.xml +++ b/zipkin-server/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.coderqian zipkin-server 0.0.1-SNAPSHOT jar @@ -12,31 +11,12 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - + com.coderqian + spring-cloud-cli + 1.0-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - Dalston.RELEASE - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.cloud spring-cloud-starter-eureka @@ -53,26 +33,4 @@ - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - -