guzijian / wvp-GB28181-pro · Commits

Commit f762e03f0b200738d5f0a6bcff220acfa58c606f

Authored by 648540858
Committed by GitHub
2 parents fb1d9ca5 ab909fee

Merge pull request #662 from AlphaWu/Zafu-Dev-1105 

升级Fastjson到Fastjson2
Inline Side-by-side
Showing 68 changed files with 120 additions and 114 deletions
@@ -153,13 +153,17 @@ @@ -153,13 +153,17 @@
153 <version>2.1.3</version> 153 <version>2.1.3</version>
154 </dependency> 154 </dependency>
155 155
156 - <!-- json解析库fastjson --> 156 + <!-- json解析库fastjson2 -->
157 <dependency> 157 <dependency>
158 - <groupId>com.alibaba</groupId>  
159 - <artifactId>fastjson</artifactId>  
160 - <version>1.2.83</version> 158 + <groupId>com.alibaba.fastjson2</groupId>
  159 + <artifactId>fastjson2</artifactId>
  160 + <version>2.0.17</version>
  161 + </dependency>
  162 + <dependency>
  163 + <groupId>com.alibaba.fastjson2</groupId>
  164 + <artifactId>fastjson2-extension</artifactId>
  165 + <version>2.0.17</version>
161 </dependency> 166 </dependency>
162 -  
163 167
164 <!-- okhttp --> 168 <!-- okhttp -->
165 <dependency> 169 <dependency>
src/main/java/com/genersoft/iot/vmp/common/VersionPo.java
  View file @f762e03
1 package com.genersoft.iot.vmp.common; 1 package com.genersoft.iot.vmp.common;
2 2
3 -import com.alibaba.fastjson.annotation.JSONField; 3 +import com.alibaba.fastjson2.annotation.JSONField;
4 4
5 public class VersionPo { 5 public class VersionPo {
6 /** 6 /**
src/main/java/com/genersoft/iot/vmp/conf/GlobalResponseAdvice.java
  View file @f762e03
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.support.spring.http.converter.FastJsonHttpMessageConverter;
5 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode; 5 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
6 import com.genersoft.iot.vmp.vmanager.bean.WVPResult; 6 import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
7 import org.jetbrains.annotations.NotNull; 7 import org.jetbrains.annotations.NotNull;
src/main/java/com/genersoft/iot/vmp/conf/MediaStatusTimerTask.java
  View file @f762e03
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import com.alibaba.fastjson.JSONObject;  
4 import org.springframework.scheduling.annotation.Scheduled; 3 import org.springframework.scheduling.annotation.Scheduled;
5 4
6 /** 5 /**
src/main/java/com/genersoft/iot/vmp/conf/WVPTimerTask.java
  View file @f762e03
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.service.IMediaServerService; 4 import com.genersoft.iot.vmp.service.IMediaServerService;
5 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 5 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
6 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
  View file @f762e03
1 package com.genersoft.iot.vmp.conf.redis; 1 package com.genersoft.iot.vmp.conf.redis;
2 2
3 3
4 -import com.alibaba.fastjson.parser.ParserConfig;  
5 import com.genersoft.iot.vmp.common.VideoManagerConstants; 4 import com.genersoft.iot.vmp.common.VideoManagerConstants;
6 import com.genersoft.iot.vmp.service.redisMsg.*; 5 import com.genersoft.iot.vmp.service.redisMsg.*;
7 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,8 +54,7 @@ public class RedisConfig extends CachingConfigurerSupport { @@ -55,8 +54,7 @@ public class RedisConfig extends CachingConfigurerSupport {
55 // value值的序列化采用fastJsonRedisSerializer 54 // value值的序列化采用fastJsonRedisSerializer
56 redisTemplate.setValueSerializer(fastJsonRedisSerializer); 55 redisTemplate.setValueSerializer(fastJsonRedisSerializer);
57 redisTemplate.setHashValueSerializer(fastJsonRedisSerializer); 56 redisTemplate.setHashValueSerializer(fastJsonRedisSerializer);
58 - // 全局开启AutoType，不建议使用  
59 - ParserConfig.getGlobalInstance().setAutoTypeSupport(true); 57 +
60 // key的序列化采用StringRedisSerializer 58 // key的序列化采用StringRedisSerializer
61 redisTemplate.setKeySerializer(new StringRedisSerializer()); 59 redisTemplate.setKeySerializer(new StringRedisSerializer());
62 redisTemplate.setHashKeySerializer(new StringRedisSerializer()); 60 redisTemplate.setHashKeySerializer(new StringRedisSerializer());
src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java
  View file @f762e03
1 package com.genersoft.iot.vmp.conf.security; 1 package com.genersoft.iot.vmp.conf.security;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode; 4 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
5 import org.apache.poi.hssf.eventmodel.ERFListener; 5 import org.apache.poi.hssf.eventmodel.ERFListener;
6 import org.slf4j.Logger; 6 import org.slf4j.Logger;
src/main/java/com/genersoft/iot/vmp/gb28181/bean/InviteStreamInfo.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.bean; 1 package com.genersoft.iot.vmp.gb28181.bean;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 4 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
5 5
6 public class InviteStreamInfo { 6 public class InviteStreamInfo {
src/main/java/com/genersoft/iot/vmp/gb28181/task/SipRunner.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.task; 1 package com.genersoft.iot.vmp.gb28181.task;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.conf.UserSetting; 4 import com.genersoft.iot.vmp.conf.UserSetting;
5 import com.genersoft.iot.vmp.gb28181.bean.Device; 5 import com.genersoft.iot.vmp.gb28181.bean.Device;
6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl; 1 package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.common.StreamInfo; 4 import com.genersoft.iot.vmp.common.StreamInfo;
5 import com.genersoft.iot.vmp.conf.DynamicTask; 5 import com.genersoft.iot.vmp.conf.DynamicTask;
6 import com.genersoft.iot.vmp.conf.SipConfig; 6 import com.genersoft.iot.vmp.conf.SipConfig;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl; 1 package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.gb28181.bean.*; 5 import com.genersoft.iot.vmp.gb28181.bean.*;
5 import com.genersoft.iot.vmp.gb28181.event.SipSubscribe; 6 import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
6 import com.genersoft.iot.vmp.gb28181.transmit.SIPSender; 7 import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;
@@ -346,7 +347,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { @@ -346,7 +347,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
346 return; 347 return;
347 } 348 }
348 logger.info("[发送报警通知] {}/{}->{},{}: {}", parentPlatform.getServerGBId(), deviceAlarm.getChannelId(), 349 logger.info("[发送报警通知] {}/{}->{},{}: {}", parentPlatform.getServerGBId(), deviceAlarm.getChannelId(),
349 - deviceAlarm.getLongitude(), deviceAlarm.getLatitude(), JSONObject.toJSON(deviceAlarm)); 350 + deviceAlarm.getLongitude(), deviceAlarm.getLatitude(), JSON.toJSONString(deviceAlarm));
350 String characterSet = parentPlatform.getCharacterSet(); 351 String characterSet = parentPlatform.getCharacterSet();
351 StringBuffer deviceStatusXml = new StringBuffer(600); 352 StringBuffer deviceStatusXml = new StringBuffer(600);
352 deviceStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n"); 353 deviceStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.conf.DynamicTask; 5 import com.genersoft.iot.vmp.conf.DynamicTask;
5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
6 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem; 7 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
@@ -141,7 +142,7 @@ public class AckRequestProcessor extends SIPRequestProcessorParent implements In @@ -141,7 +142,7 @@ public class AckRequestProcessor extends SIPRequestProcessorParent implements In
141 logger.info("调用ZLM推流接口, 结果： {}", jsonObject); 142 logger.info("调用ZLM推流接口, 结果： {}", jsonObject);
142 logger.info("RTP推流成功[ {}/{} ]，{}->{}:{}, " ,param.get("app"), param.get("stream"), jsonObject.getString("local_port"), param.get("dst_url"), param.get("dst_port")); 143 logger.info("RTP推流成功[ {}/{} ]，{}->{}:{}, " ,param.get("app"), param.get("stream"), jsonObject.getString("local_port"), param.get("dst_url"), param.get("dst_port"));
143 } else { 144 } else {
144 - logger.error("RTP推流失败: {}, 参数：{}",jsonObject.getString("msg"),JSONObject.toJSON(param)); 145 + logger.error("RTP推流失败: {}, 参数：{}",jsonObject.getString("msg"), JSON.toJSONString(param));
145 if (sendRtpItem.isOnlyAudio()) { 146 if (sendRtpItem.isOnlyAudio()) {
146 // TODO 可能是语音对讲 147 // TODO 可能是语音对讲
147 }else { 148 }else {
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.conf.DynamicTask; 4 import com.genersoft.iot.vmp.conf.DynamicTask;
5 import com.genersoft.iot.vmp.conf.UserSetting; 5 import com.genersoft.iot.vmp.conf.UserSetting;
6 import com.genersoft.iot.vmp.gb28181.bean.*; 6 import com.genersoft.iot.vmp.gb28181.bean.*;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.conf.SipConfig; 4 import com.genersoft.iot.vmp.conf.SipConfig;
5 import com.genersoft.iot.vmp.conf.UserSetting; 5 import com.genersoft.iot.vmp.conf.UserSetting;
6 import com.genersoft.iot.vmp.gb28181.bean.*; 6 import com.genersoft.iot.vmp.gb28181.bean.*;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.conf.SipConfig; 5 import com.genersoft.iot.vmp.conf.SipConfig;
5 import com.genersoft.iot.vmp.conf.UserSetting; 6 import com.genersoft.iot.vmp.conf.UserSetting;
6 import com.genersoft.iot.vmp.gb28181.bean.*; 7 import com.genersoft.iot.vmp.gb28181.bean.*;
@@ -184,7 +185,7 @@ public class AlarmNotifyMessageHandler extends SIPRequestProcessorParent impleme @@ -184,7 +185,7 @@ public class AlarmNotifyMessageHandler extends SIPRequestProcessorParent impleme
184 deviceAlarm.setAlarmType(getText(sipMsgInfo.getRootElement().element("Info"), "AlarmType")); 185 deviceAlarm.setAlarmType(getText(sipMsgInfo.getRootElement().element("Info"), "AlarmType"));
185 } 186 }
186 } 187 }
187 - logger.info("[收到报警通知]内容：{}", JSONObject.toJSON(deviceAlarm)); 188 + logger.info("[收到报警通知]内容：{}", JSON.toJSONString(deviceAlarm));
188 if ("7".equals(deviceAlarm.getAlarmMethod()) ) { 189 if ("7".equals(deviceAlarm.getAlarmMethod()) ) {
189 // 发送给平台的报警信息。 发送redis通知 190 // 发送给平台的报警信息。 发送redis通知
190 AlarmChannelMessage alarmChannelMessage = new AlarmChannelMessage(); 191 AlarmChannelMessage alarmChannelMessage = new AlarmChannelMessage();
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.conf.UserSetting; 4 import com.genersoft.iot.vmp.conf.UserSetting;
5 import com.genersoft.iot.vmp.gb28181.bean.*; 5 import com.genersoft.iot.vmp.gb28181.bean.*;
6 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent; 6 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/AlarmResponseMessageHandler.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.gb28181.bean.Device; 4 import com.genersoft.iot.vmp.gb28181.bean.Device;
5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
6 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; 6 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.gb28181.bean.Device; 4 import com.genersoft.iot.vmp.gb28181.bean.Device;
5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
6 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; 6 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/ConfigDownloadResponseMessageHandler.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.gb28181.bean.Device; 4 import com.genersoft.iot.vmp.gb28181.bean.Device;
5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
6 import com.genersoft.iot.vmp.gb28181.event.EventPublisher; 6 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceConfigResponseMessageHandler.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.gb28181.bean.Device; 4 import com.genersoft.iot.vmp.gb28181.bean.Device;
5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
6 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; 6 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.gb28181.bean.Device; 4 import com.genersoft.iot.vmp.gb28181.bean.Device;
5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
6 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; 6 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceStatusResponseMessageHandler.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.common.VideoManagerConstants; 4 import com.genersoft.iot.vmp.common.VideoManagerConstants;
5 import com.genersoft.iot.vmp.gb28181.bean.Device; 5 import com.genersoft.iot.vmp.gb28181.bean.Device;
6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/MobilePositionResponseMessageHandler.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.conf.UserSetting; 4 import com.genersoft.iot.vmp.conf.UserSetting;
5 import com.genersoft.iot.vmp.gb28181.bean.*; 5 import com.genersoft.iot.vmp.gb28181.bean.*;
6 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent; 6 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
  View file @f762e03
1 package com.genersoft.iot.vmp.gb28181.utils; 1 package com.genersoft.iot.vmp.gb28181.utils;
2 2
3 -import com.alibaba.fastjson.JSONArray;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONArray;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.gb28181.bean.Device; 5 import com.genersoft.iot.vmp.gb28181.bean.Device;
6 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; 6 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
7 import com.genersoft.iot.vmp.gb28181.bean.TreeType; 7 import com.genersoft.iot.vmp.gb28181.bean.TreeType;
src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
  View file @f762e03
1 package com.genersoft.iot.vmp.media.zlm; 1 package com.genersoft.iot.vmp.media.zlm;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
6 import okhttp3.*; 6 import okhttp3.*;
7 import okhttp3.logging.HttpLoggingInterceptor; 7 import okhttp3.logging.HttpLoggingInterceptor;
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @f762e03
@@ -5,7 +5,7 @@ import java.util.HashMap; @@ -5,7 +5,7 @@ import java.util.HashMap;
5 import java.util.List; 5 import java.util.List;
6 import java.util.Map; 6 import java.util.Map;
7 7
8 -import com.alibaba.fastjson.JSON; 8 +import com.alibaba.fastjson2.JSON;
9 import com.genersoft.iot.vmp.common.StreamInfo; 9 import com.genersoft.iot.vmp.common.StreamInfo;
10 import com.genersoft.iot.vmp.conf.UserSetting; 10 import com.genersoft.iot.vmp.conf.UserSetting;
11 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException; 11 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
29 import org.springframework.web.bind.annotation.ResponseBody; 29 import org.springframework.web.bind.annotation.ResponseBody;
30 import org.springframework.web.bind.annotation.RestController; 30 import org.springframework.web.bind.annotation.RestController;
31 31
32 -import com.alibaba.fastjson.JSONObject; 32 +import com.alibaba.fastjson2.JSONObject;
33 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; 33 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
34 34
35 import javax.servlet.http.HttpServletRequest; 35 import javax.servlet.http.HttpServletRequest;
@@ -716,7 +716,7 @@ public class ZLMHttpHookListener { @@ -716,7 +716,7 @@ public class ZLMHttpHookListener {
716 } 716 }
717 } 717 }
718 718
719 - ZLMServerConfig zlmServerConfig = JSONObject.toJavaObject(jsonObject, ZLMServerConfig.class); 719 + ZLMServerConfig zlmServerConfig = jsonObject.to(ZLMServerConfig.class);
720 if (zlmServerConfig !=null ) { 720 if (zlmServerConfig !=null ) {
721 mediaServerService.zlmServerOnline(zlmServerConfig); 721 mediaServerService.zlmServerOnline(zlmServerConfig);
722 } 722 }
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
  View file @f762e03
1 package com.genersoft.iot.vmp.media.zlm; 1 package com.genersoft.iot.vmp.media.zlm;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
6 import okhttp3.*; 6 import okhttp3.*;
7 import okhttp3.logging.HttpLoggingInterceptor; 7 import okhttp3.logging.HttpLoggingInterceptor;
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
  View file @f762e03
1 package com.genersoft.iot.vmp.media.zlm; 1 package com.genersoft.iot.vmp.media.zlm;
2 2
3 -import com.alibaba.fastjson.JSONArray;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONArray;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.conf.UserSetting; 5 import com.genersoft.iot.vmp.conf.UserSetting;
6 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem; 6 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
7 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 7 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -333,7 +333,7 @@ public class ZLMRTPServerFactory { @@ -333,7 +333,7 @@ public class ZLMRTPServerFactory {
333 result= true; 333 result= true;
334 logger.info("[停止RTP推流] 成功"); 334 logger.info("[停止RTP推流] 成功");
335 } else { 335 } else {
336 - logger.error("[停止RTP推流] 失败: {}, 参数：{}->\r\n{}",jsonObject.getString("msg"),JSONObject.toJSON(param), jsonObject); 336 + logger.error("[停止RTP推流] 失败: {}, 参数：{}->\r\n{}",jsonObject.getString("msg"),jsonObject.toJSONString(param));
337 } 337 }
338 return result; 338 return result;
339 } 339 }
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
  View file @f762e03
1 package com.genersoft.iot.vmp.media.zlm; 1 package com.genersoft.iot.vmp.media.zlm;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONArray;  
5 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONArray;
  5 +import com.alibaba.fastjson2.JSONObject;
6 import com.genersoft.iot.vmp.conf.DynamicTask; 6 import com.genersoft.iot.vmp.conf.DynamicTask;
7 import com.genersoft.iot.vmp.conf.MediaConfig; 7 import com.genersoft.iot.vmp.conf.MediaConfig;
8 import com.genersoft.iot.vmp.gb28181.event.EventPublisher; 8 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
@@ -62,7 +62,7 @@ public class ZLMRunner implements CommandLineRunner { @@ -62,7 +62,7 @@ public class ZLMRunner implements CommandLineRunner {
62 // 订阅 zlm启动事件, 新的zlm也会从这里进入系统 62 // 订阅 zlm启动事件, 新的zlm也会从这里进入系统
63 hookSubscribe.addSubscribe(hookSubscribeForServerStarted, 63 hookSubscribe.addSubscribe(hookSubscribeForServerStarted,
64 (MediaServerItem mediaServerItem, JSONObject response)->{ 64 (MediaServerItem mediaServerItem, JSONObject response)->{
65 - ZLMServerConfig zlmServerConfig = JSONObject.toJavaObject(response, ZLMServerConfig.class); 65 + ZLMServerConfig zlmServerConfig = response.to(ZLMServerConfig.class);
66 if (zlmServerConfig !=null ) { 66 if (zlmServerConfig !=null ) {
67 if (startGetMedia != null) { 67 if (startGetMedia != null) {
68 startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId()); 68 startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
  View file @f762e03
1 package com.genersoft.iot.vmp.media.zlm; 1 package com.genersoft.iot.vmp.media.zlm;
2 2
3 -import com.alibaba.fastjson.annotation.JSONField; 3 +import com.alibaba.fastjson2.annotation.JSONField;
4 4
5 public class ZLMServerConfig { 5 public class ZLMServerConfig {
6 6
src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
  View file @f762e03
1 package com.genersoft.iot.vmp.media.zlm; 1 package com.genersoft.iot.vmp.media.zlm;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.media.zlm.dto.HookType; 4 import com.genersoft.iot.vmp.media.zlm.dto.HookType;
5 import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe; 5 import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe;
6 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 6 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
  View file @f762e03
1 package com.genersoft.iot.vmp.media.zlm.dto; 1 package com.genersoft.iot.vmp.media.zlm.dto;
2 2
3 3
4 -import com.alibaba.fastjson.JSONObject; 4 +import com.alibaba.fastjson2.JSONObject;
5 5
6 /** 6 /**
7 * hook 订阅工厂 7 * hook 订阅工厂
@@ -11,7 +11,7 @@ public class HookSubscribeFactory { @@ -11,7 +11,7 @@ public class HookSubscribeFactory {
11 11
12 public static HookSubscribeForStreamChange on_stream_changed(String app, String stream, boolean regist, String scheam, String mediaServerId) { 12 public static HookSubscribeForStreamChange on_stream_changed(String app, String stream, boolean regist, String scheam, String mediaServerId) {
13 HookSubscribeForStreamChange hookSubscribe = new HookSubscribeForStreamChange(); 13 HookSubscribeForStreamChange hookSubscribe = new HookSubscribeForStreamChange();
14 - JSONObject subscribeKey = new com.alibaba.fastjson.JSONObject(); 14 + JSONObject subscribeKey = new com.alibaba.fastjson2.JSONObject();
15 subscribeKey.put("app", app); 15 subscribeKey.put("app", app);
16 subscribeKey.put("stream", stream); 16 subscribeKey.put("stream", stream);
17 subscribeKey.put("regist", regist); 17 subscribeKey.put("regist", regist);
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForServerStarted.java
  View file @f762e03
1 package com.genersoft.iot.vmp.media.zlm.dto; 1 package com.genersoft.iot.vmp.media.zlm.dto;
2 2
3 -import com.alibaba.fastjson.JSONObject;  
4 -import com.alibaba.fastjson.annotation.JSONField; 3 +import com.alibaba.fastjson2.JSONObject;
  4 +import com.alibaba.fastjson2.annotation.JSONField;
5 5
6 import java.time.Instant; 6 import java.time.Instant;
7 7
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeForStreamChange.java
  View file @f762e03
1 package com.genersoft.iot.vmp.media.zlm.dto; 1 package com.genersoft.iot.vmp.media.zlm.dto;
2 2
3 -import com.alibaba.fastjson.JSONObject;  
4 -import com.alibaba.fastjson.annotation.JSONField; 3 +import com.alibaba.fastjson2.JSONObject;
  4 +import com.alibaba.fastjson2.annotation.JSONField;
5 5
6 import java.time.Instant; 6 import java.time.Instant;
7 7
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/IHookSubscribe.java
  View file @f762e03
1 package com.genersoft.iot.vmp.media.zlm.dto; 1 package com.genersoft.iot.vmp.media.zlm.dto;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 4
5 import java.time.Instant; 5 import java.time.Instant;
6 6
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service; 1 package com.genersoft.iot.vmp.service;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.gb28181.bean.Device; 4 import com.genersoft.iot.vmp.gb28181.bean.Device;
5 import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; 5 import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
6 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 6 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service; 1 package com.genersoft.iot.vmp.service;
2 2
3 -import com.alibaba.fastjson.JSONArray; 3 +import com.alibaba.fastjson2.JSONArray;
4 import com.genersoft.iot.vmp.common.StreamInfo; 4 import com.genersoft.iot.vmp.common.StreamInfo;
5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
6 6
src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service; 1 package com.genersoft.iot.vmp.service;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.common.StreamInfo; 4 import com.genersoft.iot.vmp.common.StreamInfo;
5 import com.genersoft.iot.vmp.conf.exception.ServiceException; 5 import com.genersoft.iot.vmp.conf.exception.ServiceException;
6 import com.genersoft.iot.vmp.gb28181.bean.Device; 6 import com.genersoft.iot.vmp.gb28181.bean.Device;
src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service; 1 package com.genersoft.iot.vmp.service;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.common.StreamInfo; 4 import com.genersoft.iot.vmp.common.StreamInfo;
5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
6 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; 6 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.bean; 1 package com.genersoft.iot.vmp.service.bean;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.gb28181.event.SipSubscribe; 4 import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 5 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
6 6
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
  View file @f762e03
@@ -23,9 +23,9 @@ import org.springframework.transaction.TransactionDefinition; @@ -23,9 +23,9 @@ import org.springframework.transaction.TransactionDefinition;
23 import org.springframework.transaction.TransactionStatus; 23 import org.springframework.transaction.TransactionStatus;
24 import org.springframework.util.ObjectUtils; 24 import org.springframework.util.ObjectUtils;
25 25
26 -import com.alibaba.fastjson.JSON;  
27 -import com.alibaba.fastjson.JSONArray;  
28 -import com.alibaba.fastjson.JSONObject; 26 +import com.alibaba.fastjson2.JSON;
  27 +import com.alibaba.fastjson2.JSONArray;
  28 +import com.alibaba.fastjson2.JSONObject;
29 import com.genersoft.iot.vmp.common.VideoManagerConstants; 29 import com.genersoft.iot.vmp.common.VideoManagerConstants;
30 import com.genersoft.iot.vmp.conf.SipConfig; 30 import com.genersoft.iot.vmp.conf.SipConfig;
31 import com.genersoft.iot.vmp.conf.UserSetting; 31 import com.genersoft.iot.vmp.conf.UserSetting;
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.impl; 1 package com.genersoft.iot.vmp.service.impl;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONArray;  
5 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONArray;
  5 +import com.alibaba.fastjson2.JSONObject;
6 import com.genersoft.iot.vmp.common.StreamInfo; 6 import com.genersoft.iot.vmp.common.StreamInfo;
7 import com.genersoft.iot.vmp.conf.MediaConfig; 7 import com.genersoft.iot.vmp.conf.MediaConfig;
8 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils; 8 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
  View file @f762e03
@@ -25,9 +25,9 @@ import org.springframework.stereotype.Service; @@ -25,9 +25,9 @@ import org.springframework.stereotype.Service;
25 import org.springframework.util.ObjectUtils; 25 import org.springframework.util.ObjectUtils;
26 import org.springframework.web.context.request.async.DeferredResult; 26 import org.springframework.web.context.request.async.DeferredResult;
27 27
28 -import com.alibaba.fastjson.JSON;  
29 -import com.alibaba.fastjson.JSONArray;  
30 -import com.alibaba.fastjson.JSONObject; 28 +import com.alibaba.fastjson2.JSON;
  29 +import com.alibaba.fastjson2.JSONArray;
  30 +import com.alibaba.fastjson2.JSONObject;
31 import com.genersoft.iot.vmp.common.StreamInfo; 31 import com.genersoft.iot.vmp.common.StreamInfo;
32 import com.genersoft.iot.vmp.conf.DynamicTask; 32 import com.genersoft.iot.vmp.conf.DynamicTask;
33 import com.genersoft.iot.vmp.conf.UserSetting; 33 import com.genersoft.iot.vmp.conf.UserSetting;
@@ -188,7 +188,7 @@ public class PlayServiceImpl implements IPlayService { @@ -188,7 +188,7 @@ public class PlayServiceImpl implements IPlayService {
188 188
189 resultHolder.invokeAllResult(msg); 189 resultHolder.invokeAllResult(msg);
190 if (hookEvent != null) { 190 if (hookEvent != null) {
191 - hookEvent.response(mediaServerItem, JSONObject.parseObject(JSON.toJSONString(streamInfo))); 191 + hookEvent.response(mediaServerItem, JSON.parseObject(JSON.toJSONString(streamInfo)));
192 } 192 }
193 } 193 }
194 194
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.impl; 1 package com.genersoft.iot.vmp.service.impl;
2 2
3 -import com.alibaba.fastjson.JSONArray;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONArray;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.common.StreamInfo; 5 import com.genersoft.iot.vmp.common.StreamInfo;
6 import com.genersoft.iot.vmp.conf.UserSetting; 6 import com.genersoft.iot.vmp.conf.UserSetting;
7 import com.genersoft.iot.vmp.conf.exception.ControllerException; 7 import com.genersoft.iot.vmp.conf.exception.ControllerException;
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.impl; 1 package com.genersoft.iot.vmp.service.impl;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONArray;  
5 -import com.alibaba.fastjson.JSONObject;  
6 -import com.alibaba.fastjson.TypeReference; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONArray;
  5 +import com.alibaba.fastjson2.JSONObject;
  6 +import com.alibaba.fastjson2.TypeReference;
7 import com.genersoft.iot.vmp.conf.MediaConfig; 7 import com.genersoft.iot.vmp.conf.MediaConfig;
8 import com.genersoft.iot.vmp.conf.UserSetting; 8 import com.genersoft.iot.vmp.conf.UserSetting;
9 import com.genersoft.iot.vmp.gb28181.bean.*; 9 import com.genersoft.iot.vmp.gb28181.bean.*;
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.redisMsg; 1 package com.genersoft.iot.vmp.service.redisMsg;
2 2
3 -import com.alibaba.fastjson.JSON; 3 +import com.alibaba.fastjson2.JSON;
4 import com.genersoft.iot.vmp.gb28181.bean.*; 4 import com.genersoft.iot.vmp.gb28181.bean.*;
5 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander; 5 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
6 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform; 6 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.redisMsg; 1 package com.genersoft.iot.vmp.service.redisMsg;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.conf.DynamicTask; 5 import com.genersoft.iot.vmp.conf.DynamicTask;
6 import com.genersoft.iot.vmp.conf.UserSetting; 6 import com.genersoft.iot.vmp.conf.UserSetting;
7 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem; 7 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGpsMsgListener.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.redisMsg; 1 package com.genersoft.iot.vmp.service.redisMsg;
2 2
3 -import com.alibaba.fastjson.JSON; 3 +import com.alibaba.fastjson2.JSON;
4 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo; 4 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
5 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 5 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
6 import com.genersoft.iot.vmp.storager.IVideoManagerStorage; 6 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamResponseListener.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.redisMsg; 1 package com.genersoft.iot.vmp.service.redisMsg;
2 2
3 -import com.alibaba.fastjson.JSON; 3 +import com.alibaba.fastjson2.JSON;
4 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo; 4 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
5 import com.genersoft.iot.vmp.service.bean.MessageForPushChannelResponse; 5 import com.genersoft.iot.vmp.service.bean.MessageForPushChannelResponse;
6 import org.slf4j.Logger; 6 import org.slf4j.Logger;
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.redisMsg; 1 package com.genersoft.iot.vmp.service.redisMsg;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; 5 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
6 import com.genersoft.iot.vmp.service.IGbStreamService; 6 import com.genersoft.iot.vmp.service.IGbStreamService;
7 import com.genersoft.iot.vmp.service.IMediaServerService; 7 import com.genersoft.iot.vmp.service.IMediaServerService;
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusMsgListener.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.redisMsg; 1 package com.genersoft.iot.vmp.service.redisMsg;
2 2
3 -import com.alibaba.fastjson.JSON; 3 +import com.alibaba.fastjson2.JSON;
4 import com.genersoft.iot.vmp.common.VideoManagerConstants; 4 import com.genersoft.iot.vmp.common.VideoManagerConstants;
5 import com.genersoft.iot.vmp.conf.DynamicTask; 5 import com.genersoft.iot.vmp.conf.DynamicTask;
6 import com.genersoft.iot.vmp.service.IStreamPushService; 6 import com.genersoft.iot.vmp.service.IStreamPushService;
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
  View file @f762e03
1 package com.genersoft.iot.vmp.service.redisMsg; 1 package com.genersoft.iot.vmp.service.redisMsg;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.conf.UserSetting; 5 import com.genersoft.iot.vmp.conf.UserSetting;
6 6
7 import com.genersoft.iot.vmp.media.zlm.ZLMMediaListManager; 7 import com.genersoft.iot.vmp.media.zlm.ZLMMediaListManager;
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
  View file @f762e03
1 package com.genersoft.iot.vmp.storager; 1 package com.genersoft.iot.vmp.storager;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.common.StreamInfo; 4 import com.genersoft.iot.vmp.common.StreamInfo;
5 import com.genersoft.iot.vmp.common.SystemAllInfo; 5 import com.genersoft.iot.vmp.common.SystemAllInfo;
6 import com.genersoft.iot.vmp.gb28181.bean.*; 6 import com.genersoft.iot.vmp.gb28181.bean.*;
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
  View file @f762e03
1 package com.genersoft.iot.vmp.storager.impl; 1 package com.genersoft.iot.vmp.storager.impl;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.common.StreamInfo; 5 import com.genersoft.iot.vmp.common.StreamInfo;
6 import com.genersoft.iot.vmp.common.SystemAllInfo; 6 import com.genersoft.iot.vmp.common.SystemAllInfo;
7 import com.genersoft.iot.vmp.common.VideoManagerConstants; 7 import com.genersoft.iot.vmp.common.VideoManagerConstants;
@@ -625,7 +625,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage { @@ -625,7 +625,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
625 public ThirdPartyGB queryMemberNoGBId(String queryKey) { 625 public ThirdPartyGB queryMemberNoGBId(String queryKey) {
626 String key = VideoManagerConstants.WVP_STREAM_GB_ID_PREFIX + queryKey; 626 String key = VideoManagerConstants.WVP_STREAM_GB_ID_PREFIX + queryKey;
627 JSONObject jsonObject = (JSONObject)RedisUtil.get(key); 627 JSONObject jsonObject = (JSONObject)RedisUtil.get(key);
628 - return JSONObject.toJavaObject(jsonObject, ThirdPartyGB.class); 628 + return jsonObject.to(ThirdPartyGB.class);
629 } 629 }
630 630
631 @Override 631 @Override
src/main/java/com/genersoft/iot/vmp/utils/redis/FastJsonRedisSerializer.java
  View file @f762e03
@@ -2,11 +2,13 @@ package com.genersoft.iot.vmp.utils.redis; @@ -2,11 +2,13 @@ package com.genersoft.iot.vmp.utils.redis;
2 2
3 import java.nio.charset.Charset; 3 import java.nio.charset.Charset;
4 4
  5 +import com.alibaba.fastjson2.JSONReader;
  6 +import com.alibaba.fastjson2.JSONWriter;
5 import org.springframework.data.redis.serializer.RedisSerializer; 7 import org.springframework.data.redis.serializer.RedisSerializer;
6 import org.springframework.data.redis.serializer.SerializationException; 8 import org.springframework.data.redis.serializer.SerializationException;
7 9
8 -import com.alibaba.fastjson.JSON;  
9 -import com.alibaba.fastjson.serializer.SerializerFeature; 10 +import com.alibaba.fastjson2.JSON;
  11 +import com.alibaba.fastjson2.JSONWriter.Feature;
10 12
11 /** 13 /**
12 * @description:使用fastjson实现redis的序列化 14 * @description:使用fastjson实现redis的序列化
@@ -29,7 +31,7 @@ public class FastJsonRedisSerializer&lt;T&gt; implements RedisSerializer&lt;T&gt; { @@ -29,7 +31,7 @@ public class FastJsonRedisSerializer&lt;T&gt; implements RedisSerializer&lt;T&gt; {
29 if (t == null) { 31 if (t == null) {
30 return new byte[0]; 32 return new byte[0];
31 } 33 }
32 - return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET); 34 + return JSON.toJSONString(t, JSONWriter.Feature.WriteClassName).getBytes(DEFAULT_CHARSET);
33 } 35 }
34 36
35 @Override 37 @Override
@@ -38,6 +40,6 @@ public class FastJsonRedisSerializer&lt;T&gt; implements RedisSerializer&lt;T&gt; { @@ -38,6 +40,6 @@ public class FastJsonRedisSerializer&lt;T&gt; implements RedisSerializer&lt;T&gt; {
38 return null; 40 return null;
39 } 41 }
40 String str = new String(bytes, DEFAULT_CHARSET); 42 String str = new String(bytes, DEFAULT_CHARSET);
41 - return (T) JSON.parseObject(str, clazz); 43 + return JSON.parseObject(str, clazz, JSONReader.Feature.SupportAutoType);
42 } 44 }
43 } 45 }
src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java
  View file @f762e03
@@ -3,7 +3,7 @@ package com.genersoft.iot.vmp.utils.redis; @@ -3,7 +3,7 @@ package com.genersoft.iot.vmp.utils.redis;
3 import java.util.*; 3 import java.util.*;
4 import java.util.concurrent.TimeUnit; 4 import java.util.concurrent.TimeUnit;
5 5
6 -import com.alibaba.fastjson.JSONObject; 6 +import com.alibaba.fastjson2.JSONObject;
7 import com.genersoft.iot.vmp.utils.SpringBeanFactory; 7 import com.genersoft.iot.vmp.utils.SpringBeanFactory;
8 import gov.nist.javax.sip.stack.UDPMessageChannel; 8 import gov.nist.javax.sip.stack.UDPMessageChannel;
9 import org.springframework.data.redis.core.*; 9 import org.springframework.data.redis.core.*;
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java
  View file @f762e03
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 package com.genersoft.iot.vmp.vmanager.gb28181.device; 8 package com.genersoft.iot.vmp.vmanager.gb28181.device;
9 9
10 -import com.alibaba.fastjson.JSONObject; 10 +import com.alibaba.fastjson2.JSONObject;
11 import com.genersoft.iot.vmp.conf.exception.ControllerException; 11 import com.genersoft.iot.vmp.conf.exception.ControllerException;
12 import com.genersoft.iot.vmp.gb28181.bean.Device; 12 import com.genersoft.iot.vmp.gb28181.bean.Device;
13 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; 13 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
  View file @f762e03
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 package com.genersoft.iot.vmp.vmanager.gb28181.device; 8 package com.genersoft.iot.vmp.vmanager.gb28181.device;
9 9
10 -import com.alibaba.fastjson.JSONObject; 10 +import com.alibaba.fastjson2.JSONObject;
11 import com.genersoft.iot.vmp.conf.exception.ControllerException; 11 import com.genersoft.iot.vmp.conf.exception.ControllerException;
12 import com.genersoft.iot.vmp.gb28181.bean.Device; 12 import com.genersoft.iot.vmp.gb28181.bean.Device;
13 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; 13 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
  View file @f762e03
1 package com.genersoft.iot.vmp.vmanager.gb28181.device; 1 package com.genersoft.iot.vmp.vmanager.gb28181.device;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.conf.DynamicTask; 4 import com.genersoft.iot.vmp.conf.DynamicTask;
5 import com.genersoft.iot.vmp.conf.exception.ControllerException; 5 import com.genersoft.iot.vmp.conf.exception.ControllerException;
6 import com.genersoft.iot.vmp.gb28181.bean.Device; 6 import com.genersoft.iot.vmp.gb28181.bean.Device;
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
  View file @f762e03
1 package com.genersoft.iot.vmp.vmanager.gb28181.platform; 1 package com.genersoft.iot.vmp.vmanager.gb28181.platform;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.common.VideoManagerConstants; 5 import com.genersoft.iot.vmp.common.VideoManagerConstants;
6 import com.genersoft.iot.vmp.conf.DynamicTask; 6 import com.genersoft.iot.vmp.conf.DynamicTask;
7 import com.genersoft.iot.vmp.conf.UserSetting; 7 import com.genersoft.iot.vmp.conf.UserSetting;
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
  View file @f762e03
1 package com.genersoft.iot.vmp.vmanager.gb28181.play; 1 package com.genersoft.iot.vmp.vmanager.gb28181.play;
2 2
3 -import com.alibaba.fastjson.JSONArray; 3 +import com.alibaba.fastjson2.JSONArray;
4 import com.genersoft.iot.vmp.common.StreamInfo; 4 import com.genersoft.iot.vmp.common.StreamInfo;
5 import com.genersoft.iot.vmp.conf.exception.ControllerException; 5 import com.genersoft.iot.vmp.conf.exception.ControllerException;
6 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException; 6 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.PostMapping; @@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.PostMapping;
32 import org.springframework.web.bind.annotation.RequestMapping; 32 import org.springframework.web.bind.annotation.RequestMapping;
33 import org.springframework.web.bind.annotation.RestController; 33 import org.springframework.web.bind.annotation.RestController;
34 34
35 -import com.alibaba.fastjson.JSONObject; 35 +import com.alibaba.fastjson2.JSONObject;
36 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; 36 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
37 import com.genersoft.iot.vmp.storager.IVideoManagerStorage; 37 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
38 import org.springframework.web.context.request.async.DeferredResult; 38 import org.springframework.web.context.request.async.DeferredResult;
src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java
  View file @f762e03
1 //package com.genersoft.iot.vmp.vmanager.record; 1 //package com.genersoft.iot.vmp.vmanager.record;
2 // 2 //
3 -//import com.alibaba.fastjson.JSONObject; 3 +//import com.alibaba.fastjson2.JSONObject;
4 //import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; 4 //import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
5 //import com.genersoft.iot.vmp.service.IRecordInfoServer; 5 //import com.genersoft.iot.vmp.service.IRecordInfoServer;
6 //import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo; 6 //import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo;
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
  View file @f762e03
1 package com.genersoft.iot.vmp.vmanager.server; 1 package com.genersoft.iot.vmp.vmanager.server;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSON;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.VManageBootstrap; 5 import com.genersoft.iot.vmp.VManageBootstrap;
6 import com.genersoft.iot.vmp.common.SystemAllInfo; 6 import com.genersoft.iot.vmp.common.SystemAllInfo;
7 import com.genersoft.iot.vmp.common.VersionPo; 7 import com.genersoft.iot.vmp.common.VersionPo;
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
  View file @f762e03
1 package com.genersoft.iot.vmp.vmanager.streamProxy; 1 package com.genersoft.iot.vmp.vmanager.streamProxy;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.common.StreamInfo; 4 import com.genersoft.iot.vmp.common.StreamInfo;
5 import com.genersoft.iot.vmp.conf.exception.ControllerException; 5 import com.genersoft.iot.vmp.conf.exception.ControllerException;
6 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; 6 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
  View file @f762e03
1 package com.genersoft.iot.vmp.web.gb28181; 1 package com.genersoft.iot.vmp.web.gb28181;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.conf.exception.ControllerException; 4 import com.genersoft.iot.vmp.conf.exception.ControllerException;
5 import com.genersoft.iot.vmp.gb28181.bean.Device; 5 import com.genersoft.iot.vmp.gb28181.bean.Device;
6 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; 6 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiController.java
  View file @f762e03
1 package com.genersoft.iot.vmp.web.gb28181; 1 package com.genersoft.iot.vmp.web.gb28181;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.conf.SipConfig; 4 import com.genersoft.iot.vmp.conf.SipConfig;
5 import org.slf4j.Logger; 5 import org.slf4j.Logger;
6 import org.slf4j.LoggerFactory; 6 import org.slf4j.LoggerFactory;
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
  View file @f762e03
1 package com.genersoft.iot.vmp.web.gb28181; 1 package com.genersoft.iot.vmp.web.gb28181;
2 2
3 -import com.alibaba.fastjson.JSONArray;  
4 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONArray;
  4 +import com.alibaba.fastjson2.JSONObject;
5 import com.genersoft.iot.vmp.gb28181.bean.Device; 5 import com.genersoft.iot.vmp.gb28181.bean.Device;
6 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; 6 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
7 import com.genersoft.iot.vmp.service.IDeviceService; 7 import com.genersoft.iot.vmp.service.IDeviceService;
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
  View file @f762e03
1 package com.genersoft.iot.vmp.web.gb28181; 1 package com.genersoft.iot.vmp.web.gb28181;
2 2
3 -import com.alibaba.fastjson.JSONObject; 3 +import com.alibaba.fastjson2.JSONObject;
4 import com.genersoft.iot.vmp.common.StreamInfo; 4 import com.genersoft.iot.vmp.common.StreamInfo;
5 import com.genersoft.iot.vmp.conf.UserSetting; 5 import com.genersoft.iot.vmp.conf.UserSetting;
6 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException; 6 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;