From f90a53f80b54c61b17fabce810235119ddd46c29 Mon Sep 17 00:00:00 2001
From: gongquanlin <1025081659@qq.com>
Date: Wed, 8 Feb 2023 10:07:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=9C=8D=E5=8A=A1=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9nacos=E5=9C=B0=E5=9D=80=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/bootstrap-dev.yaml            | 12 +++++++-----
 .../src/main/resources/bootstrap-pre.yaml            |  4 ++--
 .../src/main/resources/bootstrap-preNew.yaml         |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/order-management-consumer/src/main/resources/bootstrap-dev.yaml b/order-management-consumer/src/main/resources/bootstrap-dev.yaml
index 769fb923..3c232c6d 100644
--- a/order-management-consumer/src/main/resources/bootstrap-dev.yaml
+++ b/order-management-consumer/src/main/resources/bootstrap-dev.yaml
@@ -4,15 +4,15 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: nacos-1.itax.local:8868
+        server-addr: 10.1.1.72:8848
         # Nacos config 命名空间,对应配置中的名称(sims_order_namespace)
-        namespace: be3b66c4-16e0-4698-9389-bded862f370d
+        namespace: sdenergy-order
         # Nacos config 分组
         group: sims-order-config
         # Nacos config 登录用户名
-        username: sims-order
+        username: nacos
         # Nacos config 登录密码
-        password: sims-order
+        password: nacos
         # Nacos config 配置文件前缀
         prefix: sims-order-api
         # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
@@ -53,7 +53,9 @@ spring:
       # Nacos discovery 配置
       discovery:
         # Nacos discovery 服务地址
-        server-addr: nacos-1.itax.local:8868
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        username: ${spring.cloud.nacos.config.username}
+        password: ${spring.cloud.nacos.config.password}
     #sentinel配置相关
     sentinel:
       #sentinel是否开启控制
diff --git a/order-management-consumer/src/main/resources/bootstrap-pre.yaml b/order-management-consumer/src/main/resources/bootstrap-pre.yaml
index 769fb923..25f166bf 100644
--- a/order-management-consumer/src/main/resources/bootstrap-pre.yaml
+++ b/order-management-consumer/src/main/resources/bootstrap-pre.yaml
@@ -4,7 +4,7 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: nacos-1.itax.local:8868
+        server-addr: nacos-1.itax.local:8848
         # Nacos config 命名空间,对应配置中的名称(sims_order_namespace)
         namespace: be3b66c4-16e0-4698-9389-bded862f370d
         # Nacos config 分组
@@ -53,7 +53,7 @@ spring:
       # Nacos discovery 配置
       discovery:
         # Nacos discovery 服务地址
-        server-addr: nacos-1.itax.local:8868
+        server-addr: nacos-1.itax.local:8848
     #sentinel配置相关
     sentinel:
       #sentinel是否开启控制
diff --git a/order-management-consumer/src/main/resources/bootstrap-preNew.yaml b/order-management-consumer/src/main/resources/bootstrap-preNew.yaml
index 769fb923..25f166bf 100644
--- a/order-management-consumer/src/main/resources/bootstrap-preNew.yaml
+++ b/order-management-consumer/src/main/resources/bootstrap-preNew.yaml
@@ -4,7 +4,7 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: nacos-1.itax.local:8868
+        server-addr: nacos-1.itax.local:8848
         # Nacos config 命名空间,对应配置中的名称(sims_order_namespace)
         namespace: be3b66c4-16e0-4698-9389-bded862f370d
         # Nacos config 分组
@@ -53,7 +53,7 @@ spring:
       # Nacos discovery 配置
       discovery:
         # Nacos discovery 服务地址
-        server-addr: nacos-1.itax.local:8868
+        server-addr: nacos-1.itax.local:8848
     #sentinel配置相关
     sentinel:
       #sentinel是否开启控制