From 5b68c1ef2013d0f8ab479d33ade57dd0561d8b8e Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 24 Apr 2023 10:30:22 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E7=94=9F=E6=88=90=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-std.yaml | 11 ++++++----- .../src/main/resources/bootstrap.yaml | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/order-management-consumer/src/main/resources/bootstrap-std.yaml b/order-management-consumer/src/main/resources/bootstrap-std.yaml index 9ff4daf1..662e9c2b 100644 --- a/order-management-consumer/src/main/resources/bootstrap-std.yaml +++ b/order-management-consumer/src/main/resources/bootstrap-std.yaml @@ -4,17 +4,18 @@ spring: nacos: config: # Nacos config 地址 -# server-addr: nacos-1.itax.local:33000 + server-addr: nacos-1.itax.local:33000 #server-addr: 172.31.36.147:33000 - server-addr: 172.31.36.143:33000 +# server-addr: 172.31.36.143:33000 # Nacos config 命名空间,对应配置中的名称(sims_order_namespace) - namespace: a049b41c-b0a8-4a66-91b1-f3f3cab0e524 + namespace: aaf40845-1c5a-4f09-9a14-a368e704892c # Nacos config 分组 group: sims-order-config # Nacos config 登录用户名 username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 +# password: Invoice.nacos.!1 + password: FaP!a0_NacOs # Nacos config 配置文件前缀 prefix: sims-order-api # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} @@ -55,7 +56,7 @@ spring: # Nacos discovery 配置 discovery: # Nacos discovery 服务地址 - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 #sentinel配置相关 sentinel: #sentinel是否开启控制 diff --git a/order-management-consumer/src/main/resources/bootstrap.yaml b/order-management-consumer/src/main/resources/bootstrap.yaml index 11cfa2e2..563d27e2 100644 --- a/order-management-consumer/src/main/resources/bootstrap.yaml +++ b/order-management-consumer/src/main/resources/bootstrap.yaml @@ -6,9 +6,9 @@ spring: name: order-api profiles: # Spring 配置文件读取 -# active: @deployType@ + active: @deployType@ # active: dev - active: std +# active: std #active: test jackson: # jackson 日期格式化