From 0a12bfc2e9594345a0a6cf136bcf234c62450d9d Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 14 十月 2023 16:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/utils/forest/MediaClient.java |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 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 0e39f82..70fa4da 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
@@ -1,7 +1,9 @@
 package com.ruoyi.utils.forest;
 
 import com.dtflys.forest.annotation.*;
+import com.dtflys.forest.callback.OnError;
 import com.ruoyi.media.domain.Conf;
+import com.ruoyi.media.domain.Config;
 import com.ruoyi.media.domain.Items;
 
 /**
@@ -16,70 +18,84 @@
     /**
      * 澧炲姞璺緞
      */
-    @Post("/config/paths/add/{name}")
-    String addPath( @Var("name") String name, @JSONBody Conf body);
+    @Post(url = "/config/paths/add/{name}")
+    public String addPath(@Var("name") String name, @JSONBody Conf body);
+
     /**
      * 淇敼璺緞
      */
-    @Post("/config/paths/edit/{name}")
-    String editPath( @Var("name") String name, @JSONBody Conf body);
+    @Post(url = "/config/paths/edit/{name}", async = true)
+    public String editPath(@Var("name") String name, @JSONBody Conf body);
+
     /**
      * 绉婚櫎璺緞
      */
     @Post("/config/paths/remove/{name}")
-    String removePath(@Var("name") String name);
+    public String removePath(@Var("name") String name);
 
     /**
      * 鑾峰彇璺緞璇︽儏
      */
     @Get("/paths/get/{name}")
-    Items getPathInfo(@Var("name") String name);
+    public Items getPathInfo(@Var("name") String name);
+
     /**
      * 鏌ヨ鎵�鏈夎矾寰�
      */
     @Get("/paths/list")
-    String paths();
+    public String paths();
 
     /**
      * 鏌ヨ鎵�鏈塺tsp浼氳瘽
      */
     @Get("/rtspsessions/list")
-    String rtspsessions();
+    public String rtspsessions();
 
     /**
      * 鏌ヨ鎵�鏈塺tsp杩炴帴
      */
     @Get("/rtspconns/list")
-    String rtspconns();
+    public String rtspconns();
 
     /**
      * 鎸塻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