Pre Merge pull request !38 from 好青年_GEILIVABLE/N/A

src/main/java/com/genersoft/iot/vmp/gb28181/bean/RemoteAddressInfo.java

@@ -1,4 +1,4 @@
-package com.genersoft.iot.vmp.common;
+package com.genersoft.iot.vmp.gb28181.bean;
 
 public class RemoteAddressInfo {
     private String ip;

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java

@@ -5,7 +5,7 @@ import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.bean.GbSipDate;
-import com.genersoft.iot.vmp.common.RemoteAddressInfo;
+import com.genersoft.iot.vmp.gb28181.bean.RemoteAddressInfo;
 import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
 import com.genersoft.iot.vmp.gb28181.service.IDeviceService;
 import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java

@@ -5,7 +5,7 @@ import com.genersoft.iot.vmp.conf.DynamicTask;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.bean.Platform;
-import com.genersoft.iot.vmp.common.RemoteAddressInfo;
+import com.genersoft.iot.vmp.gb28181.bean.RemoteAddressInfo;
 import com.genersoft.iot.vmp.gb28181.bean.SipMsgInfo;
 import com.genersoft.iot.vmp.gb28181.service.IDeviceService;
 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;

src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java

@@ -1,7 +1,7 @@
 package com.genersoft.iot.vmp.gb28181.utils;
 
 import com.genersoft.iot.vmp.gb28181.bean.Gb28181Sdp;
-import com.genersoft.iot.vmp.common.RemoteAddressInfo;
+import com.genersoft.iot.vmp.gb28181.bean.RemoteAddressInfo;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.utils.GitUtil;
 import gov.nist.javax.sip.address.AddressImpl;

数据库/2.7.3/更新-mysql-2.7.1升级到2.7.3.sql

@@ -1,4 +1,3 @@
-
 drop table if exists wvp_resources_tree;
 drop table if exists wvp_platform_catalog;
 drop table if exists wvp_platform_gb_stream;
@@ -389,7 +388,7 @@ create table IF NOT EXISTS wvp_record_plan_item
 );
 
 
-DELIMITER //  -- 重定义分隔符避免分号冲突
+
 CREATE PROCEDURE `wvp_20250111`()
 BEGIN
 
@@ -419,8 +418,7 @@ BEGIN
         alter table wvp_cloud_record add server_id character varying(50);
         update wvp_cloud_record set server_id = serverId;
     END IF;
-END;//
+END;
 call wvp_20250111();
 DROP PROCEDURE wvp_20250111;
-DELIMITER ;
 

数据库/2.7.3/更新-mysql-2.7.3.sql

@@ -1,7 +1,6 @@
 /*
 * 20240528
 */
-DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20240528`()
 BEGIN
     IF NOT EXISTS (SELECT column_name FROM information_schema.columns
@@ -40,10 +39,9 @@ BEGIN
     THEN
         alter table wvp_media_server add ws_flv_ssl_port integer;
     END IF;
-END; //
+END;
 call wvp_20240528();
 DROP PROCEDURE wvp_20240528;
-DELIMITER ;
 
 create table IF NOT EXISTS wvp_user_api_key (
                                   id serial primary key ,
@@ -60,7 +58,6 @@ create table IF NOT EXISTS wvp_user_api_key (
 /*
 * 20241222
 */
-DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20241222`()
 BEGIN
     IF EXISTS (SELECT column_name FROM information_schema.STATISTICS
@@ -119,14 +116,13 @@ BEGIN
         set wdc.data_type = 3, wdc.data_device_id = ct.stream_proxy_id where wdc.stream_proxy_id is not null;
         alter table wvp_device_channel drop stream_proxy_id;
     END IF;
-END; //
+END;
 call wvp_20241222();
 DROP PROCEDURE wvp_20241222;
-DELIMITER ;
+
 /*
 * 20241231
 */
-DELIMITER //
 CREATE PROCEDURE `wvp_20241231`()
 BEGIN
     IF not EXISTS (SELECT column_name FROM information_schema.columns
@@ -134,14 +130,14 @@ BEGIN
     THEN
         alter table wvp_stream_proxy add relates_media_server_id character varying(50);
     END IF;
-END; //
+END;
 call wvp_20241231();
 DROP PROCEDURE wvp_20241231;
-DELIMITER ;
+
+
 /*
 * 20250111
 */
-DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250111`()
 BEGIN
     IF EXISTS (SELECT column_name FROM information_schema.STATISTICS
@@ -161,15 +157,14 @@ BEGIN
     THEN
         alter table wvp_cloud_record modify file_path varchar(500) null;
     END IF;
-END; //
+END;
 call wvp_20250111();
 DROP PROCEDURE wvp_20250111;
-DELIMITER ;
+
 
 /*
 * 20250211
 */
-DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250211`()
 BEGIN
     IF EXISTS (SELECT column_name FROM information_schema.STATISTICS
@@ -189,15 +184,14 @@ BEGIN
     THEN
         alter table wvp_device add position_capability integer;
     END IF;
-END; //
+END;
 call wvp_20250211();
 DROP PROCEDURE wvp_20250211;
-DELIMITER ;
+
 
 /**
   * 20250312
  */
-DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250312`()
 BEGIN
     DECLARE serverId VARCHAR(32) DEFAULT '你的服务ID';
@@ -234,38 +228,37 @@ BEGIN
     THEN
         alter table wvp_platform add server_id character varying(50);
     END IF;
-END; //
+END;
 call wvp_20250312();
 DROP PROCEDURE wvp_20250312;
-DELIMITER ;
+
 
 /*
 * 20250319
 */
-DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250319`()
 BEGIN
-    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
+    IF NOT EXISTS (SELECT column_name FROM information_schema.STATISTICS
                WHERE TABLE_SCHEMA = (SELECT DATABASE()) and  table_name = 'wvp_device_channel' and column_name = 'gps_speed')
     THEN
         alter table wvp_device_channel add gps_speed double precision;
     END IF;
 
-    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
+    IF NOT EXISTS (SELECT column_name FROM information_schema.STATISTICS
                    WHERE TABLE_SCHEMA = (SELECT DATABASE()) and  table_name = 'wvp_device_channel' and column_name = 'gps_altitude')
     THEN
         alter table wvp_device_channel add gps_altitude double precision;
     END IF;
 
-    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
+    IF NOT EXISTS (SELECT column_name FROM information_schema.STATISTICS
                    WHERE TABLE_SCHEMA = (SELECT DATABASE()) and  table_name = 'wvp_device_channel' and column_name = 'gps_direction')
     THEN
         alter table wvp_device_channel add gps_direction double precision;
     END IF;
-END; //
+END;
 call wvp_20250319();
 DROP PROCEDURE wvp_20250319;
-DELIMITER ;
+