升级dubbo 2.6.3

jiangmin168168 · Sep 27, 2018 · 4d19505 · 4d19505
1 parent ccae2c8
commit 4d19505
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 19 deletions.
diff --git a/jim-framework-cloud-config/pom.xml b/jim-framework-cloud-config/pom.xml
@@ -48,7 +48,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.RC1</version>
+				<version>Finchley.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/jim-framework-cloud-consumer/pom.xml b/jim-framework-cloud-consumer/pom.xml
@@ -87,7 +87,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.RC1</version>
+				<version>Finchley.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git 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
@@ -70,7 +70,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.RC1</version>
+				<version>Finchley.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git 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
@@ -56,7 +56,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.RC1</version>
+				<version>Finchley.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/jim-framework-cloud-zipkin/pom.xml b/jim-framework-cloud-zipkin/pom.xml
@@ -39,6 +39,8 @@
 			<artifactId>zipkin-autoconfigure-ui</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -51,7 +53,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.RC1</version>
+				<version>Finchley.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git 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
@@ -9,14 +9,19 @@
 
 	<dubbo:application name="${spring.application.name}"/>
 
-	<dubbo:registry address="N/A" />
-
+	<dubbo:registry address="127.0.0.1:2181,127.0.0.1:2182,127.0.0.1:2183" client="curator" protocol="zookeeper" />
+	<!--<dubbo:registry address="127.0.0.1:2184" protocol="zookeeper" />-->
 	<dubbo:consumer filter="traceConsumerFilter"></dubbo:consumer>
 
-	<dubbo:reference check="false"
+	<!--<dubbo:reference check="false"
 					 timeout="200000"
 					 url="dubbo://127.0.0.1:${dubbo.provider.port}/com.jim.framework.dubbo.core.service.ProductService"
 					 interface="com.jim.framework.dubbo.core.service.ProductService"
+					 id="productService">-->
+
+	<dubbo:reference check="false"
+					 timeout="200000"
+					 interface="com.jim.framework.dubbo.core.service.ProductService"
 					 id="productService">
 	</dubbo:reference>
 

diff --git a/jim-framework-dubbo-core/pom.xml b/jim-framework-dubbo-core/pom.xml
@@ -60,7 +60,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>dubbo</artifactId>
-			<version>2.5.3</version>
+			<version>2.6.3</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework</groupId>
@@ -90,6 +90,18 @@
 			<version>0.1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.curator</groupId>
+			<artifactId>curator-framework</artifactId>
+			<version>4.0.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.curator</groupId>
+			<artifactId>curator-recipes</artifactId>
+			<version>4.0.1</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

diff --git a/...o-provider/src/main/java/com/jim/framework/dubbo/provider/service/ProductServiceImpl.java b/...o-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
@@ -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
@@ -7,13 +7,12 @@
 						   http://code.alibabatech.com/schema/dubbo 
 						   http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
 
-	<dubbo:registry address="N/A" />
-
+	<dubbo:registry address="127.0.0.1:2181,127.0.0.1:2182,127.0.0.1:2183" client="curator" protocol="zookeeper" />
+	<!--<dubbo:registry address="127.0.0.1:2184" protocol="zookeeper" />-->
 	<dubbo:consumer filter="traceConsumerFilter"></dubbo:consumer>
 
 	<dubbo:reference check="false"
 					 timeout="200000"
-					 url="dubbo://127.0.0.1:7777/com.jim.framework.dubbo.core.service.CommentService"
 					 interface="com.jim.framework.dubbo.core.service.CommentService"
 					 id="commentService">
 

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
@@ -14,7 +14,8 @@
 
 	<dubbo:protocol name="dubbo" accesslog="true" port="${server.port}"/>
 
-	<dubbo:registry address="N/A" />
+	<dubbo:registry address="127.0.0.1:2181,127.0.0.1:2182,127.0.0.1:2183" client="curator" protocol="zookeeper" />
+	<!--<dubbo:registry address="127.0.0.1:2184" protocol="zookeeper" />-->
 	<dubbo:service interface="com.jim.framework.dubbo.core.service.ProductService" ref="productService"/>
 
 	<bean id="productService"

diff --git a/jim-framework-dubbo-provider2/src/main/resources/application.properties b/jim-framework-dubbo-provider2/src/main/resources/application.properties
@@ -4,4 +4,4 @@ spring.application.name=comment-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-provider2/src/main/resources/applicationContext-dubbo-provider.xml b/jim-framework-dubbo-provider2/src/main/resources/applicationContext-dubbo-provider.xml
@@ -14,7 +14,8 @@
 
 	<dubbo:protocol name="dubbo" accesslog="true" port="${server.port}"/>
 
-	<dubbo:registry address="N/A" />
+	<!--<dubbo:registry address="N/A" />-->
+	<dubbo:registry address="127.0.0.1:2181" protocol="zookeeper" />
 	<dubbo:service interface="com.jim.framework.dubbo.core.service.CommentService" ref="commentService"/>
 
 	<bean id="commentService"