From 0604694e7868a746115398373717f66a22f6bbbe Mon Sep 17 00:00:00 2001
From: heliang <3596006474@qq.com>
Date: Wed, 14 Aug 2024 19:51:39 +0800
Subject: [PATCH] replace zookeeper with nacos

---
 online_bontique_demo/adService/pom.xml                   | 9 +++++++--
 .../adService/src/main/resources/application.yml         | 2 +-
 online_bontique_demo/cartService/pom.xml                 | 9 +++++++--
 .../cartService/src/main/resources/application.yml       | 2 +-
 online_bontique_demo/checkoutService/pom.xml             | 8 ++++++--
 .../checkoutService/src/main/resources/application.yml   | 2 +-
 online_bontique_demo/common/pom.xml                      | 2 --
 online_bontique_demo/currencyService/pom.xml             | 9 +++++++--
 .../currencyService/src/main/resources/application.yml   | 2 +-
 online_bontique_demo/emailService/pom.xml                | 8 ++++++--
 .../emailService/src/main/resources/application.yml      | 2 +-
 online_bontique_demo/frontend/pom.xml                    | 5 +----
 .../frontend/src/main/resources/application.yml          | 2 +-
 .../frontend/src/main/resources/static/styles/cart.css   | 4 ++--
 .../frontend/src/main/resources/static/styles/order.css  | 3 ++-
 .../frontend/src/main/resources/static/styles/styles.css | 3 ++-
 .../frontend/src/main/resources/templates/cart.html      | 4 ++++
 .../frontend/src/main/resources/templates/footer.html    | 1 +
 .../frontend/src/main/resources/templates/product.html   | 2 +-
 online_bontique_demo/paymentService/pom.xml              | 8 ++++++--
 .../paymentService/src/main/resources/application.yml    | 2 +-
 online_bontique_demo/productCatalogsService/pom.xml      | 9 +++++++--
 .../src/main/resources/application.yml                   | 2 +-
 online_bontique_demo/recommendationService/pom.xml       | 8 ++++++--
 .../src/main/resources/application.yml                   | 2 +-
 online_bontique_demo/shippingService/pom.xml             | 3 +--
 .../shippingService/src/main/resources/application.yml   | 2 +-
 27 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/online_bontique_demo/adService/pom.xml b/online_bontique_demo/adService/pom.xml
index 4a8a513515..3c78278d0f 100644
--- a/online_bontique_demo/adService/pom.xml
+++ b/online_bontique_demo/adService/pom.xml
@@ -45,11 +45,16 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
         </dependency>
+
     </dependencies>
 
 </project>
diff --git a/online_bontique_demo/adService/src/main/resources/application.yml b/online_bontique_demo/adService/src/main/resources/application.yml
index 4915695c10..6dc9313b8e 100644
--- a/online_bontique_demo/adService/src/main/resources/application.yml
+++ b/online_bontique_demo/adService/src/main/resources/application.yml
@@ -28,7 +28,7 @@ dubbo:
     qos-enable: false
     check-serializable: false
   registry:
-    address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+    address: nacos://${nacos.address:127.0.0.1}:8848
   protocol:
     port: 20880
     name: tri
diff --git a/online_bontique_demo/cartService/pom.xml b/online_bontique_demo/cartService/pom.xml
index bc2df14588..426aeda6bd 100644
--- a/online_bontique_demo/cartService/pom.xml
+++ b/online_bontique_demo/cartService/pom.xml
@@ -45,11 +45,16 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
         </dependency>
+
     </dependencies>
 
 </project>
diff --git a/online_bontique_demo/cartService/src/main/resources/application.yml b/online_bontique_demo/cartService/src/main/resources/application.yml
index cc924f71f7..e1d741ee2f 100644
--- a/online_bontique_demo/cartService/src/main/resources/application.yml
+++ b/online_bontique_demo/cartService/src/main/resources/application.yml
@@ -27,7 +27,7 @@ dubbo:
     qos-enable: false
     check-serializable: false
   registry:
-    address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+    address: nacos://${nacos.address:127.0.0.1}:8848
   protocol:
     port: 20881
     name: tri
diff --git a/online_bontique_demo/checkoutService/pom.xml b/online_bontique_demo/checkoutService/pom.xml
index cdeb656055..623d9146fb 100644
--- a/online_bontique_demo/checkoutService/pom.xml
+++ b/online_bontique_demo/checkoutService/pom.xml
@@ -45,10 +45,14 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/online_bontique_demo/checkoutService/src/main/resources/application.yml b/online_bontique_demo/checkoutService/src/main/resources/application.yml
index a702899134..532f6bcb87 100644
--- a/online_bontique_demo/checkoutService/src/main/resources/application.yml
+++ b/online_bontique_demo/checkoutService/src/main/resources/application.yml
@@ -27,7 +27,7 @@ dubbo:
     qos-enable: false
     check-serializable: false
   registry:
-    address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+    address: nacos://${nacos.address:127.0.0.1}:8848
   protocol:
     port: 20882
     name: tri
diff --git a/online_bontique_demo/common/pom.xml b/online_bontique_demo/common/pom.xml
index dd9a1cb95b..6c0b059137 100644
--- a/online_bontique_demo/common/pom.xml
+++ b/online_bontique_demo/common/pom.xml
@@ -56,8 +56,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
-
-
     </dependencies>
 
 </project>
diff --git a/online_bontique_demo/currencyService/pom.xml b/online_bontique_demo/currencyService/pom.xml
index 5748c1f1da..4a3ac0ee8e 100644
--- a/online_bontique_demo/currencyService/pom.xml
+++ b/online_bontique_demo/currencyService/pom.xml
@@ -45,11 +45,16 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
         </dependency>
+
     </dependencies>
 
 </project>
diff --git a/online_bontique_demo/currencyService/src/main/resources/application.yml b/online_bontique_demo/currencyService/src/main/resources/application.yml
index 706208320f..1e22e59711 100644
--- a/online_bontique_demo/currencyService/src/main/resources/application.yml
+++ b/online_bontique_demo/currencyService/src/main/resources/application.yml
@@ -27,7 +27,7 @@ dubbo:
     qos-enable: false
     check-serializable: false
   registry:
-    address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+    address: nacos://${nacos.address:127.0.0.1}:8848
   protocol:
     port: 20883
     name: tri
diff --git a/online_bontique_demo/emailService/pom.xml b/online_bontique_demo/emailService/pom.xml
index add0bbe620..0a2319c8ca 100644
--- a/online_bontique_demo/emailService/pom.xml
+++ b/online_bontique_demo/emailService/pom.xml
@@ -45,10 +45,14 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/online_bontique_demo/emailService/src/main/resources/application.yml b/online_bontique_demo/emailService/src/main/resources/application.yml
index 01d7bc8021..51aed12de5 100644
--- a/online_bontique_demo/emailService/src/main/resources/application.yml
+++ b/online_bontique_demo/emailService/src/main/resources/application.yml
@@ -27,7 +27,7 @@ dubbo:
     qos-enable: false
     check-serializable: false
   registry:
-    address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+    address: nacos://${nacos.address:127.0.0.1}:8848
   protocol:
     port: 20884
     name: tri
\ No newline at end of file
diff --git a/online_bontique_demo/frontend/pom.xml b/online_bontique_demo/frontend/pom.xml
index aa201e7bb7..667fc38976 100644
--- a/online_bontique_demo/frontend/pom.xml
+++ b/online_bontique_demo/frontend/pom.xml
@@ -52,8 +52,7 @@
 
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
         </dependency>
 
         <dependency>
@@ -120,9 +119,7 @@
                 <version>3.8.1</version>
                 <configuration>
                     <source>17</source>
-                    <!-- 或者使用你当前使用的 Java 版本 -->
                     <target>17</target>
-                    <!-- 或者使用你当前使用的 Java 版本 -->
                     <compilerArgs>
                         <arg>-parameters</arg>
                     </compilerArgs>
diff --git a/online_bontique_demo/frontend/src/main/resources/application.yml b/online_bontique_demo/frontend/src/main/resources/application.yml
index 851e137436..51db0b2bd7 100644
--- a/online_bontique_demo/frontend/src/main/resources/application.yml
+++ b/online_bontique_demo/frontend/src/main/resources/application.yml
@@ -35,7 +35,7 @@ dubbo:
     qos-enable: false
     check-serializable: false
   registry:
-    address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+    address: nacos://${nacos.address:127.0.0.1}:8848
   protocol:
     port: 20889
     name: tri
\ No newline at end of file
diff --git a/online_bontique_demo/frontend/src/main/resources/static/styles/cart.css b/online_bontique_demo/frontend/src/main/resources/static/styles/cart.css
index 0317c4bb9b..99aaec01f1 100644
--- a/online_bontique_demo/frontend/src/main/resources/static/styles/cart.css
+++ b/online_bontique_demo/frontend/src/main/resources/static/styles/cart.css
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -108,4 +108,4 @@
 /* "Place Order" button */
 .cart-checkout-form .cymbal-button-primary {
     margin-top: 36px;
-}
+}
\ No newline at end of file
diff --git a/online_bontique_demo/frontend/src/main/resources/static/styles/order.css b/online_bontique_demo/frontend/src/main/resources/static/styles/order.css
index d5c7d2fc61..5cc8766a46 100644
--- a/online_bontique_demo/frontend/src/main/resources/static/styles/order.css
+++ b/online_bontique_demo/frontend/src/main/resources/static/styles/order.css
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 .order {
     background: #F9F9F9;
 }
diff --git a/online_bontique_demo/frontend/src/main/resources/static/styles/styles.css b/online_bontique_demo/frontend/src/main/resources/static/styles/styles.css
index 647891f4f4..5f39939dc1 100644
--- a/online_bontique_demo/frontend/src/main/resources/static/styles/styles.css
+++ b/online_bontique_demo/frontend/src/main/resources/static/styles/styles.css
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 /* General */
 
 html, body {
diff --git a/online_bontique_demo/frontend/src/main/resources/templates/cart.html b/online_bontique_demo/frontend/src/main/resources/templates/cart.html
index cfccad6d16..5c9b41eafa 100644
--- a/online_bontique_demo/frontend/src/main/resources/templates/cart.html
+++ b/online_bontique_demo/frontend/src/main/resources/templates/cart.html
@@ -33,6 +33,10 @@
 <!-- 引用 Header -->
 <div th:replace="header :: header"></div>
 
+<div th:class="local">
+    <span class="platform-flag" th:text="local"></span>
+</div>
+
 <main role="main" class="cart-sections">
 
     <!-- 判断购物车是否为空 -->
diff --git a/online_bontique_demo/frontend/src/main/resources/templates/footer.html b/online_bontique_demo/frontend/src/main/resources/templates/footer.html
index 3365724eb5..951d6e9bad 100644
--- a/online_bontique_demo/frontend/src/main/resources/templates/footer.html
+++ b/online_bontique_demo/frontend/src/main/resources/templates/footer.html
@@ -14,6 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
 
 <footer class="py-5">
diff --git a/online_bontique_demo/frontend/src/main/resources/templates/product.html b/online_bontique_demo/frontend/src/main/resources/templates/product.html
index be6fc918a0..f13667e757 100644
--- a/online_bontique_demo/frontend/src/main/resources/templates/product.html
+++ b/online_bontique_demo/frontend/src/main/resources/templates/product.html
@@ -1,5 +1,5 @@
 <!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
+  Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
diff --git a/online_bontique_demo/paymentService/pom.xml b/online_bontique_demo/paymentService/pom.xml
index a03b32878b..76de4f95d7 100644
--- a/online_bontique_demo/paymentService/pom.xml
+++ b/online_bontique_demo/paymentService/pom.xml
@@ -45,10 +45,14 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/online_bontique_demo/paymentService/src/main/resources/application.yml b/online_bontique_demo/paymentService/src/main/resources/application.yml
index 182b0c0bed..f333f9a52c 100644
--- a/online_bontique_demo/paymentService/src/main/resources/application.yml
+++ b/online_bontique_demo/paymentService/src/main/resources/application.yml
@@ -27,7 +27,7 @@ dubbo:
     qos-enable: false
     check-serializable: false
   registry:
-    address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+    address: nacos://${nacos.address:127.0.0.1}:8848
   protocol:
     port: 20885
     name: tri
diff --git a/online_bontique_demo/productCatalogsService/pom.xml b/online_bontique_demo/productCatalogsService/pom.xml
index c9be48871b..30475184b9 100644
--- a/online_bontique_demo/productCatalogsService/pom.xml
+++ b/online_bontique_demo/productCatalogsService/pom.xml
@@ -45,10 +45,15 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
         </dependency>
+
     </dependencies>
 </project>
diff --git a/online_bontique_demo/productCatalogsService/src/main/resources/application.yml b/online_bontique_demo/productCatalogsService/src/main/resources/application.yml
index 6c8c2b9017..3c0a421056 100644
--- a/online_bontique_demo/productCatalogsService/src/main/resources/application.yml
+++ b/online_bontique_demo/productCatalogsService/src/main/resources/application.yml
@@ -27,7 +27,7 @@ dubbo:
     qos-enable: false
     check-serializable: false
   registry:
-    address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+    address: nacos://${nacos.address:127.0.0.1}:8848
   protocol:
     port: 20886
     name: tri
diff --git a/online_bontique_demo/recommendationService/pom.xml b/online_bontique_demo/recommendationService/pom.xml
index 774d0ffef7..93d6baf65e 100644
--- a/online_bontique_demo/recommendationService/pom.xml
+++ b/online_bontique_demo/recommendationService/pom.xml
@@ -45,10 +45,14 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/online_bontique_demo/recommendationService/src/main/resources/application.yml b/online_bontique_demo/recommendationService/src/main/resources/application.yml
index f2773b491d..9afd455322 100644
--- a/online_bontique_demo/recommendationService/src/main/resources/application.yml
+++ b/online_bontique_demo/recommendationService/src/main/resources/application.yml
@@ -27,7 +27,7 @@ dubbo:
     qos-enable: false
     check-serializable: false
   registry:
-    address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+    address: nacos://${nacos.address:127.0.0.1}:8848
   protocol:
     port: 20887
     name: tri
diff --git a/online_bontique_demo/shippingService/pom.xml b/online_bontique_demo/shippingService/pom.xml
index 86913ee064..cb448d905e 100644
--- a/online_bontique_demo/shippingService/pom.xml
+++ b/online_bontique_demo/shippingService/pom.xml
@@ -47,8 +47,7 @@
 
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/online_bontique_demo/shippingService/src/main/resources/application.yml b/online_bontique_demo/shippingService/src/main/resources/application.yml
index 69dbb0a128..807760857f 100644
--- a/online_bontique_demo/shippingService/src/main/resources/application.yml
+++ b/online_bontique_demo/shippingService/src/main/resources/application.yml
@@ -27,7 +27,7 @@ dubbo:
     qos-enable: false
     check-serializable: false
   registry:
-    address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+    address: nacos://${nacos.address:127.0.0.1}:8848
   protocol:
     port: 20888
     name: tri