From 07b182da98ac54fffa8f36b8db27d6212e1e0bf7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 26 十二月 2023 15:38:40 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into feature/record
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
index 63299b2..44431cf 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
@@ -7,6 +7,7 @@
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.ServiceException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
@@ -20,6 +21,7 @@
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +70,7 @@
@Autowired
private UserSetting userSetting;
- @Operation(summary = "寮�濮嬭棰戝洖鏀�")
+ @Operation(summary = "寮�濮嬭棰戝洖鏀�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "startTime", description = "寮�濮嬫椂闂�", required = true)
@@ -125,7 +127,7 @@
}
- @Operation(summary = "鍋滄瑙嗛鍥炴斁")
+ @Operation(summary = "鍋滄瑙嗛鍥炴斁", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "stream", description = "娴両D", required = true)
@@ -149,7 +151,7 @@
}
- @Operation(summary = "鍥炴斁鏆傚仠")
+ @Operation(summary = "鍥炴斁鏆傚仠", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
@GetMapping("/pause/{streamId}")
public void playPause(@PathVariable String streamId) {
@@ -165,7 +167,7 @@
}
- @Operation(summary = "鍥炴斁鎭㈠")
+ @Operation(summary = "鍥炴斁鎭㈠", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
@GetMapping("/resume/{streamId}")
public void playResume(@PathVariable String streamId) {
@@ -180,7 +182,7 @@
}
- @Operation(summary = "鍥炴斁鎷栧姩鎾斁")
+ @Operation(summary = "鍥炴斁鎷栧姩鎾斁", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
@Parameter(name = "seekTime", description = "鎷栧姩鍋忕Щ閲忥紝鍗曚綅s", required = true)
@GetMapping("/seek/{streamId}/{seekTime}")
@@ -200,7 +202,7 @@
}
}
- @Operation(summary = "鍥炴斁鍊嶉�熸挱鏀�")
+ @Operation(summary = "鍥炴斁鍊嶉�熸挱鏀�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
@Parameter(name = "speed", description = "鍊嶉��0.25 0.5 1銆�2銆�4", required = true)
@GetMapping("/speed/{streamId}/{speed}")
--
Gitblit v1.8.0