replace zookeeper with nacos

heliang666s · Aug 14, 2024 · 0604694 · 0604694
1 parent 60c88b6
commit 0604694
Show file tree

Hide file tree

Showing 27 changed files with 76 additions and 39 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
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
@@ -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;
-}
+}
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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