Merge branch 'master' into dev/数据库统合

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java

数据库/2.7.3/初始化-mysql-2.7.3.sql

@@ -341,12 +341,11 @@ create table wvp_cloud_record
     media_server_id character varying(50),
     server_id       character varying(50),
     file_name       character varying(255),
-    folder          character varying(255),
-    file_path       character varying(255),
+    folder          character varying(500),
+    file_path       character varying(500),
     collect         bool default false,
     file_size       bigint,
-    time_len        bigint,
-    constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
+    time_len        bigint
 );
 
 create table wvp_user

数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql

@@ -358,8 +358,8 @@ create table wvp_cloud_record
     media_server_id character varying(50),
     server_id       character varying(50),
     file_name       character varying(255),
-    folder          character varying(255),
-    file_path       character varying(255),
+    folder          character varying(500),
+    file_path       character varying(500),
     collect         bool default false,
     file_size       int8,
     time_len        int8,

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

@@ -33,4 +33,11 @@ alter table wvp_device_channel drop stream_proxy_id;
 /*
 * 20241231
 */
-alter table wvp_stream_proxy add relates_media_server_id character varying(50);
+alter table wvp_stream_proxy add relates_media_server_id character varying(50);
+
+/*
+* 20250111
+*/
+drop index uk_stream_push_app_stream_path on wvp_cloud_record;
+alter table wvp_cloud_record change folder folder varchar(500) null;
+alter table wvp_cloud_record change file_path file_path varchar(500) null;

数据库/2.7.3/更新-postgresql-kingbase-2.7.3.sql

@@ -27,3 +27,16 @@ set data_type = 3, data_device_id = (SELECT stream_proxy_id from wvp_device_chan
 alter table wvp_device_channel drop device_db_id;
 alter table wvp_device_channel drop stream_push_id;
 alter table wvp_device_channel drop stream_proxy_id;
+
+/*
+* 20241231
+*/
+alter table wvp_stream_proxy add relates_media_server_id character varying(50);
+
+
+/*
+* 20250111
+*/
+drop index uk_stream_push_app_stream_path on wvp_cloud_record;
+alter table wvp_cloud_record change folder folder varchar(500) null;
+alter table wvp_cloud_record change file_path file_path varchar(500) null;