From 1209d109fd765f00b3789926ac574b2f2e806f6a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 十月 2024 15:18:37 +0800
Subject: [PATCH] 合併代碼

---
 ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml        |    1 
 ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml        |    1 
 ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml      |   56 ++++----
 ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml      |   56 ++++----
 ruoyi-gateway/src/main/resources/bootstrap.yml                    |    4 
 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml       |   56 ++++----
 ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml |   56 ++++----
 ruoyi-auth/src/main/resources/bootstrap.yml                       |   56 ++++----
 ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml  |   56 ++++----
 9 files changed, 170 insertions(+), 172 deletions(-)

diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index 20ccecd..866e429 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -6,8 +6,8 @@
 spring:
   profiles:
     # 环境配置
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
   application:
     # 应用名称
     name: ruoyi-auth
@@ -56,52 +56,52 @@
     type: nacos
     nacos:
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      data-id: seata-server.properties
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       data-id: seata-server.properties
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      data-id: seata-server.properties
+#      username: nacos
+#      password: nacos
   registry:
     type: nacos
     nacos:
       application: seata-server
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      username: nacos
+#      password: nacos
   cloud:
     nacos:
       discovery:
         # 开发环境
-#        server-addr: 192.168.110.169:8848 # nacos注册中心地址
-#        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
-#        group: DEFAULT_GROUP
-#        application: seata-server #Nacos 中 Seata 名称
-#        username: nacos
-#        password: nacos
-        # 生产环境
-        server-addr: 192.168.0.137:8848,192.168.0.123:8848
-        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+        server-addr: 192.168.110.169:8848 # nacos注册中心地址
+        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
         group: DEFAULT_GROUP
         application: seata-server #Nacos 中 Seata 名称
         username: nacos
         password: nacos
+        # 生产环境
+#        server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#        group: DEFAULT_GROUP
+#        application: seata-server #Nacos 中 Seata 名称
+#        username: nacos
+#        password: nacos
     sentinel:
       transport:
         dashboard: 127.0.0.1:8080  #  Sentinel控制台地址
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 7598ca6..48963f2 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -12,8 +12,8 @@
     allow-bean-definition-overriding: true
   profiles:
     # 环境配置
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
 ---
 spring:
   config:
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index c8f030b..dbd2ab0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -11,8 +11,8 @@
     allow-bean-definition-overriding: true
   profiles:
     # 环境配置
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
 ---
 spring:
   config:
@@ -55,52 +55,52 @@
     type: nacos
     nacos:
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      data-id: seata-server.properties
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       data-id: seata-server.properties
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      data-id: seata-server.properties
+#      username: nacos
+#      password: nacos
   registry:
     type: nacos
     nacos:
       application: seata-server
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      username: nacos
+#      password: nacos
   cloud:
     nacos:
       discovery:
         # 开发环境
-#        server-addr: 192.168.110.169:8848 # nacos注册中心地址
-#        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
-#        group: DEFAULT_GROUP
-#        application: seata-server #Nacos 中 Seata 名称
-#        username: nacos
-#        password: nacos
-        # 生产环境
-        server-addr: 192.168.0.137:8848,192.168.0.123:8848
-        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+        server-addr: 192.168.110.169:8848 # nacos注册中心地址
+        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
         group: DEFAULT_GROUP
         application: seata-server #Nacos 中 Seata 名称
         username: nacos
         password: nacos
+        # 生产环境
+#        server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#        group: DEFAULT_GROUP
+#        application: seata-server #Nacos 中 Seata 名称
+#        username: nacos
+#        password: nacos
     sentinel:
       transport:
         dashboard: 127.0.0.1:8080  #  Sentinel控制台地址
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml
index 32d84d4..ce8973a 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml
@@ -12,8 +12,8 @@
     allow-circular-references: true
   profiles:
     # 环境配置
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
 ---
 spring:
   config:
@@ -56,52 +56,52 @@
     type: nacos
     nacos:
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      data-id: seata-server.properties
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       data-id: seata-server.properties
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      data-id: seata-server.properties
+#      username: nacos
+#      password: nacos
   registry:
     type: nacos
     nacos:
       application: seata-server
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      username: nacos
+#      password: nacos
   cloud:
     nacos:
       discovery:
         # 开发环境
-#        server-addr: 192.168.110.169:8848 # nacos注册中心地址
-#        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
-#        group: DEFAULT_GROUP
-#        application: seata-server #Nacos 中 Seata 名称
-#        username: nacos
-#        password: nacos
-        # 生产环境
-        server-addr: 192.168.0.137:8848,192.168.0.123:8848
-        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+        server-addr: 192.168.110.169:8848 # nacos注册中心地址
+        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
         group: DEFAULT_GROUP
         application: seata-server #Nacos 中 Seata 名称
         username: nacos
         password: nacos
+        # 生产环境
+#        server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#        group: DEFAULT_GROUP
+#        application: seata-server #Nacos 中 Seata 名称
+#        username: nacos
+#        password: nacos
     sentinel:
       transport:
         dashboard: 192.168.0.137:8080  #  Sentinel控制台地址
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
index 1aa8faa..7c025cd 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
@@ -12,8 +12,8 @@
     allow-circular-references: true
   profiles:
     # 环境配置
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
 ---
 spring:
   config:
@@ -56,52 +56,52 @@
     type: nacos
     nacos:
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      data-id: seata-server.properties
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       data-id: seata-server.properties
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      data-id: seata-server.properties
+#      username: nacos
+#      password: nacos
   registry:
     type: nacos
     nacos:
       application: seata-server
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      username: nacos
+#      password: nacos
   cloud:
     nacos:
       discovery:
         # 开发环境
-#        server-addr: 192.168.110.169:8848 # nacos注册中心地址
-#        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
-#        group: DEFAULT_GROUP
-#        application: seata-server #Nacos 中 Seata 名称
-#        username: nacos
-#        password: nacos
-        # 生产环境
-        server-addr: 192.168.0.137:8848,192.168.0.123:8848
-        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+        server-addr: 192.168.110.169:8848 # nacos注册中心地址
+        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
         group: DEFAULT_GROUP
         application: seata-server #Nacos 中 Seata 名称
         username: nacos
         password: nacos
+        # 生产环境
+#        server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#        group: DEFAULT_GROUP
+#        application: seata-server #Nacos 中 Seata 名称
+#        username: nacos
+#        password: nacos
     sentinel:
       transport:
         dashboard: 127.0.0.1:8080  #  Sentinel控制台地址
diff --git a/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
index 12e29cf..b61f26e 100644
--- a/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
@@ -12,8 +12,8 @@
     allow-circular-references: true
   profiles:
     # 环境配置
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
     
 ---
 spring:
@@ -64,52 +64,52 @@
     type: nacos
     nacos:
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      data-id: seata-server.properties
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       data-id: seata-server.properties
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      data-id: seata-server.properties
+#      username: nacos
+#      password: nacos
   registry:
     type: nacos
     nacos:
       application: seata-server
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      username: nacos
+#      password: nacos
   cloud:
     nacos:
       discovery:
         # 开发环境
-#        server-addr: 192.168.110.169:8848 # nacos注册中心地址
-#        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
-#        group: DEFAULT_GROUP
-#        application: seata-server #Nacos 中 Seata 名称
-#        username: nacos
-#        password: nacos
-        # 生产环境
-        server-addr: 192.168.0.137:8848,192.168.0.123:8848
-        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+        server-addr: 192.168.110.169:8848 # nacos注册中心地址
+        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
         group: DEFAULT_GROUP
         application: seata-server #Nacos 中 Seata 名称
         username: nacos
         password: nacos
+        # 生产环境
+#        server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#        group: DEFAULT_GROUP
+#        application: seata-server #Nacos 中 Seata 名称
+#        username: nacos
+#        password: nacos
     sentinel:
       transport:
         dashboard: 127.0.0.1:8080  #  Sentinel控制台地址
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
index 917dd7a..d0b8691 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
@@ -29,7 +29,6 @@
         namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
         username: nacos
         password: nacos
-        ip: 192.168.110.85
       config:
         # 配置中心地址
         server-addr: 192.168.110.169:8848
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
index 382af35..fc51ae5 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
@@ -29,7 +29,6 @@
         namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
         username: nacos
         password: nacos
-        ip: 192.168.110.85
       config:
         # 配置中心地址
         server-addr: 192.168.110.169:8848
diff --git a/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
index 3d1b30e..0c4c5ce 100644
--- a/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
@@ -12,8 +12,8 @@
     allow-circular-references: true
   profiles:
     # 环境配置
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
 ---
 spring:
   config:
@@ -56,52 +56,52 @@
     type: nacos
     nacos:
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      data-id: seata-server.properties
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       data-id: seata-server.properties
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      data-id: seata-server.properties
+#      username: nacos
+#      password: nacos
   registry:
     type: nacos
     nacos:
       application: seata-server
       # 开发环境
-#      server-addr: 192.168.110.169:8848
-#      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-#      group: DEFAULT_GROUP
-#      username: nacos
-#      password: nacos
-      # 生产环境
-      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+      server-addr: 192.168.110.169:8848
+      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
       group: DEFAULT_GROUP
       username: nacos
       password: nacos
+      # 生产环境
+#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#      group: DEFAULT_GROUP
+#      username: nacos
+#      password: nacos
   cloud:
     nacos:
       discovery:
         # 开发环境
-#        server-addr: 192.168.110.169:8848 # nacos注册中心地址
-#        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
-#        group: DEFAULT_GROUP
-#        application: seata-server #Nacos 中 Seata 名称
-#        username: nacos
-#        password: nacos
-        # 生产环境
-        server-addr: 192.168.0.137:8848,192.168.0.123:8848
-        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+        server-addr: 192.168.110.169:8848 # nacos注册中心地址
+        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
         group: DEFAULT_GROUP
         application: seata-server #Nacos 中 Seata 名称
         username: nacos
         password: nacos
+        # 生产环境
+#        server-addr: 192.168.0.137:8848,192.168.0.123:8848
+#        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+#        group: DEFAULT_GROUP
+#        application: seata-server #Nacos 中 Seata 名称
+#        username: nacos
+#        password: nacos
     sentinel:
       transport:
         dashboard: 127.0.0.1:8080  #  Sentinel控制台地址

--
Gitblit v1.7.1