修复wvp启动部分脚本

package/gbDocker/Dockerfile

@@ -11,6 +11,7 @@ EXPOSE 29001/tcp
 
 RUN mkdir /usr/local/jvm/
 # 解压配置java环境
+WORKDIR /data/hfygb
 COPY ./jdk-8-linux-x64.tar.gz ./
 RUN tar -xvzf jdk-8-linux-x64.tar.gz -C /usr/local/jvm
 ENV JAVA_HOME /usr/local/jvm/jdk1.8.0_341
@@ -18,7 +19,6 @@ ENV JRE_HOME ${JAVA_HOME}/jre
 ENV CLASSPATH .:${JAVA_HOME}/lib:${JRE_HOME}/lib
 ENV PATH ${JAVA_HOME}/bin:$PATH
 
-WORKDIR /data/hfygb
 COPY ./gb28181 /data/hfygb
 CMD java -jar ./target/hfy-gb.jar  --server.address=0.0.0.0 --spring.config.location=/data/hfygb/config/application_product.yml
 

package/gbDocker/createConfig.sh

@@ -17,8 +17,8 @@ RedisPasswd=$redis_passwd
 RedisDb=$redis_db
 
 EnableHttps=$gb_enableHttps
-CertPath=$gb_certPath
-KeyPath=$gb_keyPath
+#CertPath=$gb_certPath
+#KeyPath=$gb_keyPath
 WebPort=$gb_webPort
 SipPort=$gb_sipPort
 Host=$gb_host
@@ -103,9 +103,9 @@ echo "${t2}# [可选] 证书类型， 默认为jks，根据实际修改" >> "$p"
 echo "${t2}key-store-type: JKS" >> "$p"
 echo "${t2}# 配置证书可以使用如下两项，如上面二选一即可" >> "$p"
 echo "${t2}# PEM 编码证书" >> "$p"
-echo "${t2}certificate: $CertPath" >> "$p"
+echo "${t2}certificate: keys/cert.pem" >> "$p"
 echo "${t2}# 私钥文件" >> "$p"
-echo "${t2}certificate-private-key: $KeyPath" >> "$p"
+echo "${t2}certificate-private-key: keys/key.pem" >> "$p"
 
 echo "sip:" >> "$p"
 echo "${t1}# [必须修改] 本机的IP, 必须是网卡上的IP，用于sip下协议栈监听ip，如果监听所有设置为0.0.0.0" >> "$p"
@@ -129,7 +129,7 @@ echo "${t1}ptz-speed: 50" >> "$p"
 echo "${t1}# 是否存储alarm信息" >> "$p"
 echo "${t1}alarm: false" >> "$p"
 echo "${t1}# hfy ai图片存储位置" >> "$p"
-echo "${t1}mediaPath: $AiPicPath" >> "$p"
+echo "${t1}mediaPath: mFile" >> "$p"
 echo "# [可选] 日志配置, 一般不需要改" >> "$p"
 echo "logging:" >> "$p"
 echo "${t1}config: classpath:logback-spring-local.xml" >> "$p"

package/startDockerImage.sh

@@ -73,22 +73,6 @@ if [ "$enable_sql" == "1" ];then
     fi
     # 等待mysql启动
     sleep 5
-    #  修改数据库名
-    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 "CREATE USER '$sql_user'@'%' IDENTIFIED BY '$sql_passwd';"
-    # 不限制ip访问
-    docker exec -it hfysql mysql \
-      -uroot -p"hfy$sql_passwd" \
-      -e "GRANT ALL PRIVILEGES ON $sql_db.* TO '$sql_user'@'%';"
-    # 刷新权限
-    docker exec -it hfysql mysql \
-      -uroot -p"hfy$sql_passwd" \
-      -e "FLUSH PRIVILEGES;"
 fi
 
 echo "开始启动redis"
@@ -118,6 +102,35 @@ if [ "$enable_redis" == "1" ];then
      --name hfy_redis -itd hfyredis:latest
 fi
 
+if [ "$enable_sql" == "1" ];then
+    sleep 5
+    docker ps -a | grep hfysql
+    if [ $? -eq 0 ]; then
+        # 导出数据库
+        echo "mysql 数据库已经启动"
+    else
+        echo "mysql 数据库启动失败"
+        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 "CREATE USER '$sql_user'@'%' IDENTIFIED BY '$sql_passwd';"
+    # 不限制ip访问
+    docker exec -it hfysql mysql \
+      -uroot -p"hfy$sql_passwd" \
+      -e "GRANT ALL PRIVILEGES ON $sql_db.* TO '$sql_user'@'%';"
+    # 刷新权限
+    docker exec -it hfysql mysql \
+      -uroot -p"hfy$sql_passwd" \
+      -e "FLUSH PRIVILEGES;"
+fi
+
 echo "开始启动国标平台"
 # 根据参数生成国标平台配置文件
 source ./gbRunning/createConfig.sh
@@ -131,10 +144,13 @@ if [ $? -eq 0 ]; then
     # 删除容器
     docker rm hfy_gp
 fi
-sudo docker run -itd --net=host  \
+sudo docker run -it --net=host  \
  -v /data/gb:/data/gb -e LANG=C.UTF-8 \
- -v "$SCRIPT_DIR/gbRunning":/data/hfygb \
- -v "$SCRIPT_DIR/gbRunning/application_product.yml":/data/hfygb/config/application_product.yml --name hfy_gp -it hfy_gb:latest
+ -v $SCRIPT_DIR"/gbRunning/logs":/data/hfygb/logs \
+ -v $SCRIPT_DIR"/gbRunning/mFile":/data/hfygb/mFile \
+ -v $gb_certPath:/data/hfygb/keys/cert.pem \
+ -v $SCRIPT_DIR"/gbRunning/libImages":/data/hfygb/libImages \
+ -v $gb_keyPath:/data/hfygb/config/application_product.yml --name hfy_gp -it hfy_gb:latest
 if [ $? -ne 0 ]; then
   echo "run gb docker failed";
 fi