Merge branch 'master' into add_cluster_test

apache · Jun 6, 2024 · 75b18aa · 75b18aa
2 parents 449034e + 8d71505
commit 75b18aa
Show file tree

Hide file tree

Showing 35 changed files with 70 additions and 996 deletions.
diff --git a/...bo-shop/dubbo-shop-web-ads/src/main/java/org/apache/dubbo/shop/web/ads/AdsController.java b/...bo-shop/dubbo-shop-web-ads/src/main/java/org/apache/dubbo/shop/web/ads/AdsController.java
diff --git a/dubbo-samples-shop/dubbo-shop/dubbo-shop-web-ads/src/main/resources/application.yml b/dubbo-samples-shop/dubbo-shop/dubbo-shop-web-ads/src/main/resources/application.yml
diff --git a/dubbo-samples-shop/dubbo-shop/dubbo-shop-web-checkout/pom.xml b/dubbo-samples-shop/dubbo-shop/dubbo-shop-web-checkout/pom.xml
diff --git a/...hop-web-checkout/src/main/java/org/apache/dubbo/shop/web/checkout/CheckoutController.java b/...hop-web-checkout/src/main/java/org/apache/dubbo/shop/web/checkout/CheckoutController.java
diff --git a/...ckout/src/main/java/org/apache/dubbo/shop/web/checkout/CheckoutControllerApplication.java b/...ckout/src/main/java/org/apache/dubbo/shop/web/checkout/CheckoutControllerApplication.java
diff --git a/dubbo-samples-shop/dubbo-shop/dubbo-shop-web-checkout/src/main/resources/application.yml b/dubbo-samples-shop/dubbo-shop/dubbo-shop-web-checkout/src/main/resources/application.yml
diff --git a/dubbo-samples-shop/dubbo-shop/dubbo-shop-web-goodsDetails/pom.xml b/dubbo-samples-shop/dubbo-shop/dubbo-shop-web-goodsDetails/pom.xml
diff --git a/...c/main/java/oeg/apache/dubbo/shop/web/goodsDetails/GoodsDetailsControllerApplication.java b/...c/main/java/oeg/apache/dubbo/shop/web/goodsDetails/GoodsDetailsControllerApplication.java
diff --git a/dubbo-samples-shop/dubbo-shop/dubbo-shop-web-goodsDetails/src/main/resources/application.yml b/dubbo-samples-shop/dubbo-shop/dubbo-shop-web-goodsDetails/src/main/resources/application.yml