调整docker包.

README.md

@@ -1,4 +1,4 @@
-![logo](doc/_media/logo.png)
+![logo](olDoc/_media/logo.png)
 # 开箱即用的28181协议视频平台
 
 [![Build Status](https://travis-ci.org/xia-chu/ZLMediaKit.svg?branch=master)](https://travis-ci.org/xia-chu/ZLMediaKit)
@@ -31,12 +31,12 @@ WEB VIDEO PLATFORM是一个基于GB28181-2016标准实现的开箱即用的网
 https://gitee.com/pan648540858/wvp-GB28181-pro.git
 
 # 截图
-![index](doc/_media/index.png "index.png")
-![2](doc/_media/2.png "2.png")
-![3](doc/_media/3.png "3.png")
-![3-1](doc/_media/3-1.png "3-1.png")
-![3-2](doc/_media/3-2.png "3-2.png")
-![3-3](doc/_media/3-3.png "3-3.png")
+![index](olDoc/_media/index.png "index.png")
+![2](olDoc/_media/2.png "2.png")
+![3](olDoc/_media/3.png "3.png")
+![3-1](olDoc/_media/3-1.png "3-1.png")
+![3-2](olDoc/_media/3-2.png "3-2.png")
+![3-3](olDoc/_media/3-3.png "3-3.png")
 ![build_1](https://images.gitee.com/uploads/images/2022/0304/101919_ee5b8c79_1018729.png "2022-03-04_10-13.png")
 
 # 功能特性 

docker/gbDocker/install.sh

@@ -114,4 +114,8 @@ docker rm hfy_gp
 sudo docker run -itd --net=host  \
  -v /data/gb:/data/gb -e LANG=C.UTF-8 \
  -v $SCRIPT_DIR"/gb28181":/data/hfygb \
- -v $SCRIPT_DIR"/application_product.yml":/data/hfygb/config/"application_product.yml" --name hfy_gp -it hfy_gb:latest
+ -v $SCRIPT_DIR"/application_product.yml":/data/hfygb/config/"application_product.yml" --name hfy_gp -it hfy_gb:latest
+
+
+ # 导出镜像
+

docker/mysqlDocker/installMysql.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+# 使用镜像启动容器
+
+# 获取脚本运行所在路径
+SCRIPT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}); pwd)
+
+# 获取配置文件
+source $SCRIPT_DIR/config.sh

package/buildDockerImage.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+# 创建docker镜像
+echo -e "\033[33m
+---------------
+-----SZHFY-----
+----GB28181----
+---------------
+\033[0m";
+echo  -e "\033[33m 欢迎使用深圳合方圆科技一键打包程序 \033[0m
+";
+# 清楚并重新创建result目录
+rm -rf ./result
+mkdir ./result
+
+# 使用绿色字符输出
+echo -e "\033[32m ---构建mysql数据库镜像中---- \033[0m";
+# 构建mysql镜像
+docker build -t hfysql:latest ./mysqlDocker
+if [ $? -ne 0 ]; then
+  echo "Error: build mysql image docker failed";
+  exit
+fi
+# 导出镜像至当前目录下的/result目录下
+docker save -o ./result/hfysql.tar hfysql:latest
+
+echo -e "\033[32m ---构建redis数据库镜像中---- \033[0m";
+# 构建redis镜像
+docker build -t hfyredis:latest ./redisDocker
+if [ $? -ne 0 ]; then
+  echo "Error: build redis image docker failed";
+  exit
+fi
+# 导出镜像至当前目录下的/result目录下
+docker save -o ./result/hfyredis.tar hfyredis:latest
+
+echo -e "\033[32m ---构建wvp镜像中---- \033[0m";
+# 构建redis镜像
+docker build -t hfygb:latest ./hfygbDocker
+if [ $? -ne 0 ]; then
+  echo "Error: build gb image docker failed";
+  exit
+fi
+
+# 导出镜像至当前目录下的/result目录下
+docker save -o ./result/hfygb.tar hfygb:latest
+docker save -o ./result/hfyredis.tar hfyredis:latest
+docker save -o ./result/hfymysql.tar hfymysql:latest
+

package/gbDocker/Dockerfile

@@ -0,0 +1,23 @@
+FROM ubuntu:20.04
+MAINTAINER kindring
+VOLUME "/data"
+ENV  LANG="en_US.utf8"
+# 国标信令端口 tcp与udp同事放行
+EXPOSE 29000/tcp
+EXPOSE 29000/udp
+# web控制面板端口
+EXPOSE 29001/tcp
+#ENV LC_ALL zh_CN.UTF-8
+
+RUN mkdir /usr/local/jvm/
+# 解压配置java环境
+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
+ENV JRE_HOME ${JAVA_HOME}/jre
+ENV CLASSPATH .:${JAVA_HOME}/lib:${JRE_HOME}/lib
+ENV PATH ${JAVA_HOME}/bin:$PATH
+
+WORKDIR /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/mysqlDocker/Dockerfile

@@ -0,0 +1,7 @@
+FROM mysql:8.0
+MAINTAINER kindring
+EXPOSE 3306
+LABEL version="0.1" description="hfy 国标mysql服务器" by="hfy"
+# 设置docker 内的工作目录
+ENV WORK_PATH /data/mysql
+RUN cp $WORK_PATH/init.sql /docker-entrypoint-initdb.d

package/redisDocker/Dockerfile

@@ -0,0 +1,10 @@
+FROM redis:latest
+
+MAINTAINER kindring
+VOLUME "/data"
+
+
+# 复制redis.conf配置文件到 工作目录中
+#COPY ./redis.conf /etc/redis/redis.conf
+
+CMD redis-server /etc/redis/redis.conf

src/main/java/com/genersoft/iot/vmp/gb28181/event/device/RequestTimeoutEventImpl.java

@@ -31,7 +31,7 @@ public class RequestTimeoutEventImpl implements ApplicationListener<RequestTimeo
                 if (device == null) {
                     return;
                 }
-                deviceService.offline(device.getDeviceId(), "等待消息超时");
+                deviceService.offline(device.getDeviceId(), "绛夊緟娑堟伅瓒呮椂");
             }
 
         }

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java

@@ -279,7 +279,7 @@ public interface ISIPCommander {
 	 * @param endTime 结束时间,格式要求：yyyy-MM-dd HH:mm:ss
 	 * @param sn
 	 */
-	void recordInfoQuery(Device device, String channelId, String startTime, String endTime, int sn,  Integer Secrecy, String type, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException;
+	void recordInfoQuery(Device device, String channelId,Boolean isHfy, String startTime, String endTime, int sn,  Integer Secrecy, String type, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException;
 	
 	/**
 	 * 查询报警信息

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -1237,19 +1237,22 @@ public class SIPCommander implements ISIPCommander {
      * @param endTime   结束时间,格式要求：yyyy-MM-dd HH:mm:ss
      */
     @Override
-    public void recordInfoQuery(Device device, String channelId, String startTime, String endTime, int sn, Integer secrecy, String type, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
+    public void recordInfoQuery(Device device, String channelId,Boolean isHfy, String startTime, String endTime, int sn, Integer secrecy, String type, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
         if (secrecy == null) {
             secrecy = 0;
         }
         if (type == null) {
             type = "all";
         }
-
+//<?xml version="1.0" encoding="UTF-8"?>
+// <SIP_XML EventType="Request_History_Video">
+// <Item Code="281490000003040045" Type="-1" UserCode="280090000000000000" BeginTime="2023-05-06T00:00:00Z" EndTime="2023-05-06T23:59:59Z" FromIndex="1" ToIndex="10"></Item>
+// </SIP_XML>
         StringBuffer recordInfoXml = new StringBuffer(200);
         String charset = device.getCharset();
         recordInfoXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
         recordInfoXml.append("<Query>\r\n");
-        recordInfoXml.append("<CmdType>RecordInfo</CmdType>\r\n");
+        recordInfoXml.append("<CmdType>"+(isHfy?"Request_History_Video":"RecordInfo")+"</CmdType>\r\n");
         recordInfoXml.append("<SN>" + sn + "</SN>\r\n");
         recordInfoXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
         if (startTime != null) {

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java

@@ -108,7 +108,7 @@ public class RecordInfoQueryMessageHandler extends SIPRequestProcessorParent imp
                 }
             });
             try {
-                commander.recordInfoQuery(device, channelId, DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTime),
+                commander.recordInfoQuery(device, channelId,false, DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTime),
                         DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTime), sn, secrecy, type, (eventResult -> {
                             // 回复200 OK
                             try {

src/main/java/com/genersoft/iot/vmp/vmanager/bean/BodyAiAlarm.java

@@ -30,10 +30,8 @@ public class BodyAiAlarm {
 
     @Schema(description = "cpu温度")
     private String cpu_env;
-
     @Schema(description = "算法类型,等效 arithmetic")
     private String type;
-
     @Schema(description = "icharge")
     private String icharge;
     @Schema(description = "iload")
@@ -62,7 +60,6 @@ public class BodyAiAlarm {
     @Schema(description = "upload6")
     private  MultipartFile upload6;
 
-
     @Schema(description = "upload7")
     private  MultipartFile upload7;
 

src/main/java/com/genersoft/iot/vmp/vmanager/bean/UploadService.java

@@ -62,8 +62,6 @@ public class UploadService {
         // 3. 根据时间创建文件名 hhmm_ss-0.jpg
         // 4. 转储文件
         // 5. 文件路径示例 mFile/设备id/日期/hhmm_ss-0.jpg|hhmm_ss-1.jpg|hhmm_ss-2.jpg
-//        logger.info("saveDevAlarm {}",sipConfig);
-//        logger.info("mediaPath:{}",sipConfig.getMediaPath());
         SimpleDateFormat sdf = new SimpleDateFormat();// 格式化时间
         sdf.applyPattern("yyyy-MM-dd");
         SimpleDateFormat fileSdf = new SimpleDateFormat();// 格式化时间

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java

@@ -92,7 +92,7 @@ public class GBRecordController {
 		msg.setId(uuid);
 		msg.setKey(key);
 		try {
-			cmder.recordInfoQuery(device, channelId, startTime, endTime, sn, null, null, null, (eventResult -> {
+			cmder.recordInfoQuery(device, channelId,false, startTime, endTime, sn, null, null, null, (eventResult -> {
 				WVPResult<RecordInfo> wvpResult = new WVPResult<>();
 				wvpResult.setCode(ErrorCode.ERROR100.getCode());
 				wvpResult.setMsg("查询录像失败, status: " +  eventResult.statusCode + ", message: " + eventResult.msg);

src/main/resources/application.yml

@@ -189,7 +189,7 @@ user-settings:
     # 保存移动位置历史轨迹：true:保留历史数据，false:仅保留最后的位置(默认)
     save-position-history: false
     # 点播等待超时时间,单位：毫秒
-    play-timeout: 15000
+    play-timeout: 60000
     # 上级点播等待超时时间,单位：毫秒
     platform-play-timeout: 60000
     # 是否开启接口鉴权