Merge remote-tracking branch 'origin/master'

ibzdisk-boot/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ zuul:
         stripPrefix: false
       disk:
         path: /net-disk/**
-        serviceId: ${ibiz.ref.service.disk:disk-api}
+        serviceId: ${ibiz.ref.service.disk:ibzdisk-api}
         stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization