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 | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 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 70fa4da..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 @@ -1,7 +1,6 @@ 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; @@ -13,31 +12,31 @@ * @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(url = "/config/paths/add/{name}") + @Post("/config/paths/add/{name}") public String addPath(@Var("name") String name, @JSONBody Conf body); /** * 淇敼璺緞 */ - @Post(url = "/config/paths/edit/{name}", async = true) + @Patch("/config/paths/patch/{name}") public String editPath(@Var("name") String name, @JSONBody Conf body); /** * 绉婚櫎璺緞 */ - @Post("/config/paths/remove/{name}") + @Delete("/config/paths/delete/{name}") public String removePath(@Var("name") String name); /** * 鑾峰彇璺緞璇︽儏 */ - @Get("/paths/get/{name}") - public Items getPathInfo(@Var("name") String name); + @Get(url ="/config/paths/get/{name}") + public Conf getPathInfo(@Var("name") String name); /** * 鏌ヨ鎵�鏈夎矾寰� @@ -50,12 +49,6 @@ */ @Get("/rtspsessions/list") public String rtspsessions(); - - /** - * 鏌ヨ鎵�鏈塺tsp杩炴帴 - */ - @Get("/rtspconns/list") - public String rtspconns(); /** * 鎸塻essionId鏌ヨrtsp浼氳瘽 -- Gitblit v1.9.3