From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195

---
 src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java |   89 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
old mode 100644
new mode 100755
index 368399b..abf6df4
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
@@ -1,40 +1,99 @@
 package com.genersoft.iot.vmp.vmanager.bean;
 
 import com.genersoft.iot.vmp.common.StreamInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
 
+@Schema(description = "娴佷俊鎭�")
 public class StreamContent {
 
+    @Schema(description = "搴旂敤鍚�")
     private String app;
+
+    @Schema(description = "娴両D")
     private String stream;
 
+    @Schema(description = "IP")
     private String ip;
 
+    @Schema(description = "HTTP-FLV娴佸湴鍧�")
     private String flv;
 
+    @Schema(description = "HTTPS-FLV娴佸湴鍧�")
     private String https_flv;
+
+    @Schema(description = "Websocket-FLV娴佸湴鍧�")
     private String ws_flv;
+
+    @Schema(description = "Websockets-FLV娴佸湴鍧�")
     private String wss_flv;
+
+    @Schema(description = "HTTP-FMP4娴佸湴鍧�")
     private String fmp4;
+
+    @Schema(description = "HTTPS-FMP4娴佸湴鍧�")
     private String https_fmp4;
+
+    @Schema(description = "Websocket-FMP4娴佸湴鍧�")
     private String ws_fmp4;
+
+    @Schema(description = "Websockets-FMP4娴佸湴鍧�")
     private String wss_fmp4;
+
+    @Schema(description = "HLS娴佸湴鍧�")
     private String hls;
+
+    @Schema(description = "HTTPS-HLS娴佸湴鍧�")
     private String https_hls;
+
+    @Schema(description = "Websocket-HLS娴佸湴鍧�")
     private String ws_hls;
+
+    @Schema(description = "Websockets-HLS娴佸湴鍧�")
     private String wss_hls;
+
+    @Schema(description = "HTTP-TS娴佸湴鍧�")
     private String ts;
+
+    @Schema(description = "HTTPS-TS娴佸湴鍧�")
     private String https_ts;
+
+    @Schema(description = "Websocket-TS娴佸湴鍧�")
     private String ws_ts;
+
+    @Schema(description = "Websockets-TS娴佸湴鍧�")
     private String wss_ts;
+
+    @Schema(description = "RTMP娴佸湴鍧�")
     private String rtmp;
+
+    @Schema(description = "RTMPS娴佸湴鍧�")
     private String rtmps;
+
+    @Schema(description = "RTSP娴佸湴鍧�")
     private String rtsp;
+
+    @Schema(description = "RTSPS娴佸湴鍧�")
     private String rtsps;
+
+    @Schema(description = "RTC娴佸湴鍧�")
     private String rtc;
 
+    @Schema(description = "RTCS娴佸湴鍧�")
     private String rtcs;
+
+    @Schema(description = "娴佸獟浣揑D")
     private String mediaServerId;
+
+    @Schema(description = "娴佺紪鐮佷俊鎭�")
     private Object tracks;
+
+    @Schema(description = "寮�濮嬫椂闂�")
+    private String startTime;
+
+    @Schema(description = "缁撴潫鏃堕棿")
+    private String endTime;
+
+    private double progress;
 
     public StreamContent(StreamInfo streamInfo) {
         if (streamInfo == null) {
@@ -56,6 +115,9 @@
         }
         if (streamInfo.getFmp4() != null) {
             this.fmp4 = streamInfo.getFmp4().getUrl();
+        }
+        if (streamInfo.getHttps_fmp4() != null) {
+            this.https_fmp4 = streamInfo.getHttps_fmp4().getUrl();
         }
         if (streamInfo.getWs_fmp4() != null) {
             this.ws_fmp4 = streamInfo.getWs_fmp4().getUrl();
@@ -105,6 +167,9 @@
 
         this.mediaServerId = streamInfo.getMediaServerId();
         this.tracks = streamInfo.getTracks();
+        this.startTime = streamInfo.getStartTime();
+        this.endTime = streamInfo.getEndTime();
+        this.progress = streamInfo.getProgress();
     }
 
     public String getApp() {
@@ -322,4 +387,28 @@
     public void setTracks(Object tracks) {
         this.tracks = tracks;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public double getProgress() {
+        return progress;
+    }
+
+    public void setProgress(double progress) {
+        this.progress = progress;
+    }
 }

--
Gitblit v1.8.0