From e932a9b824b93a4a0365e11f1e02775b10c0b045 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 01 三月 2024 10:55:49 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiController.java | 7
src/main/java/com/genersoft/iot/vmp/utils/SSLSocketClientUtil.java | 53 ++++++++++
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 7
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java | 5
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 3
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 168 ++++++++++++++++-----------------
src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java | 10 +
src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java | 2
8 files changed, 157 insertions(+), 98 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
index cb0d3dd..d7c91df 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
@@ -2,9 +2,8 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.utils.SSLSocketClientUtil;
import okhttp3.*;
import okhttp3.logging.HttpLoggingInterceptor;
import org.jetbrains.annotations.NotNull;
@@ -13,11 +12,10 @@
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
+import javax.net.ssl.X509TrustManager;
import java.io.IOException;
import java.net.ConnectException;
-import java.net.MalformedURLException;
import java.net.SocketTimeoutException;
-import java.net.URL;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -61,6 +59,10 @@
// OkHttp閫茶娣诲姞鏀旀埅鍣╨oggingInterceptor
httpClientBuilder.addInterceptor(logging);
}
+ X509TrustManager manager = SSLSocketClientUtil.getX509TrustManager();
+ // 璁剧疆ssl
+ httpClientBuilder.sslSocketFactory(SSLSocketClientUtil.getSocketFactory(manager), manager);
+ httpClientBuilder.hostnameVerifier(SSLSocketClientUtil.getHostnameVerifier());//蹇界暐鏍￠獙
client = httpClientBuilder.build();
}
return client;
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/SSLSocketClientUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/SSLSocketClientUtil.java
new file mode 100644
index 0000000..c85b163
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/utils/SSLSocketClientUtil.java
@@ -0,0 +1,53 @@
+package com.genersoft.iot.vmp.utils;
+
+import javax.net.ssl.*;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class SSLSocketClientUtil {
+ public static SSLSocketFactory getSocketFactory(TrustManager manager) {
+ SSLSocketFactory socketFactory = null;
+ try {
+ SSLContext sslContext = SSLContext.getInstance("SSL");
+ sslContext.init(null, new TrustManager[]{manager}, new SecureRandom());
+ socketFactory = sslContext.getSocketFactory();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (KeyManagementException e) {
+ e.printStackTrace();
+ }
+ return socketFactory;
+ }
+
+ public static X509TrustManager getX509TrustManager() {
+ return new X509TrustManager() {
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+
+ }
+
+ @Override
+ public X509Certificate[] getAcceptedIssuers() {
+ return new X509Certificate[0];
+ }
+ };
+ }
+
+ public static HostnameVerifier getHostnameVerifier() {
+ HostnameVerifier hostnameVerifier = new HostnameVerifier() {
+ @Override
+ public boolean verify(String s, SSLSession sslSession) {
+ return true;
+ }
+ };
+ return hostnameVerifier;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 968d79e..b69ed19 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -143,6 +143,9 @@
streamInfo.channgeStreamIp(host);
}
wvpResult.setData(new StreamContent(streamInfo));
+ }else {
+ wvpResult.setCode(code);
+ wvpResult.setMsg(msg);
}
}else {
wvpResult.setCode(code);
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
index 286c8d5..06ba33c 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
@@ -8,6 +8,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -41,7 +42,7 @@
* @param speed 閫熷害(0~255) 榛樿鍊�: 129
* @return
*/
- @RequestMapping(value = "/ptz")
+ @GetMapping(value = "/ptz")
private void list(String serial,String command,
@RequestParam(required = false)Integer channel,
@RequestParam(required = false)String code,
@@ -114,7 +115,7 @@
* @param name 棰勭疆浣嶅悕绉�, command=set 鏃舵湁鏁�
* @return
*/
- @RequestMapping(value = "/preset")
+ @GetMapping(value = "/preset")
private void list(String serial,String command,
@RequestParam(required = false)Integer channel,
@RequestParam(required = false)String code,
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiController.java
index bd5d5ef..3457cf9 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiController.java
@@ -6,6 +6,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -23,7 +24,7 @@
private SipConfig sipConfig;
- @RequestMapping("/getserverinfo")
+ @GetMapping("/getserverinfo")
private JSONObject getserverinfo(){
JSONObject result = new JSONObject();
result.put("Authorization","ceshi");
@@ -50,7 +51,7 @@
return result;
}
- @RequestMapping(value = "/userinfo")
+ @GetMapping(value = "/userinfo")
private JSONObject userinfo(){
// JSONObject result = new JSONObject();
// result.put("ID","ceshi");
@@ -83,7 +84,7 @@
* @param password 瀵嗙爜(缁忚繃md5鍔犲瘑,32浣嶉暱搴�,涓嶅甫涓垝绾�,涓嶅尯鍒嗗ぇ灏忓啓)
* @return
*/
- @RequestMapping(value = "/login")
+ @GetMapping(value = "/login")
@ResponseBody
private JSONObject login(String username,String password ){
if (logger.isDebugEnabled()) {
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
index 688fc80..df2c9a2 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
@@ -18,6 +18,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -59,7 +60,7 @@
* @param online
* @return
*/
- @RequestMapping(value = "/list")
+ @GetMapping(value = "/list")
public JSONObject list( @RequestParam(required = false)Integer start,
@RequestParam(required = false)Integer limit,
@RequestParam(required = false)String q,
@@ -105,7 +106,7 @@
return result;
}
- @RequestMapping(value = "/channellist")
+ @GetMapping(value = "/channellist")
public JSONObject channellist( String serial,
@RequestParam(required = false)String channel_type,
@RequestParam(required = false)String code ,
@@ -186,7 +187,7 @@
* @param timeout 瓒呮椂鏃堕棿(绉�) 榛樿鍊�: 15
* @return
*/
- @RequestMapping(value = "/fetchpreset")
+ @GetMapping(value = "/fetchpreset")
private DeferredResult<Object> list(String serial,
@RequestParam(required = false)Integer channel,
@RequestParam(required = false)String code,
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index ef7c6bb..63d9f31 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.InviteInfo;
import com.genersoft.iot.vmp.common.InviteSessionType;
+import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -13,15 +14,11 @@
import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
import javax.sip.InvalidArgumentException;
@@ -49,9 +46,6 @@
private UserSetting userSetting;
@Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Autowired
private IDeviceService deviceService;
@Autowired
@@ -73,7 +67,7 @@
* @param timeout 鎷夋祦瓒呮椂(绉�),
* @return
*/
- @RequestMapping(value = "/start")
+ @GetMapping("/start")
private DeferredResult<JSONObject> start(String serial ,
@RequestParam(required = false)Integer channel ,
@RequestParam(required = false)String code,
@@ -85,107 +79,111 @@
@RequestParam(required = false)String timeout
){
- DeferredResult<JSONObject> resultDeferredResult = new DeferredResult<>(userSetting.getPlayTimeout().longValue() + 10);
+ DeferredResult<JSONObject> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue() + 10);
Device device = storager.queryVideoDevice(serial);
if (device == null ) {
- JSONObject result = new JSONObject();
- result.put("error","device[ " + serial + " ]鏈壘鍒�");
- resultDeferredResult.setResult(result);
- return resultDeferredResult;
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","device[ " + serial + " ]鏈壘鍒�");
+ result.setResult(resultJSON);
+ return result;
}else if (!device.isOnLine()) {
- JSONObject result = new JSONObject();
- result.put("error","device[ " + code + " ]offline");
- resultDeferredResult.setResult(result);
- return resultDeferredResult;
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","device[ " + code + " ]offline");
+ result.setResult(resultJSON);
+ return result;
}
- resultDeferredResult.onTimeout(()->{
+ result.onTimeout(()->{
logger.info("鎾斁绛夊緟瓒呮椂");
- JSONObject result = new JSONObject();
- result.put("error","timeout");
- resultDeferredResult.setResult(result);
-
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","timeout");
+ result.setResult(resultJSON);
+ inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
+ storager.stopPlay(serial, code);
// 娓呯悊RTP server
});
DeviceChannel deviceChannel = storager.queryChannel(serial, code);
if (deviceChannel == null) {
- JSONObject result = new JSONObject();
- result.put("error","channel[ " + code + " ]鏈壘鍒�");
- resultDeferredResult.setResult(result);
- return resultDeferredResult;
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","channel[ " + code + " ]鏈壘鍒�");
+ result.setResult(resultJSON);
+ return result;
}else if (!deviceChannel.isStatus()) {
- JSONObject result = new JSONObject();
- result.put("error","channel[ " + code + " ]offline");
- resultDeferredResult.setResult(result);
- return resultDeferredResult;
+ JSONObject resultJSON = new JSONObject();
+ resultJSON.put("error","channel[ " + code + " ]offline");
+ result.setResult(resultJSON);
+ return result;
}
MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
-
playService.play(newMediaServerItem, serial, code, null, (errorCode, msg, data) -> {
if (errorCode == InviteErrorCode.SUCCESS.getCode()) {
- InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
- if (inviteInfo != null && inviteInfo.getStreamInfo() != null) {
- JSONObject result = new JSONObject();
- result.put("StreamID", inviteInfo.getStreamInfo().getStream());
- result.put("DeviceID", device.getDeviceId());
- result.put("ChannelID", code);
- result.put("ChannelName", deviceChannel.getName());
- result.put("ChannelCustomName", "");
- result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
- if(inviteInfo.getStreamInfo().getHttps_flv() != null) {
- result.put("HTTPS_FLV", inviteInfo.getStreamInfo().getHttps_flv().getUrl());
+ if (data != null) {
+ StreamInfo streamInfo = (StreamInfo)data;
+ JSONObject resultJjson = new JSONObject();
+ resultJjson.put("StreamID", streamInfo.getStream());
+ resultJjson.put("DeviceID", serial);
+ resultJjson.put("ChannelID", code);
+ resultJjson.put("ChannelName", deviceChannel.getName());
+ resultJjson.put("ChannelCustomName", "");
+ resultJjson.put("FLV", streamInfo.getFlv().getUrl());
+ if(streamInfo.getHttps_flv() != null) {
+ resultJjson.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
}
- result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
- if(inviteInfo.getStreamInfo().getWss_flv() != null) {
- result.put("WSS_FLV", inviteInfo.getStreamInfo().getWss_flv().getUrl());
+ resultJjson.put("WS_FLV", streamInfo.getWs_flv().getUrl());
+ if(streamInfo.getWss_flv() != null) {
+ resultJjson.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
}
- result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
- if (inviteInfo.getStreamInfo().getRtmps() != null) {
- result.put("RTMPS", inviteInfo.getStreamInfo().getRtmps().getUrl());
+ resultJjson.put("RTMP", streamInfo.getRtmp().getUrl());
+ if (streamInfo.getRtmps() != null) {
+ resultJjson.put("RTMPS", streamInfo.getRtmps().getUrl());
}
- result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
- if (inviteInfo.getStreamInfo().getHttps_hls() != null) {
- result.put("HTTPS_HLS", inviteInfo.getStreamInfo().getHttps_hls().getUrl());
+ resultJjson.put("HLS", streamInfo.getHls().getUrl());
+ if (streamInfo.getHttps_hls() != null) {
+ resultJjson.put("HTTPS_HLS", streamInfo.getHttps_hls().getUrl());
}
- result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
- if (inviteInfo.getStreamInfo().getRtsps() != null) {
- result.put("RTSPS", inviteInfo.getStreamInfo().getRtsps().getUrl());
+ resultJjson.put("RTSP", streamInfo.getRtsp().getUrl());
+ if (streamInfo.getRtsps() != null) {
+ resultJjson.put("RTSPS", streamInfo.getRtsps().getUrl());
}
- result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
- if (inviteInfo.getStreamInfo().getRtcs() != null) {
- result.put("HTTPS_WEBRTC", inviteInfo.getStreamInfo().getRtcs().getUrl());
+ resultJjson.put("WEBRTC", streamInfo.getRtc().getUrl());
+ if (streamInfo.getRtcs() != null) {
+ resultJjson.put("HTTPS_WEBRTC", streamInfo.getRtcs().getUrl());
}
- result.put("CDN", "");
- result.put("SnapURL", "");
- result.put("Transport", device.getTransport());
- result.put("StartAt", "");
- result.put("Duration", "");
- result.put("SourceVideoCodecName", "");
- result.put("SourceVideoWidth", "");
- result.put("SourceVideoHeight", "");
- result.put("SourceVideoFrameRate", "");
- result.put("SourceAudioCodecName", "");
- result.put("SourceAudioSampleRate", "");
- result.put("AudioEnable", "");
- result.put("Ondemand", "");
- result.put("InBytes", "");
- result.put("InBitRate", "");
- result.put("OutBytes", "");
- result.put("NumOutputs", "");
- result.put("CascadeSize", "");
- result.put("RelaySize", "");
- result.put("ChannelPTZType", "0");
- resultDeferredResult.setResult(result);
+ resultJjson.put("CDN", "");
+ resultJjson.put("SnapURL", "");
+ resultJjson.put("Transport", device.getTransport());
+ resultJjson.put("StartAt", "");
+ resultJjson.put("Duration", "");
+ resultJjson.put("SourceVideoCodecName", "");
+ resultJjson.put("SourceVideoWidth", "");
+ resultJjson.put("SourceVideoHeight", "");
+ resultJjson.put("SourceVideoFrameRate", "");
+ resultJjson.put("SourceAudioCodecName", "");
+ resultJjson.put("SourceAudioSampleRate", "");
+ resultJjson.put("AudioEnable", "");
+ resultJjson.put("Ondemand", "");
+ resultJjson.put("InBytes", "");
+ resultJjson.put("InBitRate", "");
+ resultJjson.put("OutBytes", "");
+ resultJjson.put("NumOutputs", "");
+ resultJjson.put("CascadeSize", "");
+ resultJjson.put("RelaySize", "");
+ resultJjson.put("ChannelPTZType", "0");
+ result.setResult(resultJjson);
+ }else {
+ JSONObject resultJjson = new JSONObject();
+ resultJjson.put("error", "channel[ " + code + " ] " + msg);
+ result.setResult(resultJjson);
}
}else {
- JSONObject result = new JSONObject();
- result.put("error", "channel[ " + code + " ] " + msg);
- resultDeferredResult.setResult(result);
+ JSONObject resultJjson = new JSONObject();
+ resultJjson.put("error", "channel[ " + code + " ] " + msg);
+ result.setResult(resultJjson);
}
});
- return resultDeferredResult;
+ return result;
}
/**
@@ -196,7 +194,7 @@
* @param check_outputs
* @return
*/
- @RequestMapping(value = "/stop")
+ @GetMapping("/stop")
@ResponseBody
private JSONObject stop(String serial ,
@RequestParam(required = false)Integer channel ,
@@ -236,7 +234,7 @@
* @param code 閫氶亾鍥芥爣缂栧彿
* @return
*/
- @RequestMapping(value = "/touch")
+ @GetMapping("/touch")
@ResponseBody
private JSONObject touch(String serial ,String t,
@RequestParam(required = false)Integer channel ,
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java
index d503f15..4e0b056 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java
@@ -13,7 +13,7 @@
@Autowired
private IUserService userService;
- @RequestMapping("/login")
+ @GetMapping("/login")
public String devices(String name, String passwd){
User user = userService.getUser(name, passwd);
if (user != null) {
--
Gitblit v1.8.0