Merge branch 'master-jb' of http://192.168.1.22:3000/Middleware/cn-data-platform into master-jb

# Conflicts:
#	algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataOnlineRateServiceImpl.java

message/message-boot/src/main/resources/bootstrap-jb.yml

@@ -19,16 +19,13 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @service.server.url@
         server-addr: @nacos.url@
         namespace: @nacos.namespace@
-        username: @nacos.username@
-        password: @nacos.password@
       config:
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
         username: @nacos.username@
         password: @nacos.password@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml