From e94cb6da040c03cbb33d96c0fb438c76bc20c6ac Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期一, 14 八月 2023 17:11:45 +0800 Subject: [PATCH] 优化拉流列表和协议 --- ard-work/src/main/java/com/ruoyi/utils/forest/MediaClient.java | 45 ++++++++++++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 17 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 d0a9725..e87f76c 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,10 +1,8 @@ package com.ruoyi.utils.forest; -import com.dtflys.forest.annotation.Get; -import com.dtflys.forest.annotation.JSONBody; -import com.dtflys.forest.annotation.Post; -import com.dtflys.forest.annotation.Var; +import com.dtflys.forest.annotation.*; import com.ruoyi.media.domain.Conf; +import com.ruoyi.media.domain.Items; /** * @Description: mediamtx娴佸獟浣撳鎴风 @@ -13,40 +11,53 @@ * @Date: 2023骞�07鏈�06鏃�9:51 * @Version: 1.0 **/ +@BaseRequest(baseURL = "http://#{mediamtx.host}:9997/v2") public interface MediaClient { /** * 澧炲姞璺緞 */ - @Post("{apiUrl}/config/paths/add/{name}") - String addPath(@Var("apiUrl") String apiUrl, @Var("name") String name, @JSONBody Conf body); + @Post("/config/paths/add/{name}") + String addPath( @Var("name") String name, @JSONBody Conf body); /** * 绉婚櫎璺緞 */ - @Post("{apiUrl}/config/paths/remove/{name}") - String removePath(@Var("apiUrl") String apiUrl, @Var("name") String name); + @Post("/config/paths/remove/{name}") + String removePath(@Var("name") String name); + /** + * 鑾峰彇璺緞璇︽儏 + */ + @Get("/paths/get/{name}") + Items getPathInfo(@Var("name") String name); /** * 鏌ヨ鎵�鏈夎矾寰� */ - @Get("{apiUrl}/paths/list") - String paths(@Var("apiUrl") String apiUrl); + @Get("/paths/list") + String paths(); /** * 鏌ヨ鎵�鏈塺tsp浼氳瘽 */ - @Get("{apiUrl}/rtspsessions/list") - String rtspsessions(@Var("apiUrl") String apiUrl); + @Get("/rtspsessions/list") + String rtspsessions(); /** * 鏌ヨ鎵�鏈塺tsp杩炴帴 */ - @Get("{apiUrl}/rtspconns/list") - String rtspconns(@Var("apiUrl") String apiUrl); + @Get("/rtspconns/list") + String rtspconns(); /** - * 鎸塱d鏌ヨrtsp浼氳瘽 + * 鎸塻essionId鏌ヨrtsp浼氳瘽 */ - @Get("{apiUrl}/rtspsessions/get/{id}") - String rtspsessionsById(@Var("apiUrl") String apiUrl, @Var("id") String id); + @Get("/rtspsessions/get/{sessionId}") + String getRtspsessionById(@Var("sessionId") String sessionId); + + /** + * 鎸塻essionId鍒犻櫎rtsp浼氳瘽 + */ + @Post("/rtspsessions/kick/{sessionId}") + String kick(@Var("sessionId") String sessionId); + } -- Gitblit v1.9.3