From c550340c7c185cf9674dc8b30db097403b5645f7 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 9 May 2019 01:16:12 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=90=8E=E7=AB=AF=EF=BC=9A=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=20Order=20=E5=92=8C=20Search=20=E7=9A=84=20Dubbo=20?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=BC=95=E7=94=A8=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/users/OrderController.java | 4 ++-- .../controller/users/OrderLogisticsController.java | 2 +- .../controller/users/OrderReturnController.java | 2 +- .../order/biz/service/OrderReturnServiceImpl.java | 2 +- .../mall/order/biz/service/OrderServiceImpl.java | 8 ++++---- .../src/main/resources/config/application.yaml | 8 ++++++++ .../mall/pay/biz/component/DubboReferencePool.java | 2 +- search/search-application/pom.xml | 9 --------- search/search-service-impl/pom.xml | 12 ++++++++++++ 9 files changed, 30 insertions(+), 19 deletions(-) diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderController.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderController.java index 08e83a2a2..730594622 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderController.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderController.java @@ -42,9 +42,9 @@ public class OrderController { @Reference(validation = "true") private OrderService orderService; - @Reference(validation = "true") + @Reference(validation = "true", version = "${dubbo.provider.CartService.version}") private CartService cartService; - @Reference(validation = "true") + @Reference(validation = "true", version = "${dubbo.consumer.DataDictService.version}") private DataDictService dataDictService; @GetMapping("order_page") diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderLogisticsController.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderLogisticsController.java index b8a4b7410..75bbf0c0b 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderLogisticsController.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderLogisticsController.java @@ -37,7 +37,7 @@ public class OrderLogisticsController { @Reference(validation = "true") private OrderLogisticsService orderLogisticsService; - @Reference(validation = "true") + @Reference(validation = "true", version = "${dubbo.consumer.DataDictService.version}") private DataDictService dataDictService; @GetMapping("info") diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderReturnController.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderReturnController.java index a19249ce4..663816cb9 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderReturnController.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderReturnController.java @@ -27,7 +27,7 @@ public class OrderReturnController { @Reference(validation = "true") private OrderReturnService orderReturnService; - @Reference(validation = "true") + @Reference(validation = "true", version = "${dubbo.consumer.DataDictService.version}") private DataDictService dataDictService; @GetMapping("reason") diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java index 428203e8b..ec303e3b7 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java @@ -53,7 +53,7 @@ public class OrderReturnServiceImpl implements OrderReturnService { @Reference(validation = "true") private OrderLogisticsService orderLogisticsService; - @Reference(validation = "true") + @Reference(validation = "true", version = "${dubbo.consumer.PayRefundService.version}") private PayRefundService payRefundService; @Override diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java index 67f330c4d..151cfa4ea 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java @@ -65,13 +65,13 @@ public class OrderServiceImpl implements OrderService { @Autowired private CartServiceImpl cartService; - @Reference(validation = "true") + @Reference(validation = "true", version = "${dubbo.consumer.PromotionActivityService.version}") private ProductSpuService productSpuService; - @Reference(validation = "true") + @Reference(validation = "true", version = "${dubbo.consumer.UserAddressService.version}") private UserAddressService userAddressService; - @Reference(validation = "true") + @Reference(validation = "true", version = "${dubbo.consumer.PayTransactionService.version}") private PayTransactionService payTransactionService; - @Reference(validation = "true") + @Reference(validation = "true", version = "${dubbo.consumer.CouponService.version}") private CouponService couponService; @Override diff --git a/order/order-service-impl/src/main/resources/config/application.yaml b/order/order-service-impl/src/main/resources/config/application.yaml index 31ccaee44..9a80ed381 100644 --- a/order/order-service-impl/src/main/resources/config/application.yaml +++ b/order/order-service-impl/src/main/resources/config/application.yaml @@ -33,6 +33,14 @@ dubbo: version: 1.0.0 CouponService: version: 1.0.0 + PayRefundService: + version: 1.0.0 + UserAddressService: + version: 1.0.0 + PayTransactionService: + version: 1.0.0 + DataDictService: + version: 1.0.0 # logging logging: diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/component/DubboReferencePool.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/component/DubboReferencePool.java index 17cde45f8..85837009f 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/component/DubboReferencePool.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/component/DubboReferencePool.java @@ -58,7 +58,7 @@ public class DubboReferencePool { reference.setInterface(notifyUrlParts[0]); // 弱类型接口名 reference.setGeneric(true); // 声明为泛化接口 reference.setApplication(application); - reference.setVersion("1.0.0"); // TODO 芋艿，后面要优化下。 +// reference.setVersion("*"); // TODO 芋艿，后面要优化下。 // 获得 GenericService 对象 GenericService genericService = reference.get(); // 构建最终的 ReferenceMeta 对象 diff --git a/search/search-application/pom.xml b/search/search-application/pom.xml index 332a3179a..90555f81d 100644 --- a/search/search-application/pom.xml +++ b/search/search-application/pom.xml @@ -38,15 +38,6 @@ spring-boot-starter-web - - org.apache.dubbo - dubbo - - - - - - org.apache.curator curator-framework diff --git a/search/search-service-impl/pom.xml b/search/search-service-impl/pom.xml index 2147e2f55..4c26c32ae 100644 --- a/search/search-service-impl/pom.xml +++ b/search/search-service-impl/pom.xml @@ -32,6 +32,18 @@ org.apache.dubbo dubbo + + org.apache.curator + curator-framework + + + org.apache.curator + curator-recipes + + + org.apache.dubbo + dubbo-spring-boot-starter + com.google.guava