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

Signed-off-by: 好青年_GEILIVABLE <420050757@qq.com>

docker/docker-compose.yml

@@ -9,6 +9,16 @@ services:
     environment:
       TZ: "Asia/Shanghai"
     command: redis-server /etc/redis/redis_default.conf --appendonly yes
+  mysql:
+    image: mysql:5.7
+    volumes:
+      - ./mysql:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: mysql@tafei
+      MYSQL_DATABASE: wvp2
+      LANG: C.UTF-8
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    
   wvp:
     build:
       context: ./wvp
@@ -33,7 +43,7 @@ services:
     environment:
       TZ: "Asia/Shanghai"
       # [必须修改] 本机的IP
-      WVP_HOST: 172.18.0.61
+      WVP_HOST: 111.67.197.136
       WVP_PWD: aseqw_+hiy123
       WVP_DOMAIN: 6101130049
       WVP_ID: 61011300490000000001
@@ -45,5 +55,8 @@ services:
       WVP_JVM_CONFIG: -Xms128m -Xmx256m
       ASSIST_CONFIG:
       WVP_CONFIG:
+      DB_HOST: mysql
+      DB_PASSWORD: mysql@tafei
     depends_on:
       - redis
+      - mysql

src/main/java/com/genersoft/iot/vmp/common/RemoteAddressInfo.java

@@ -1,4 +1,4 @@
-package com.genersoft.iot.vmp.gb28181.bean;
+package com.genersoft.iot.vmp.common;
 
 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.gb28181.bean.RemoteAddressInfo;
+import com.genersoft.iot.vmp.common.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.gb28181.bean.RemoteAddressInfo;
+import com.genersoft.iot.vmp.common.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.gb28181.bean.RemoteAddressInfo;
+import com.genersoft.iot.vmp.common.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,3 +1,4 @@
+
 drop table if exists wvp_resources_tree;
 drop table if exists wvp_platform_catalog;
 drop table if exists wvp_platform_gb_stream;
@@ -388,7 +389,7 @@ create table IF NOT EXISTS wvp_record_plan_item
 );
 
 
-
+DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250111`()
 BEGIN
 
@@ -418,7 +419,8 @@ 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,6 +1,7 @@
 /*
 * 20240528
 */
+DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20240528`()
 BEGIN
     IF NOT EXISTS (SELECT column_name FROM information_schema.columns
@@ -39,9 +40,10 @@ 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 ,
@@ -58,6 +60,7 @@ 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
@@ -116,13 +119,14 @@ 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
@@ -130,14 +134,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
@@ -157,14 +161,15 @@ 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
@@ -184,14 +189,15 @@ 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';
@@ -228,37 +234,38 @@ 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.STATISTICS
+    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
                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.STATISTICS
+    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
                    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.STATISTICS
+    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
                    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 ;