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