From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/utils/forest/MediaClient.java |   53 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/utils/forest/MediaClient.java b/ard-work/src/main/java/com/ruoyi/utils/forest/MediaClient.java
index 7103be5..a187f3e 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/forest/MediaClient.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/forest/MediaClient.java
@@ -2,6 +2,7 @@
 
 import com.dtflys.forest.annotation.*;
 import com.ruoyi.media.domain.Conf;
+import com.ruoyi.media.domain.Config;
 import com.ruoyi.media.domain.Items;
 
 /**
@@ -11,71 +12,83 @@
  * @Date: 2023骞�07鏈�06鏃�9:51
  * @Version: 1.0
  **/
-@BaseRequest(baseURL = "http://#{mediamtx.host}:9997/v2")
+@BaseRequest(baseURL = "http://#{mediamtx.host}:9997/v3")
 public interface MediaClient {
     /**
      * 澧炲姞璺緞
      */
     @Post("/config/paths/add/{name}")
-    String addPath( @Var("name") String name, @JSONBody Conf body);
+    public String addPath(@Var("name") String name, @JSONBody Conf body);
+
+    /**
+     * 淇敼璺緞
+     */
+    @Patch("/config/paths/patch/{name}")
+    public String editPath(@Var("name") String name, @JSONBody Conf body);
 
     /**
      * 绉婚櫎璺緞
      */
-    @Post("/config/paths/remove/{name}")
-    String removePath(@Var("name") String name);
+    @Delete("/config/paths/delete/{name}")
+    public String removePath(@Var("name") String name);
 
     /**
      * 鑾峰彇璺緞璇︽儏
      */
-    @Get("/paths/get/{name}")
-    Items getPathInfo(@Var("name") String name);
+    @Get(url ="/config/paths/get/{name}")
+    public Conf getPathInfo(@Var("name") String name);
+
     /**
      * 鏌ヨ鎵�鏈夎矾寰�
      */
     @Get("/paths/list")
-    String paths();
+    public String paths();
 
     /**
      * 鏌ヨ鎵�鏈塺tsp浼氳瘽
      */
     @Get("/rtspsessions/list")
-    String rtspsessions();
-
-    /**
-     * 鏌ヨ鎵�鏈塺tsp杩炴帴
-     */
-    @Get("/rtspconns/list")
-    String rtspconns();
+    public String rtspsessions();
 
     /**
      * 鎸塻essionId鏌ヨrtsp浼氳瘽
      */
     @Get("/rtspsessions/get/{sessionId}")
-    String getRtspsessionById(@Var("sessionId") String sessionId);
+    public String getRtspsessionById(@Var("sessionId") String sessionId);
+
     /**
      * 鎸塻essionId鏌ヨwebrtc浼氳瘽
      */
     @Get("/webrtcsessions/get/{sessionId}")
-    String getWebrtcsessionById(@Var("sessionId") String sessionId);
+    public String getWebrtcsessionById(@Var("sessionId") String sessionId);
+
     /**
      * 鎸塻essionId鏌ヨrtmp浼氳瘽
      */
     @Get("/rtmpconns/get/{sessionId}")
-    String getRtmpsessionById(@Var("sessionId") String sessionId);
+    public String getRtmpsessionById(@Var("sessionId") String sessionId);
+
     /**
      * 鎸塻essionId鍒犻櫎rtsp浼氳瘽
      */
     @Post("/rtspsessions/kick/{sessionId}")
-    String kickRtspSessions(@Var("sessionId") String sessionId);
+    public String kickRtspSessions(@Var("sessionId") String sessionId);
+
     /**
      * 鎸塻essionId鍒犻櫎rtmp杩炴帴
      */
     @Post("/rtmpconns/kick/{sessionId}")
-    String kickRtmpSessions(@Var("sessionId") String sessionId);
+    public String kickRtmpSessions(@Var("sessionId") String sessionId);
+
     /**
      * 鎸塻essionId鍒犻櫎webrtc浼氳瘽
      */
     @Post("/webrtcsessions/kick/{sessionId}")
-    String kickWebrtcSessions(@Var("sessionId") String sessionId);
+    public String kickWebrtcSessions(@Var("sessionId") String sessionId);
+
+    /**
+     * 閰嶇疆娴佸獟浣撳弬鏁�
+     */
+    @Post("/config/set")
+    public String setConfig(@JSONBody Config config);
 }

--
Gitblit v1.9.3