From aaf99b029626ca2d981a32522bf4783dce16a3fa Mon Sep 17 00:00:00 2001 From: zhangqy Date: Mon, 23 Oct 2023 19:55:41 +0800 Subject: [PATCH] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-box-user-api/src/main/resources/bootstrap-prod.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml b/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml index d68207d..6d97184 100644 --- a/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml +++ b/iot-modules/iot-box-user-api/src/main/resources/bootstrap-prod.yml @@ -3,17 +3,10 @@ spring: nacos: discovery: # 服务注册地址 -<<<<<<< HEAD - server-addr: 8.139.5.211:30731 - config: - # 配置中心地址 - server-addr: 8.139.5.211:30731 -======= server-addr: qiuguo-nacos.qiuguo-cloud:8848 config: # 配置中心地址 server-addr: qiuguo-nacos.qiuguo-cloud:8848 ->>>>>>> 64da585a2f5a786febdbeaafd130d2fd086ee8e1 # 配置文件格式 file-extension: yml # 共享配置