Merge branch 'feature-cnf-bz-joliu' into 'feature-cnf'

Resolve "平台配置标准化"

See merge request !3

README.md

@@ -17,4 +17,8 @@
 * 谢建斌
 * 王一鸣
 * 刘建瓯
-* 张夏童
+* 张夏童
\ No newline at end of file
+
+## 更新说明
+1. 使用域名替换配置中的IP，防止多人多次修改配置类并进行提交，避免合并分支时出现冲突的问题。
+如果有需要在自己的电脑上进行部署，需要通过修改本机host的方式来修改对应节点的IP。
\ No newline at end of file

cnf-cloud-center/src/main/resources/application.yml

@@ -2,10 +2,10 @@ server:
   port: 9091
 
 zookeeper:
-  url: 127.0.0.1:2181
+  url: zk.cnf.org:2181
 
 bs:
   cloudcenter:
     name: my-bs-cloud-center
   ipservice:
-    url: 127.0.0.1:23333
+    url: ipservice.cnf.org:23333
\ No newline at end of file

cnf-edge-center/src/main/resources/application.yaml

@@ -6,7 +6,7 @@ spring:
     username: root
     password: Vudo3423ljo
   influx:
-    url: http://127.0.0.1:8086
+    url: http://influxdb.cnf.org:8086
     user: admin
     password: admin
 mybatis:
@@ -26,9 +26,9 @@ bs:
     name: random
     ip-prefix: 192.168.31
   ipservice:
-    ip: 127.0.0.1:23333
+    ip: ipservice.cnf.org:23333
   sdn-controller:
-    host: 127.0.0.1
+    host: sdn.cnf.org
     port: 6653
 zookeeper:
-  url: 127.0.0.1:2181
+  url: zk.cnf.org:2181