diff --git a/40.Spring-Boot-Dubbo-Zookeeper/pom.xml b/40.Spring-Boot-Dubbo-Zookeeper/pom.xml index 6c2afb7..3af2aac 100644 --- a/40.Spring-Boot-Dubbo-Zookeeper/pom.xml +++ b/40.Spring-Boot-Dubbo-Zookeeper/pom.xml @@ -39,10 +39,11 @@ - com.alibaba.spring.boot + com.alibaba.boot dubbo-spring-boot-starter - 2.0.0 + 0.2.0 + org.apache.zookeeper diff --git a/40.Spring-Boot-Dubbo-Zookeeper/server-consumer/src/main/java/cc/mrbird/Applicaiton.java b/40.Spring-Boot-Dubbo-Zookeeper/server-consumer/src/main/java/cc/mrbird/ConsumerApplicaiton.java similarity index 54% rename from 40.Spring-Boot-Dubbo-Zookeeper/server-consumer/src/main/java/cc/mrbird/Applicaiton.java rename to 40.Spring-Boot-Dubbo-Zookeeper/server-consumer/src/main/java/cc/mrbird/ConsumerApplicaiton.java index 5f86eb5..0c4f7cc 100644 --- a/40.Spring-Boot-Dubbo-Zookeeper/server-consumer/src/main/java/cc/mrbird/Applicaiton.java +++ b/40.Spring-Boot-Dubbo-Zookeeper/server-consumer/src/main/java/cc/mrbird/ConsumerApplicaiton.java @@ -1,13 +1,13 @@ package cc.mrbird; -import com.alibaba.dubbo.spring.boot.annotation.EnableDubboConfiguration; +import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +@EnableDubbo @SpringBootApplication -@EnableDubboConfiguration -public class Applicaiton { +public class ConsumerApplicaiton { public static void main(String[] args) { - SpringApplication.run(Applicaiton.class, args); + SpringApplication.run(ConsumerApplicaiton.class, args); } } diff --git a/40.Spring-Boot-Dubbo-Zookeeper/server-consumer/src/main/resources/application.yml b/40.Spring-Boot-Dubbo-Zookeeper/server-consumer/src/main/resources/application.yml index 51a82db..a2af535 100644 --- a/40.Spring-Boot-Dubbo-Zookeeper/server-consumer/src/main/resources/application.yml +++ b/40.Spring-Boot-Dubbo-Zookeeper/server-consumer/src/main/resources/application.yml @@ -1,15 +1,13 @@ server: port: 8081 -spring: - dubbo: - application: - # 服务名称,保持唯一 - name: server-consumer - # zookeeper地址,用于向其注册服务 - registry: - address: zookeeper://127.0.0.1:2181 - protocol: - # dubbo协议,固定写法 - name: dubbo - # 扫描需要调用服务的类路径 - scan: cc.mrbird.consumer.controller \ No newline at end of file + +dubbo: + application: + # 服务名称,保持唯一 + name: server-consumer + # zookeeper地址,用于从中获取注册的服务 + registry: + address: zookeeper://127.0.0.1:2181 + protocol: + # dubbo协议,固定写法 + name: dubbo \ No newline at end of file diff --git a/40.Spring-Boot-Dubbo-Zookeeper/server-provider/src/main/java/cc/mrbird/Applicaiton.java b/40.Spring-Boot-Dubbo-Zookeeper/server-provider/src/main/java/cc/mrbird/ProviderApplicaiton.java similarity index 58% rename from 40.Spring-Boot-Dubbo-Zookeeper/server-provider/src/main/java/cc/mrbird/Applicaiton.java rename to 40.Spring-Boot-Dubbo-Zookeeper/server-provider/src/main/java/cc/mrbird/ProviderApplicaiton.java index f36837d..ab69f4b 100644 --- a/40.Spring-Boot-Dubbo-Zookeeper/server-provider/src/main/java/cc/mrbird/Applicaiton.java +++ b/40.Spring-Boot-Dubbo-Zookeeper/server-provider/src/main/java/cc/mrbird/ProviderApplicaiton.java @@ -1,14 +1,14 @@ package cc.mrbird; -import com.alibaba.dubbo.spring.boot.annotation.EnableDubboConfiguration; +import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +@EnableDubbo @SpringBootApplication -@EnableDubboConfiguration -public class Applicaiton { +public class ProviderApplicaiton { public static void main(String[] args) { - SpringApplication.run(Applicaiton.class, args); + SpringApplication.run(ProviderApplicaiton.class, args); System.out.println("complete"); } } diff --git a/40.Spring-Boot-Dubbo-Zookeeper/server-provider/src/main/resources/application.yml b/40.Spring-Boot-Dubbo-Zookeeper/server-provider/src/main/resources/application.yml index 8cf2899..5aeafcf 100644 --- a/40.Spring-Boot-Dubbo-Zookeeper/server-provider/src/main/resources/application.yml +++ b/40.Spring-Boot-Dubbo-Zookeeper/server-provider/src/main/resources/application.yml @@ -1,19 +1,16 @@ server: port: 8080 -spring: - dubbo: - application: - # 服务名称,保持唯一 - name: server-provider - # zookeeper地址,用于向其注册服务 - registry: - address: zookeeper://127.0.0.1:2181 - #暴露服务方式 - protocol: - # dubbo协议,固定写法 - name: dubbo - # 暴露服务端口 (默认是20880,不同的服务提供者端口不能重复) - port: 20880 - server: true - # 扫描需要暴露服务的类路径 - scan: cc.mrbird.provider.service \ No newline at end of file + +dubbo: + application: + # 服务名称,保持唯一 + name: server-provider + # zookeeper地址,用于向其注册服务 + registry: + address: zookeeper://127.0.0.1:2181 + #暴露服务方式 + protocol: + # dubbo协议,固定写法 + name: dubbo + # 暴露服务端口 (默认是20880,不同的服务提供者端口不能重复) + port: 20880 \ No newline at end of file