From 8b6449ce3ac8eb4a0f59f3a6e3974d9190dcd133 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Mon, 29 Aug 2022 09:55:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- sql/update.sql | 84 ------------------- .../transmit/SIPProcessorObserver.java | 2 +- 3 files changed, 2 insertions(+), 86 deletions(-) diff --git a/pom.xml b/pom.xml index 2b9a838c..71dd9485 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.genersoft wvp-pro - 2.3.1 + 2.3.2 web video platform 国标28181视频平台 diff --git a/sql/update.sql b/sql/update.sql index d61ad353..e69de29b 100644 --- a/sql/update.sql +++ b/sql/update.sql @@ -1,84 +0,0 @@ -alter table stream_push - add serverId varchar(50) not null; - -alter table device - add geoCoordSys varchar(50) not null; -alter table device - add treeType varchar(50) not null; -update device set device.geoCoordSys='WGS84'; -update device set device.treeType='CivilCode'; - -alter table device_channel - add longitudeGcj02 double default null; -alter table device_channel - add latitudeGcj02 double default null; -alter table device_channel - add longitudeWgs84 double default null; -alter table device_channel - add latitudeWgs84 double default null; -alter table device_channel - add businessGroupId varchar(50) default null; -alter table device_channel - add gpsTime varchar(50) default null; - - -alter table device_mobile_position - change cnLng longitudeGcj02 double default null; -alter table device_mobile_position - change cnLat latitudeGcj02 double default null; -alter table device_mobile_position - add longitudeWgs84 double default null; -alter table device_mobile_position - add latitudeWgs84 double default null; -alter table device_mobile_position - drop geodeticSystem; -alter table device_mobile_position - add createTime varchar(50) default null; - -alter table device_alarm - add createTime varchar(50) default null; - -alter table gb_stream - change createStamp createTime varchar(50) default null; - -alter table parent_platform - add createTime varchar(50) default null; -alter table parent_platform - add updateTime varchar(50) default null; - -alter table stream_proxy - add updateTime varchar(50) default null; - -alter table stream_push - add pushTime varchar(50) default null; -alter table stream_push - add status int DEFAULT NULL; -alter table stream_push - add updateTime varchar(50) default null; -alter table stream_push - add pushIng int DEFAULT NULL; -alter table stream_push - change createStamp createTime varchar(50) default null; - -alter table gb_stream - drop column status; - -alter table user - add pushKey varchar(50) default null; -update user set pushKey='453df297a57a5a7438934sda801fc3' where id=1; - -alter table parent_platform - add treeType varchar(50) not null; -update parent_platform set parent_platform.treeType='BusinessGroup'; -alter table parent_platform drop shareAllLiveStream; - -alter table platform_catalog - add civilCode varchar(50) default null; -alter table platform_catalog - add businessGroupId varchar(50) default null; - -/********************* ADD ***************************/ -alter table stream_push - add self int DEFAULT NULL; - - diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java index d20dc74d..13f04b6d 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java @@ -112,7 +112,7 @@ public class SIPProcessorObserver implements ISIPProcessorObserver { } else if ((status >= 100) && (status < 200)) { // 增加其它无需回复的响应,如101、180等 } else { - logger.warn("接收到失败的response响应!status:" + status + ",message:" + response.getReasonPhrase()/* .getContent().toString()*/); + logger.warn("接收到失败的response响应!status:" + status + ",message:" + response.getReasonPhrase()); if (responseEvent.getResponse() != null && sipSubscribe.getErrorSubscribesSize() > 0 ) { CallIdHeader callIdHeader = (CallIdHeader)responseEvent.getResponse().getHeader(CallIdHeader.NAME); if (callIdHeader != null) {