|
|
@@ -19,19 +19,11 @@ spring:
|
|
|
discovery:
|
|
|
namespace: model
|
|
|
# 服务注册地址
|
|
|
-<<<<<<< HEAD
|
|
|
server-addr: 192.168.100.30:8848
|
|
|
config:
|
|
|
namespace: model
|
|
|
# 配置中心地址
|
|
|
server-addr: 192.168.100.30:8848
|
|
|
-=======
|
|
|
- server-addr: 127.0.0.1:8848
|
|
|
- config:
|
|
|
- namespace: model
|
|
|
- # 配置中心地址
|
|
|
- server-addr: 127.0.0.1:8848
|
|
|
->>>>>>> f-xiaogu
|
|
|
# 配置文件格式
|
|
|
file-extension: yml
|
|
|
# 共享配置
|
|
|
@@ -42,20 +34,13 @@ spring:
|
|
|
eager: true
|
|
|
transport:
|
|
|
# 控制台地址
|
|
|
-<<<<<<< HEAD
|
|
|
dashboard: 192.168.100.30:8718
|
|
|
-=======
|
|
|
- dashboard: 127.0.0.1:8718
|
|
|
->>>>>>> f-xiaogu
|
|
|
+
|
|
|
# nacos配置持久化
|
|
|
datasource:
|
|
|
ds1:
|
|
|
nacos:
|
|
|
-<<<<<<< HEAD
|
|
|
server-addr: 192.168.100.30:8848
|
|
|
-=======
|
|
|
- server-addr: 127.0.0.1:8848
|
|
|
->>>>>>> f-xiaogu
|
|
|
dataId: sentinel-onemap-gateway
|
|
|
groupId: DEFAULT_GROUP
|
|
|
data-type: json
|
