From ed86050014b30201dd1beb98b5b8d2acaab2abf9 Mon Sep 17 00:00:00 2001 From: shikong <919411476@qq.com> Date: Sun, 20 Aug 2023 16:37:34 +0800 Subject: [PATCH] zlm version api --- .../gb28181/media/dto/rtp/CloseRtpServerResp.java | 2 -- .../gb28181/media/dto/version/VersionResp.java | 15 +++++++++++++++ .../gb28181/media/proxy/ZlmMediaHttpClient.java | 4 ++++ .../gb28181/media/proxy/ZlmMediaService.java | 6 ++++++ .../docking/gb28181/test/MediaServiceTest.java | 12 ++++++++++++ 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/version/VersionResp.java diff --git a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/rtp/CloseRtpServerResp.java b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/rtp/CloseRtpServerResp.java index 8c99c83..5a4aa0a 100644 --- a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/rtp/CloseRtpServerResp.java +++ b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/rtp/CloseRtpServerResp.java @@ -1,8 +1,6 @@ package cn.skcks.docking.gb28181.media.dto.rtp; import cn.skcks.docking.gb28181.media.dto.status.ResponseStatus; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.annotation.JsonNaming; import lombok.Data; @Data diff --git a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/version/VersionResp.java b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/version/VersionResp.java new file mode 100644 index 0000000..dbb98fd --- /dev/null +++ b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/version/VersionResp.java @@ -0,0 +1,15 @@ +package cn.skcks.docking.gb28181.media.dto.version; + +import cn.hutool.core.date.DatePattern; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class VersionResp { + private String branchName; + @JsonFormat(pattern = DatePattern.UTC_SIMPLE_PATTERN) + private Date buildTime; + private String commitHash; +} diff --git a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpClient.java b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpClient.java index 189aceb..616e749 100644 --- a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpClient.java +++ b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpClient.java @@ -6,6 +6,7 @@ import cn.skcks.docking.gb28181.media.dto.rtp.CloseRtpServer; import cn.skcks.docking.gb28181.media.dto.rtp.CloseRtpServerResp; import cn.skcks.docking.gb28181.media.dto.rtp.OpenRtpServer; import cn.skcks.docking.gb28181.media.dto.rtp.OpenRtpServerResp; +import cn.skcks.docking.gb28181.media.dto.version.VersionResp; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -36,4 +37,7 @@ public interface ZlmMediaHttpClient { @PostMapping("/index/api/closeRtpServer") CloseRtpServerResp closeRtpServer(@RequestParam String secret, @RequestBody CloseRtpServer params); + + @GetMapping("/index/api/version") + ZlmResponse version(@RequestParam String secret); } diff --git a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaService.java b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaService.java index 9572c14..05bdb4c 100644 --- a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaService.java +++ b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaService.java @@ -7,9 +7,11 @@ import cn.skcks.docking.gb28181.media.dto.rtp.CloseRtpServer; import cn.skcks.docking.gb28181.media.dto.rtp.CloseRtpServerResp; import cn.skcks.docking.gb28181.media.dto.rtp.OpenRtpServer; import cn.skcks.docking.gb28181.media.dto.rtp.OpenRtpServerResp; +import cn.skcks.docking.gb28181.media.dto.version.VersionResp; import com.fasterxml.jackson.core.type.TypeReference; import lombok.Builder; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; import java.util.Map; @@ -44,4 +46,8 @@ public class ZlmMediaService { public CloseRtpServerResp closeRtpServer(CloseRtpServer params){ return exchange.closeRtpServer(secret, params); } + + public ZlmResponse version(){ + return exchange.version(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 bf6264b..3b9ad12 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,5 +1,6 @@ package cn.skcks.docking.gb28181.test; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.skcks.docking.gb28181.common.json.JsonResponse; import cn.skcks.docking.gb28181.media.dto.config.ServerConfig; @@ -7,6 +8,7 @@ import cn.skcks.docking.gb28181.media.dto.response.ZlmResponse; import cn.skcks.docking.gb28181.media.dto.response.ZlmResponseConvertor; import cn.skcks.docking.gb28181.media.dto.rtp.CloseRtpServer; import cn.skcks.docking.gb28181.media.dto.rtp.OpenRtpServer; +import cn.skcks.docking.gb28181.media.dto.version.VersionResp; import cn.skcks.docking.gb28181.media.proxy.ZlmMediaService; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -73,6 +75,16 @@ public class MediaServiceTest { log.info("{}", zlMediaHttpService.closeRtpServer(closeRtpServer)); } + @Test + void version(){ + ZlmResponse versionResp = zlMediaHttpService.version(); + log.info("{}", versionResp); + Date date = versionResp.getData().getBuildTime(); + log.info("{}", date); + log.info("{}", LocalDateTimeUtil.of(date.toInstant(), TimeZone.getTimeZone("GMT+8"))); + log.info("{}", LocalDateTimeUtil.of(date.toInstant(), TimeZone.getTimeZone("UTC"))); + } + @Test void configTest(){ ZlmResponse> resp = zlMediaHttpService.getServerConfig();