Merge remote-tracking branch 'origin/feature-cnf' into feature-cnf

# Conflicts:
#	cnf-edge-center/src/main/resources/application.yaml

cnf-edge-center/pom.xml

@@ -33,7 +33,7 @@
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

cnf-edge-center/src/main/java/top/ninwoo/edgecenter/config/ZookeeperConfiguration.java

 package top.ninwoo.edgecenter.config;
 
-import javafx.scene.control.cell.TextFieldListCell;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
@@ -14,11 +13,9 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.context.support.WebApplicationContextUtils;
 import top.ninwoo.edgecenter.check.ClusterServiceCheck;
 import top.ninwoo.edgecenter.register.EdgeNodeRegister;
 
-import javax.annotation.Resource;
 @Slf4j
 @Configuration
 public class ZookeeperConfiguration implements ApplicationContextAware {

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

@@ -26,9 +26,9 @@ bs:
     name: random
     ip-prefix: 192.168.31
   ipservice:
-    ip: 192.168.31.198:23333
+    ip: 127.0.0.1:23333
   sdn-controller:
     host: 127.0.0.1
     port: 6653
 zookeeper:
-  url: 192.168.31.198:2181
+  url: 127.0.0.1:2181