修复配置生成bug

package/config.cfg

@@ -31,7 +31,7 @@ gb_keyPath="/opt/gb28181/cert/key.pem"
 
 # 国标sip参数
 # web端口
-gb_WebPort=29001
+gb_webPort=29001
 # sip端口
 gb_sipPort=29000
 # 国标sip地址

package/gbDocker/createConfig.sh

@@ -31,7 +31,7 @@ KeepaliveInterval=$gb_keepaliveInterval
 AiPicPath=$gb_aiPicPath
 PlayTimeout=$gb_playTimeout
 
-echo "GBWebPort"
+echo "GBWebPort:$WebPort"
 finalMysqlHost=$SQLHost;
 finalRedisHost=$RedisHost;
 if [ "$RedisHost" = "0.0.0.0" ];then
@@ -88,9 +88,10 @@ echo "${t3}connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMill
 echo "${t3}maxActive: 200                        # 连接池最大连接数" >> "$p"
 
 echo "server:" >> "$p"
-echo "${t1}address: 0.0.0.0" >> "$p"
 echo "${t1}# 国标平台web端口" >> "$p"
 echo "${t1}port: $WebPort" >> "$p"
+echo "${t1}http:" >> "$p"
+echo "${t2}port: $WebPort" >> "$p"
 echo "${t1}# [可选] HTTPS配置， 默认不开启" >> "$p"
 echo "${t1}ssl:" >> "$p"
 echo "${t2}# [可选] 是否开启HTTPS访问" >> "$p"

package/startDockerImage.sh

@@ -117,10 +117,10 @@ if [ "$enable_sql" == "1" ];then
         docker logs hfysql
         exit 1
     fi
-    #  修改数据库名
-    docker exec -it hfysql mysql \
-     -uroot -p"hfy$sql_passwd" \
-     -e "ALTER DATABASE gb_db TO $sql_db;"
+    #  修改数据库名,无法修改数据库名,拒绝操作
+#    docker exec -it hfysql mysql \
+#     -uroot -p"hfy$sql_passwd" \
+#     -e "ALTER DATABASE gb_db TO $sql_db;"
     # 创建单独用户
     docker exec -it hfysql mysql \
      -uroot -p"hfy$sql_passwd" \
@@ -138,6 +138,8 @@ fi
 echo "开始启动国标平台"
 # 根据参数生成国标平台配置文件
 source ./gbRunning/createConfig.sh
+echo "$gb_WebPort"
+echo "$gb_sipPort"
 # 导入国标平台镜像
 docker load -i ./hfygb.tar
 # 检查容器是否已经启动,如果已经启动则关闭并且删除容器 hfy_gb
@@ -155,7 +157,7 @@ sudo docker run -it --net=host  \
  -v $SCRIPT_DIR"/gbRunning/libImages":/data/hfygb/libImages \
  -v $gb_certPath:/data/hfygb/keys/cert.pem \
  -v $gb_keyPath:/data/hfygb/keys/key.pem \
- -v $SCRIPT_DIR"/gbRunning":/data/hfygb/config/application_product.yml --name hfy_gp -it hfygb:latest
+ -v $SCRIPT_DIR"/gbRunning/application_product.yml":/data/hfygb/config/application_product.yml --name hfy_gp -it hfygb:latest
 if [ $? -ne 0 ]; then
   echo "run gb docker failed";
 fi