@@ -1,12 +1,8 @@
etcd:
hosts:
-<<<<<<< HEAD
- - 192.168.3.206:2379
-=======
- - 192.168.3.207:2379
- - 192.168.3.165:2379
- - 192.168.3.204:2379
->>>>>>> master
+ - 192.168.3.207:2379
+ - 192.168.3.165:2379
+ - 192.168.3.204:2379
userCenterKey: "usercenter.rpc" #用户中台rpc
powerCheckCenterKey: "powercheck.rpc" #权益校验中台
resourceCenterKey: "resource.rpc" #资源中台
