浏览代码

change:
1. 优化平台启动脚本, 优化https配置文件逻辑

kindring 1 年之前
父节点
当前提交
44aa91b2da

+ 2 - 2
package/gbDocker/createConfig.sh

@@ -104,9 +104,9 @@ echo "${t2}# [可选] 证书类型, 默认为jks,根据实际修改" >> "$p"
 echo "${t2}key-store-type: JKS" >> "$p"
 echo "${t2}# 配置证书可以使用如下两项,如上面二选一即可" >> "$p"
 echo "${t2}# PEM 编码证书" >> "$p"
-echo "${t2}certificate: keys/cert.pem" >> "$p"
+echo "${t2}certificate: keys/$gb_certName" >> "$p"
 echo "${t2}# 私钥文件" >> "$p"
-echo "${t2}certificate-private-key: keys/key.pem" >> "$p"
+echo "${t2}certificate-private-key: keys/$gb_keyName" >> "$p"
 
 echo "sip:" >> "$p"
 echo "${t1}# [必须修改] 本机的IP, 必须是网卡上的IP,用于sip下协议栈监听ip,如果监听所有设置为0.0.0.0" >> "$p"

+ 27 - 2
package/startDockerImage.sh

@@ -204,6 +204,28 @@ fi
 
 echo "开始启动国标平台"
 # 根据参数生成国标平台配置文件
+gb_certName=""
+gb_keyName=""
+
+# 判断是否有证书地址 gb_certPath 与 gb_keyPath
+if [ "$gb_certPath" != "" ] && [ "$gb_keyPath" != "" ];then
+    # 判断证书是否存在
+    if [ ! -f "$gb_certPath" ];then
+        echo "证书文件不存在,请检查证书路径是否正确"
+        exit 1
+    fi
+    if [ ! -f "$gb_keyPath" ];then
+        echo "证书文件不存在,请检查证书路径是否正确"
+        exit 1
+    fi
+    # 获取证书文件名
+    gb_certName=$(basename "$gb_certPath")
+    gb_keyName=$(basename "$gb_keyPath")
+    # 拷贝证书到容器中
+    cp "$gb_certPath" "$SCRIPT_DIR/gbRunning/keys"
+    cp "$gb_keyPath" "$SCRIPT_DIR/gbRunning/keys"
+fi
+
 source ./gbRunning/createConfig.sh
 echo "$gb_WebPort"
 echo "$gb_sipPort"
@@ -217,13 +239,16 @@ if [ $? -eq 0 ]; then
     # 删除容器
     docker rm hfy_gp
 fi
+
+
+
+
 sudo docker run -it --net=host  \
  -v /data/gb:/data/gb -e LANG=C.UTF-8 \
  -v $SCRIPT_DIR"/gbRunning/logs":/data/hfygb/logs \
  -v $SCRIPT_DIR"/gbRunning/mFile":/data/hfygb/mFile \
  -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/keys":/data/hfygb/keys \
  -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";

+ 1 - 0
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java

@@ -74,6 +74,7 @@ public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent
         }
         taskExecutor.execute(()->{
             try {
+                logger.info("收到设备录像信息查询响应,deviceId:" + device.getDeviceId());
 
                 String sn = getText(rootElement, "SN");
                 String channelId = getText(rootElement, "DeviceID");