From 95263673f9607f953fbef992b4113960fe74a162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Wed, 2 Apr 2025 17:12:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=B3=A8=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/tuoheng/steam/service/TaskService.java | 4 ++-- .../tuoheng/steam/service/innerService/ProcessService.java | 4 ++-- src/main/resources/application.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/tuoheng/steam/service/TaskService.java b/src/main/java/com/tuoheng/steam/service/TaskService.java index 57e845f..be8a542 100644 --- a/src/main/java/com/tuoheng/steam/service/TaskService.java +++ b/src/main/java/com/tuoheng/steam/service/TaskService.java @@ -30,8 +30,8 @@ public class TaskService implements ITaskService{ @Value("${srs.targetPath}") private String targetPath; - @Value("${ffmpeg}") - private String ffmpeg; +// @Value("${ffmpeg}") + private String ffmpeg ="ffmpeg"; ScheduledExecutorService executor = Executors.newScheduledThreadPool(4); diff --git a/src/main/java/com/tuoheng/steam/service/innerService/ProcessService.java b/src/main/java/com/tuoheng/steam/service/innerService/ProcessService.java index d6c90be..ef7caba 100644 --- a/src/main/java/com/tuoheng/steam/service/innerService/ProcessService.java +++ b/src/main/java/com/tuoheng/steam/service/innerService/ProcessService.java @@ -30,8 +30,8 @@ public class ProcessService { @Value("${srs.splitPath}") private String splitPath; - @Value("${ffmpeg}") - private String ffmpeg; +// @Value("${ffmpeg}") + private String ffmpeg = "ffmpeg"; @Value("${srs.targetPath}") private String targetPath; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index efde9dd..e953f35 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.application.name=demo server.port = 8989 srs.splitPath=/data/java/srs/stream_server/temp srs.targetPath=/data/java/srs/srs/trunk/objs/nginx/html -ffmpeg=/data/ffmpeg/bin/ffmpeg +ffmpeg=ffmpeg recordPath=/data/java/srs/srs/trunk/objs/nginx/html/record livedates=8