From 04f3511fb3f3598cfb1646ba7ab58bf20e1a0de3 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期三, 28 四月 2021 17:52:11 +0800
Subject: [PATCH] 优化mysql建库脚本
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index d701c83..b41ef6d 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -2,10 +2,13 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.conf.MediaConfig;
import okhttp3.*;
+import org.checkerframework.checker.units.qual.A;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -20,14 +23,8 @@
private final static Logger logger = LoggerFactory.getLogger(ZLMRESTfulUtils.class);
- @Value("${media.ip}")
- private String mediaIp;
-
- @Value("${media.port}")
- private int mediaPort;
-
- @Value("${media.secret}")
- private String mediaSecret;
+ @Autowired
+ private MediaConfig mediaConfig;
public interface RequestCallback{
void run(JSONObject response);
@@ -35,15 +32,17 @@
public JSONObject sendPost(String api, Map<String, Object> param, RequestCallback callback) {
OkHttpClient client = new OkHttpClient();
- String url = String.format("http://%s:%s/index/api/%s", mediaIp, mediaPort, api);
+ String url = String.format("http://%s:%s/index/api/%s", mediaConfig.getIp(), mediaConfig.getHttpPort(), api);
JSONObject responseJSON = null;
logger.debug(url);
FormBody.Builder builder = new FormBody.Builder();
- builder.add("secret",mediaSecret);
+ builder.add("secret",mediaConfig.getSecret());
if (param != null && param.keySet().size() > 0) {
for (String key : param.keySet()){
- builder.add(key, param.get(key).toString());
+ if (param.get(key) != null) {
+ builder.add(key, param.get(key).toString());
+ }
}
}
@@ -129,8 +128,8 @@
}
public JSONObject addFFmpegSource(String src_url, String dst_url, String timeout_ms){
- System.out.println(src_url);
- System.out.println(dst_url);
+ logger.info(src_url);
+ logger.info(dst_url);
Map<String, Object> param = new HashMap<>();
param.put("src_url", src_url);
param.put("dst_url", dst_url);
@@ -192,4 +191,14 @@
param.put("force", 1);
return sendPost("close_streams",param, null);
}
+
+ public JSONObject getAllSession() {
+ return sendPost("getAllSession",null, null);
+ }
+
+ public void kickSessions(String localPortSStr) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("local_port", localPortSStr);
+ sendPost("kick_sessions",param, null);
+ }
}
--
Gitblit v1.8.0