From 94df487a93c411998466b3b26b15fc040972ec19 Mon Sep 17 00:00:00 2001 From: shikong <919411476@qq.com> Date: Fri, 22 Sep 2023 22:45:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=20=E6=94=B6=E6=B5=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=20=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=B8=8D=E5=AE=8C=E6=95=B4=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E8=B0=83=E6=95=B4=20Gb28181DownloadService.AsyncContext=20?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docking/gb28181/wvp/config/ZlmRtspConfig.java | 12 ------------ .../wvp/service/gb28181/Gb28181DownloadService.java | 2 -- .../src/main/resources/application-local.yml | 4 ++-- .../src/main/resources/application.yml | 4 ++-- 4 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/ZlmRtspConfig.java diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/ZlmRtspConfig.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/ZlmRtspConfig.java deleted file mode 100644 index 72f7ad3..0000000 --- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/ZlmRtspConfig.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.skcks.docking.gb28181.wvp.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Data -@Configuration -@ConfigurationProperties(prefix = "media.rtsp") -public class ZlmRtspConfig { - private String url; -} diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/gb28181/Gb28181DownloadService.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/gb28181/Gb28181DownloadService.java index 11905d4..78955ec 100644 --- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/gb28181/Gb28181DownloadService.java +++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/gb28181/Gb28181DownloadService.java @@ -25,7 +25,6 @@ import cn.skcks.docking.gb28181.media.proxy.ZlmMediaService; import cn.skcks.docking.gb28181.service.ssrc.SsrcService; import cn.skcks.docking.gb28181.wvp.config.ProxySipConfig; import cn.skcks.docking.gb28181.wvp.config.WvpProxyConfig; -import cn.skcks.docking.gb28181.wvp.config.ZlmRtspConfig; import cn.skcks.docking.gb28181.wvp.orm.mybatis.dynamic.model.WvpProxyDevice; import cn.skcks.docking.gb28181.wvp.orm.mybatis.dynamic.model.WvpProxyDocking; import cn.skcks.docking.gb28181.wvp.service.device.DeviceService; @@ -79,7 +78,6 @@ public class Gb28181DownloadService { private final SipSubscribe subscribe; private final VideoService videoService; private final WvpProxyConfig wvpProxyConfig; - private final ZlmRtspConfig zlmRtspConfig; private final ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); public void header(HttpServletResponse response) { diff --git a/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml b/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml index 80724bb..0086fe8 100644 --- a/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml +++ b/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml @@ -60,12 +60,12 @@ proxy: ffmpeg-support: task: max: 4 - ffmpeg: C:\ffmpeg\bin\ffmpeg.exe + ffmpeg: D:\Soft\Captura\ffmpeg\ffmpeg.exe ffprobe: D:\Soft\Captura\ffmpeg\ffprobe.exe rtp: # input: -i http://10.10.10.200:5080/live/test.live.flv input: -re -i - output: -preset ultrafast -tune zerolatency -vcodec libx264 -acodec aac -movflags empty_moov+frag_keyframe+default_base_moof -f mp4 # -rtsp_transport tcp + output: -preset ultrafast -vcodec libx264 -acodec aac -movflags empty_moov+frag_keyframe+default_base_moof -f mp4 # -rtsp_transport tcp download: -thread_queue_size 128 -i debug: download: false diff --git a/gb28181-wvp-proxy-starter/src/main/resources/application.yml b/gb28181-wvp-proxy-starter/src/main/resources/application.yml index c550d48..eb62d3b 100644 --- a/gb28181-wvp-proxy-starter/src/main/resources/application.yml +++ b/gb28181-wvp-proxy-starter/src/main/resources/application.yml @@ -24,8 +24,8 @@ spring: username: root password: 123456a url: jdbc:mysql://192.168.1.241:3306/gb28181_docking_platform_dev?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai -# profiles: -# active: local + profiles: + active: local cloud: openfeign: httpclient: