Sfoglia il codice sorgente

doc去除cdn依赖

648540858 2 anni fa
parent
commit
6fcff0567e

+ 1 - 0
doc/_sidebar.md

@@ -1,6 +1,7 @@
 <!-- 侧边栏 -->
 
 * **编译与部署**
+  * [测试](_content/introduction/test.md)
   * [编译](_content/introduction/compile.md)
   * [配置](_content/introduction/config.md)
   * [部署](_content/introduction/deployment.md)

+ 6 - 6
doc/index.html

@@ -7,7 +7,7 @@
   <meta name="description" content="Description">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
   <link rel="icon" href="_media/favicon.ico" type="image/x-icon" />
-  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css">
+  <link rel="stylesheet" href="./lib/css/vue.css">
 <!--  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/dark.css">-->
   <style>
     .cover{
@@ -47,11 +47,11 @@
     }
   </script>
   <!-- Docsify v4 -->
-  <script src="//cdn.jsdelivr.net/npm/docsify@4"></script>
-  <script src="//unpkg.com/docsify-plantuml/dist/docsify-plantuml.min.js"></script>
-  <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/search.min.js"></script>
-  <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/zoom-image.min.js"></script>
-  <script src="//cdn.jsdelivr.net/npm/docsify-copy-code/dist/docsify-copy-code.min.js"></script>
+  <script src="./lib/js/docsify@4.js"></script>
+  <script src="./lib/js/docsify-plantuml.min.js"></script>
+  <script src="./lib/js/search.min.js"></script>
+  <script src="./lib/js/zoom-image.min.js"></script>
+  <script src="./lib/js/docsify-copy-code.min.js"></script>
 
   </script>
 <!--  <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/disqus.min.js"></script>-->

File diff suppressed because it is too large
+ 0 - 0
doc/lib/css/vue.css


File diff suppressed because it is too large
+ 7 - 0
doc/lib/js/docsify-copy-code.min.js


File diff suppressed because it is too large
+ 0 - 0
doc/lib/js/docsify-plantuml.min.js


File diff suppressed because it is too large
+ 0 - 0
doc/lib/js/docsify@4.js


File diff suppressed because it is too large
+ 0 - 0
doc/lib/js/search.min.js


File diff suppressed because it is too large
+ 0 - 0
doc/lib/js/zoom-image.min.js


+ 29 - 8
src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java

@@ -10,12 +10,14 @@ import com.genersoft.iot.vmp.service.*;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 @SuppressWarnings("rawtypes")
 @Tag(name = "第三方服务对接")
@@ -61,16 +63,35 @@ public class RtpController {
     private IRedisCatchStorage redisCatchStorage;
 
 
-    @GetMapping(value = "/send/ready")
+    @GetMapping(value = "/openRtpServer")
     @ResponseBody
-    @Operation(summary = "为发送视频流获取信息")
-    public List<MediaServerItem> getMediaServerList(Boolean onlySender, ) {
+    @Operation(summary = "开启收流和获取发流信息")
+    @Parameter(name = "isSend", description = "是否发送,false时同时只开启收流", required = true)
+    @Parameter(name = "callId", description = "整个过程的唯一标识", required = true)
+    @Parameter(name = "ssrc", description = "来源流的SSRC", required = false)
+    @Parameter(name = "hasAudio", description = "是否", required = false)
+    @Parameter(name = "stream", description = "形成的流的ID", required = true)
+    @Parameter(name = "tcpMode", description = "收流模式, 0为UDP, 1为TCP被动", required = true)
+    public void openRtpServer(Boolean isSend, String ssrc, String callId, Boolean hasAudio, String stream, Integer tcpMode) {
         MediaServerItem mediaServerItem = mediaServerService.getMediaServerForMinimumLoad(null);
         if (mediaServerItem == null) {
             throw new ControllerException(ErrorCode.ERROR100.getCode(),"没有可用的MediaServer");
         }
-        mediaServerService.openRTPServer()
-        return mediaServerService.getAll();
+    }
+
+    @GetMapping(value = "/sendRTP")
+    @ResponseBody
+    @Operation(summary = "发送流")
+
+    @Parameter(name = "ssrc", description = "发送流的SSRC", required = true)
+    @Parameter(name = "ip", description = "目标IP", required = true)
+    @Parameter(name = "port", description = "目标端口", required = true)
+    @Parameter(name = "app", description = "待发送应用名", required = true)
+    @Parameter(name = "stream", description = "待发送流Id", required = true)
+    @Parameter(name = "callId", description = "整个过程的唯一标识", required = true)
+    @Parameter(name = "onlyAudio", description = "是否只有音频", required = true)
+    public void sendRTP(String ssrc, String ip, Integer port, String app, String stream, String callId, Boolean onlyAudio) {
+
     }
 
 }

Some files were not shown because too many files changed in this diff