Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docker/gbDocker/createConfig.sh

docker/gbDocker/createConfig.sh

@@ -11,6 +11,8 @@ GBSipDomain=$gb_domain
 GBSipID=$gb_id
 GBSipPASSWD=$gb_password
 GBExternalHost=$gb_externalHost
+
+#mediaSecret=$media_Secret
 echo "
               ZLM流媒体服务器信息
               zlmIP:$mediaIP
@@ -18,6 +20,8 @@ echo "
               sdpIP:$sdpIP
               webPort:$hookPort
               mediaId:$mediaId
+              mediaSecret: $mediaSecret
+              rtp端口范围:$rtpPortStart-$rtpPortEnd
               "
 echo "GBWebPort"
 finalMysqlHost=$mysqlHost;

docker/zlmDocker/install.sh

@@ -25,7 +25,7 @@ function installZlm (){
       streamIP=${media_streamHost:-"$mediaIP"}
       sdpIP=${media_sdpHost:-"$mediaIP"}
       mediaId=$media_id
-      secret=$media_Secret
+      mediaSecret=$media_Secret
       hookPort=$media_webPort
       rtpPortStart=$media_rtpPortStart
       rtpPortEnd=$media_rtpPortEnd
@@ -45,8 +45,8 @@ function installZlm (){
       rtpPortEnd=${rtpPortEnd:-_RtpPortEnd}
       read -p "请输入ZLM的mediaId($_MediaId): " mediaId
       mediaId=${mediaId:-_MediaId}
-      read -p "请输入ZLM的secret密钥($_Secret): " secret
-      secret=${secret:-_Secret}
+      read -p "请输入ZLM的secret密钥($_Secret): " mediaSecret
+      mediaSecret=${mediaSecret:-_Secret}
       w2=1
       while [[ $w2 == 1 ]]
       do
@@ -57,7 +57,7 @@ function installZlm (){
                 sdpIP:$sdpIP
                 webPort:$hookPort
                 mediaId:$mediaId
-                secret密钥: $secret
+                secret密钥: $mediaSecret
                 rtp端口范围:$rtpPortStart-$rtpPortEnd
                 "
         echo "是否确认为此信息?y/n"