Merge branch 'pretty-log' of F:\GraduatePro\bishe with conflicts.

bishe-case-dis/pom.xml

@@ -36,7 +36,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>3.2.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

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

@@ -24,9 +24,9 @@ bs:
     name: random
     ip-prefix: 192
   ipservice:
-    ip: 192.168.31.36:23333
+    ip: 127.0.0.1:23333
   sdn-controller:
     host: 127.0.0.1
     port: 6653
 zookeeper:
-  url: 192.168.31.36:2181
+  url: 127.0.0.1:2181

pom.xml

@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.1.2.RELEASE</version>
+                <version>2.2.1.RELEASE</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>