diff --git a/jim-framework-cloud-config/pom.xml b/jim-framework-cloud-config/pom.xml index 919435c..a6c399e 100644 --- a/jim-framework-cloud-config/pom.xml +++ b/jim-framework-cloud-config/pom.xml @@ -48,7 +48,7 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.RC1 + Finchley.RELEASE pom import diff --git a/jim-framework-cloud-consumer/pom.xml b/jim-framework-cloud-consumer/pom.xml index 2828353..2ee816e 100644 --- a/jim-framework-cloud-consumer/pom.xml +++ b/jim-framework-cloud-consumer/pom.xml @@ -87,7 +87,7 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.RC1 + Finchley.RELEASE pom import diff --git a/jim-framework-cloud-consumer/src/main/resources/application.properties b/jim-framework-cloud-consumer/src/main/resources/application.properties index c16bc4f..b9dd3fd 100644 --- a/jim-framework-cloud-consumer/src/main/resources/application.properties +++ b/jim-framework-cloud-consumer/src/main/resources/application.properties @@ -4,7 +4,7 @@ eureka.instance.hostname=localhost spring.application.name=jim-cloud-consumer-server feign.hystrix.enabled=true -spring.zipkin.base-url=http://192.168.21.128:9411 +spring.zipkin.base-url=http://localhost:9411 spring.zipkin.enabled=true spring.zipkin.flush-interval=1 diff --git a/jim-framework-cloud-provider/pom.xml b/jim-framework-cloud-provider/pom.xml index f756e06..172435c 100644 --- a/jim-framework-cloud-provider/pom.xml +++ b/jim-framework-cloud-provider/pom.xml @@ -70,7 +70,7 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.RC1 + Finchley.RELEASE pom import diff --git a/jim-framework-cloud-provider/src/main/resources/application.properties b/jim-framework-cloud-provider/src/main/resources/application.properties index 6bd8077..a7534bf 100644 --- a/jim-framework-cloud-provider/src/main/resources/application.properties +++ b/jim-framework-cloud-provider/src/main/resources/application.properties @@ -4,7 +4,7 @@ eureka.instance.hostname=localhost spring.application.name=jim-cloud-provider-server -spring.zipkin.base-url=http://192.168.21.128:9411 +spring.zipkin.base-url=http://localhost:9411 spring.zipkin.enabled=true spring.zipkin.flush-interval=1 diff --git a/jim-framework-cloud-registry/pom.xml b/jim-framework-cloud-registry/pom.xml index 4bba876..b860ec6 100644 --- a/jim-framework-cloud-registry/pom.xml +++ b/jim-framework-cloud-registry/pom.xml @@ -56,7 +56,7 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.RC1 + Finchley.RELEASE pom import diff --git a/jim-framework-cloud-zipkin/pom.xml b/jim-framework-cloud-zipkin/pom.xml index 7cd5a69..9939c1c 100644 --- a/jim-framework-cloud-zipkin/pom.xml +++ b/jim-framework-cloud-zipkin/pom.xml @@ -39,6 +39,8 @@ zipkin-autoconfigure-ui runtime + + org.springframework.boot spring-boot-starter-test @@ -51,7 +53,7 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.RC1 + Finchley.RELEASE pom import diff --git a/jim-framework-dubbo-consumer/src/main/resources/application.properties b/jim-framework-dubbo-consumer/src/main/resources/application.properties index 1c10094..60f2f0f 100644 --- a/jim-framework-dubbo-consumer/src/main/resources/application.properties +++ b/jim-framework-dubbo-consumer/src/main/resources/application.properties @@ -5,4 +5,4 @@ spring.application.name=product-dubbo-consumer dubbo.trace.enabled=true dubbo.trace.connectTimeout=1000 dubbo.trace.readTimeout=1000 -dubbo.trace.zipkinUrl=http://192.168.21.128:9411 +dubbo.trace.zipkinUrl=http://localhost:9411 diff --git a/jim-framework-dubbo-consumer/src/main/resources/applicationContext-dubbo-consumer.xml b/jim-framework-dubbo-consumer/src/main/resources/applicationContext-dubbo-consumer.xml index e395ad3..84ec0ca 100644 --- a/jim-framework-dubbo-consumer/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/jim-framework-dubbo-consumer/src/main/resources/applicationContext-dubbo-consumer.xml @@ -9,14 +9,19 @@ - - + + - --> + + diff --git a/jim-framework-dubbo-core/pom.xml b/jim-framework-dubbo-core/pom.xml index 1c75fd8..9c36400 100644 --- a/jim-framework-dubbo-core/pom.xml +++ b/jim-framework-dubbo-core/pom.xml @@ -60,7 +60,7 @@ com.alibaba dubbo - 2.5.3 + 2.6.3 org.springframework @@ -90,6 +90,18 @@ 0.1 + + org.apache.curator + curator-framework + 4.0.1 + + + + org.apache.curator + curator-recipes + 4.0.1 + + diff --git a/jim-framework-dubbo-provider/src/main/java/com/jim/framework/dubbo/provider/service/ProductServiceImpl.java b/jim-framework-dubbo-provider/src/main/java/com/jim/framework/dubbo/provider/service/ProductServiceImpl.java index a4d37a3..2cb72f7 100644 --- a/jim-framework-dubbo-provider/src/main/java/com/jim/framework/dubbo/provider/service/ProductServiceImpl.java +++ b/jim-framework-dubbo-provider/src/main/java/com/jim/framework/dubbo/provider/service/ProductServiceImpl.java @@ -5,6 +5,7 @@ import com.jim.framework.dubbo.core.service.CommentService; import com.jim.framework.dubbo.core.service.ProductService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; @@ -15,6 +16,7 @@ * 创建日期:2017/4/13 * 修改日期:2017/4/13 */ +@Service public class ProductServiceImpl implements ProductService { @Autowired diff --git a/jim-framework-dubbo-provider/src/main/resources/application.properties b/jim-framework-dubbo-provider/src/main/resources/application.properties index 0d48c45..f29495f 100644 --- a/jim-framework-dubbo-provider/src/main/resources/application.properties +++ b/jim-framework-dubbo-provider/src/main/resources/application.properties @@ -4,4 +4,4 @@ spring.application.name=product-dubbo-provider dubbo.trace.enabled=true dubbo.trace.connectTimeout=1000 dubbo.trace.readTimeout=1000 -dubbo.trace.zipkinUrl=http://192.168.21.128:9411 +dubbo.trace.zipkinUrl=http://localhost:9411 diff --git a/jim-framework-dubbo-provider/src/main/resources/applicationContext-dubbo-consumer.xml b/jim-framework-dubbo-provider/src/main/resources/applicationContext-dubbo-consumer.xml index 786be5e..5c03e67 100644 --- a/jim-framework-dubbo-provider/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/jim-framework-dubbo-provider/src/main/resources/applicationContext-dubbo-consumer.xml @@ -7,13 +7,12 @@ http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd"> - - + + diff --git a/jim-framework-dubbo-provider/src/main/resources/applicationContext-dubbo-provider.xml b/jim-framework-dubbo-provider/src/main/resources/applicationContext-dubbo-provider.xml index 2a15b33..f5332e5 100644 --- a/jim-framework-dubbo-provider/src/main/resources/applicationContext-dubbo-provider.xml +++ b/jim-framework-dubbo-provider/src/main/resources/applicationContext-dubbo-provider.xml @@ -14,7 +14,8 @@ - + + - + +