From ab909feedf43a44780a6198cbd4772e9d7713fdf Mon Sep 17 00:00:00 2001
From: WuPeng <wp@zafu.edu.cn>
Date: 星期六, 05 十一月 2022 20:49:56 +0800
Subject: [PATCH] 升级Fastjson到Fastjson2
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index bde4f82..41c17ca 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -5,7 +5,7 @@
import java.util.List;
import java.util.Map;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
@@ -29,7 +29,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import javax.servlet.http.HttpServletRequest;
@@ -521,7 +521,7 @@
if (sendRtpItem.getApp().equals(app)) {
String platformId = sendRtpItem.getPlatformId();
ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
- Device device = deviceService.queryDevice(platformId);
+ Device device = deviceService.getDevice(platformId);
try {
if (platform != null) {
@@ -581,7 +581,7 @@
}
}
}
- Device device = deviceService.queryDevice(streamInfoForPlayCatch.getDeviceID());
+ Device device = deviceService.getDevice(streamInfoForPlayCatch.getDeviceID());
if (device != null) {
try {
cmder.streamByeCmd(device, streamInfoForPlayCatch.getChannelId(),
@@ -601,7 +601,7 @@
if (streamInfoForPlayBackCatch.isPause()) {
ret.put("close", false);
}else {
- Device device = deviceService.queryDevice(streamInfoForPlayBackCatch.getDeviceID());
+ Device device = deviceService.getDevice(streamInfoForPlayBackCatch.getDeviceID());
if (device != null) {
try {
cmder.streamByeCmd(device,streamInfoForPlayBackCatch.getChannelId(),
@@ -716,7 +716,7 @@
}
}
- ZLMServerConfig zlmServerConfig = JSONObject.toJavaObject(jsonObject, ZLMServerConfig.class);
+ ZLMServerConfig zlmServerConfig = jsonObject.to(ZLMServerConfig.class);
if (zlmServerConfig !=null ) {
mediaServerService.zlmServerOnline(zlmServerConfig);
}
--
Gitblit v1.8.0