From f52771d85ef6b613ccbc8fbe290d5ae298c5d746 Mon Sep 17 00:00:00 2001 From: shikong <919411476@qq.com> Date: Thu, 17 Aug 2023 16:13:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docking/gb28181/common/json/JsonResponse.java | 5 +++++ .../gb28181/media/dto/config/GeneralConfig.java | 11 +++++++++++ .../docking/gb28181/media/dto/config/HlsConfig.java | 11 +++++++++++ .../gb28181/media/dto/config/ServerConfig.java | 6 ++++++ .../gb28181/media/proxy/ZlmMediaHttpService.java | 4 ++++ .../skcks/docking/gb28181/test/MediaServiceTest.java | 11 +++++++++-- 6 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/GeneralConfig.java create mode 100644 zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/HlsConfig.java diff --git a/common/src/main/java/cn/skcks/docking/gb28181/common/json/JsonResponse.java b/common/src/main/java/cn/skcks/docking/gb28181/common/json/JsonResponse.java index 38f707c..dce3dc6 100644 --- a/common/src/main/java/cn/skcks/docking/gb28181/common/json/JsonResponse.java +++ b/common/src/main/java/cn/skcks/docking/gb28181/common/json/JsonResponse.java @@ -55,4 +55,9 @@ public class JsonResponse { public static JsonResponse build(T data, int status, String msg) { return new JsonResponse<>(status, msg, data); } + + @Override + public String toString(){ + return JsonUtils.toJson(this); + } } diff --git a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/GeneralConfig.java b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/GeneralConfig.java new file mode 100644 index 0000000..2aaafe0 --- /dev/null +++ b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/GeneralConfig.java @@ -0,0 +1,11 @@ +package cn.skcks.docking.gb28181.media.dto.config; + +import lombok.Data; + +@Data +public class GeneralConfig { + private Integer enableVhost; + private Integer flowThreshold; + private Integer maxStreamWaitMS; + private Integer streamNoneReaderDelayMS; +} diff --git a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/HlsConfig.java b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/HlsConfig.java new file mode 100644 index 0000000..cb939ab --- /dev/null +++ b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/HlsConfig.java @@ -0,0 +1,11 @@ +package cn.skcks.docking.gb28181.media.dto.config; + +import lombok.Data; + +@Data +public class HlsConfig { + private Integer fileBufSize; + private String filePath; + private Integer segDur; + private Integer segNum; +} diff --git a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/ServerConfig.java b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/ServerConfig.java index a3c887c..522c5b0 100644 --- a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/ServerConfig.java +++ b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/ServerConfig.java @@ -11,4 +11,10 @@ public class ServerConfig { @JsonUnwrapped(prefix = "ffmpeg.") private FFMpegConfig ffmpeg; + + @JsonUnwrapped(prefix = "general.") + private GeneralConfig general; + + @JsonUnwrapped(prefix = "hls.") + private HlsConfig hls; } diff --git a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpService.java b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpService.java index e5e5a54..04500e0 100644 --- a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpService.java +++ b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpService.java @@ -2,6 +2,7 @@ package cn.skcks.docking.gb28181.media.proxy; import cn.skcks.docking.gb28181.common.json.JsonResponse; import cn.skcks.docking.gb28181.media.dto.config.ServerConfig; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.service.annotation.GetExchange; import org.springframework.web.service.annotation.HttpExchange; @@ -13,4 +14,7 @@ public interface ZlmMediaHttpService { @GetExchange("/index/api/getServerConfig") JsonResponse> getServerConfig(@RequestParam String secret); + + @GetExchange("/index/api/getServerConfig") + ResponseEntity getServerConfigResponseEntity(@RequestParam String secret); } diff --git a/zlmediakit-service/src/test/java/cn/skcks/docking/gb28181/test/MediaServiceTest.java b/zlmediakit-service/src/test/java/cn/skcks/docking/gb28181/test/MediaServiceTest.java index 24ebde4..f9bb920 100644 --- a/zlmediakit-service/src/test/java/cn/skcks/docking/gb28181/test/MediaServiceTest.java +++ b/zlmediakit-service/src/test/java/cn/skcks/docking/gb28181/test/MediaServiceTest.java @@ -1,6 +1,8 @@ package cn.skcks.docking.gb28181.test; +import cn.skcks.docking.gb28181.common.json.JsonResponse; import cn.skcks.docking.gb28181.media.config.ZlmMediaConfig; +import cn.skcks.docking.gb28181.media.dto.config.ServerConfig; import cn.skcks.docking.gb28181.media.proxy.ZlmMediaHttpService; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; @@ -9,8 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit.jupiter.SpringExtension; +import java.util.List; @Slf4j @SpringBootTest @@ -25,7 +29,10 @@ public class MediaServiceTest { @Test void context(){ - var test = zlMediaHttpService.getServerConfig(config.getSecret()); - log.info("{}", test); + ResponseEntity entity = zlMediaHttpService.getServerConfigResponseEntity(config.getSecret()); + log.info("{}", entity.getBody()); + + JsonResponse> test = zlMediaHttpService.getServerConfig(config.getSecret()); + log.info("{}", test); } }