Merge remote-tracking branch 'origin/master'

2023-10-24 10:35:01 +08:00 · 2023-10-24 10:35:01 +08:00 · 5d37da1dc0
commit 5d37da1dc0
parent 6a854f25c6 aaf99b0296
1 changed files with 0 additions and 7 deletions
--- 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
        # 共享配置