From 977bab158bdca5ffd03505c89a6e13e08ff9a4b0 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 八月 2022 23:00:13 +0800
Subject: [PATCH] 修复使用ssl的配置
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java
index 88c15a4..d20a29e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java
@@ -14,10 +14,9 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +27,7 @@
import java.util.UUID;
-@Api(tags = "鍥芥爣璁惧閰嶇疆")
+@Tag(name = "鍥芥爣璁惧閰嶇疆")
@CrossOrigin
@RestController
@RequestMapping("/api/device/config")
@@ -55,16 +54,14 @@
* @param heartBeatCount 蹇冭烦璁℃暟
* @return
*/
- @ApiOperation("鍩烘湰閰嶇疆璁剧疆鍛戒护")
@GetMapping("/basicParam/{deviceId}")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value ="璁惧ID" ,dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value ="閫氶亾ID",dataTypeClass = String.class ),
- @ApiImplicitParam(name = "name", value ="鍚嶇О" ,dataTypeClass = String.class),
- @ApiImplicitParam(name = "expiration", value ="鍒版湡鏃堕棿" ,dataTypeClass = String.class),
- @ApiImplicitParam(name = "heartBeatInterval", value ="蹇冭烦闂撮殧" ,dataTypeClass = String.class),
- @ApiImplicitParam(name = "heartBeatCount", value ="蹇冭烦璁℃暟" ,dataTypeClass = String.class),
- })
+ @Operation(summary = "鍩烘湰閰嶇疆璁剧疆鍛戒护")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "name", description = "鍚嶇О")
+ @Parameter(name = "expiration", description = "鍒版湡鏃堕棿")
+ @Parameter(name = "heartBeatInterval", description = "蹇冭烦闂撮殧")
+ @Parameter(name = "heartBeatCount", description = "蹇冭烦璁℃暟")
public DeferredResult<ResponseEntity<String>> homePositionApi(@PathVariable String deviceId,
String channelId,
@RequestParam(required = false) String name,
@@ -109,12 +106,10 @@
* @param channelId 閫氶亾ID
* @return
*/
- @ApiOperation("璁惧閰嶇疆鏌ヨ璇锋眰")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value ="璁惧ID" ,dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value ="閫氶亾ID" ,dataTypeClass = String.class),
- @ApiImplicitParam(name = "configType", value ="閰嶇疆绫诲瀷" ,dataTypeClass = String.class),
- })
+ @Operation(summary = "璁惧閰嶇疆鏌ヨ璇锋眰")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "configType", description = "閰嶇疆绫诲瀷")
@GetMapping("/query/{deviceId}/{configType}")
public DeferredResult<ResponseEntity<String>> configDownloadApi(@PathVariable String deviceId,
@PathVariable String configType,
--
Gitblit v1.8.0