From a4328e3d4fe2894c0ddf378eea9b3c2a3498d62b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 23 三月 2023 08:52:35 +0800
Subject: [PATCH] 修复关闭接口鉴权后跨域设置失效的问题
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
index 39685b0..b0e74e8 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
@@ -1,24 +1,46 @@
package com.genersoft.iot.vmp.media.zlm.dto;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import io.swagger.v3.oas.annotations.media.Schema;
+/**
+ * @author lin
+ */
+@Schema(description = "鎷夋祦浠ｇ悊鐨勪俊鎭�")
public class StreamProxyItem extends GbStream {
+ @Schema(description = "绫诲瀷")
private String type;
+ @Schema(description = "搴旂敤鍚�")
private String app;
+ @Schema(description = "娴両D")
private String stream;
+ @Schema(description = "娴佸獟浣撴湇鍔D")
private String mediaServerId;
+ @Schema(description = "鎷夋祦鍦板潃")
private String url;
+ @Schema(description = "鎷夋祦鍦板潃")
private String src_url;
+ @Schema(description = "鐩爣鍦板潃")
private String dst_url;
+ @Schema(description = "瓒呮椂鏃堕棿")
private int timeout_ms;
+ @Schema(description = "ffmpeg妯℃澘KEY")
private String ffmpeg_cmd_key;
+ @Schema(description = "rtsp鎷夋祦鏃讹紝鎷夋祦鏂瑰紡锛�0锛歵cp锛�1锛歶dp锛�2锛氱粍鎾�")
private String rtp_type;
+ @Schema(description = "鏄惁鍚敤")
private boolean enable;
- private boolean enable_hls;
+ @Schema(description = "鏄惁鍚敤闊抽")
+ private boolean enable_audio;
+ @Schema(description = "鏄惁鍚敤MP4")
private boolean enable_mp4;
- private boolean enable_remove_none_reader; // 鏃犱汉瑙傜湅鏃跺垹闄�
- private String platformGbId;
+ @Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃跺垹闄�")
+ private boolean enable_remove_none_reader;
+
+ @Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃惰嚜鍔ㄥ仠鐢�")
+ private boolean enable_disable_none_reader;
+ @Schema(description = "鍒涘缓鏃堕棿")
private String createTime;
public String getType() {
@@ -29,18 +51,22 @@
this.type = type;
}
+ @Override
public String getApp() {
return app;
}
+ @Override
public void setApp(String app) {
this.app = app;
}
+ @Override
public String getStream() {
return stream;
}
+ @Override
public void setStream(String stream) {
this.stream = stream;
}
@@ -111,14 +137,6 @@
this.enable = enable;
}
- public boolean isEnable_hls() {
- return enable_hls;
- }
-
- public void setEnable_hls(boolean enable_hls) {
- this.enable_hls = enable_hls;
- }
-
public boolean isEnable_mp4() {
return enable_mp4;
}
@@ -127,19 +145,12 @@
this.enable_mp4 = enable_mp4;
}
-
- public String getPlatformGbId() {
- return platformGbId;
- }
-
- public void setPlatformGbId(String platformGbId) {
- this.platformGbId = platformGbId;
- }
-
+ @Override
public String getCreateTime() {
return createTime;
}
+ @Override
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
@@ -152,4 +163,19 @@
this.enable_remove_none_reader = enable_remove_none_reader;
}
+ public boolean isEnable_disable_none_reader() {
+ return enable_disable_none_reader;
+ }
+
+ public void setEnable_disable_none_reader(boolean enable_disable_none_reader) {
+ this.enable_disable_none_reader = enable_disable_none_reader;
+ }
+
+ public boolean isEnable_audio() {
+ return enable_audio;
+ }
+
+ public void setEnable_audio(boolean enable_audio) {
+ this.enable_audio = enable_audio;
+ }
}
--
Gitblit v1.8.0