diff --git a/web/src/views/streamProxy/index.vue b/web/src/views/streamProxy/index.vue index 4467657d6..6825e4146 100755 --- a/web/src/views/streamProxy/index.vue +++ b/web/src/views/streamProxy/index.vue @@ -219,8 +219,6 @@ export default { edit: function(row) { if (row.enableDisableNoneReader) { this.$set(row, 'noneReader', 1) - } else if (row.enableRemoveNoneReader) { - this.$set(row, 'noneReader', 2) } else { this.$set(row, 'noneReader', 0) } diff --git a/数据库/2.7.4/初始化-mysql-2.7.4.sql b/数据库/2.7.4/初始化-mysql-2.7.4.sql index c9e42d2ad..ffc13b327 100644 --- a/数据库/2.7.4/初始化-mysql-2.7.4.sql +++ b/数据库/2.7.4/初始化-mysql-2.7.4.sql @@ -325,7 +325,6 @@ create table IF NOT EXISTS wvp_stream_proxy enable_mp4 bool default false, pulling bool default false, enable bool default false, - enable_remove_none_reader bool default false, create_time character varying(50), name character varying(255), update_time character varying(50), diff --git a/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql b/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql index 2ad8d746e..a437b58e6 100644 --- a/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql +++ b/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql @@ -326,7 +326,6 @@ create table IF NOT EXISTS wvp_stream_proxy enable_mp4 bool default false, pulling bool default false, enable bool default false, - enable_remove_none_reader bool default false, create_time character varying(50), name character varying(255), update_time character varying(50), diff --git a/数据库/2.7.4/更新-mysql-2.7.4.sql b/数据库/2.7.4/更新-mysql-2.7.4.sql index 8d5b51240..7cca80e50 100644 --- a/数据库/2.7.4/更新-mysql-2.7.4.sql +++ b/数据库/2.7.4/更新-mysql-2.7.4.sql @@ -102,6 +102,25 @@ DROP PROCEDURE wvp_20250924; DELIMITER ; +/* +* 20251027 +*/ +DELIMITER // -- 重定义分隔符避免分号冲突 +CREATE PROCEDURE `wvp_20251027`() +BEGIN + IF EXISTS (SELECT column_name FROM information_schema.columns + WHERE TABLE_SCHEMA = (SELECT DATABASE()) and table_name = 'wvp_stream_proxy' and column_name = 'enable_remove_none_reader') + THEN + ALTER TABLE wvp_stream_proxy DROP enable_remove_none_reader; + END IF; +END; // +call wvp_20251027(); +DROP PROCEDURE wvp_20251027; +DELIMITER ; + + + + diff --git a/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql b/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql index 6febd35e4..2dedb909c 100644 --- a/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql +++ b/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql @@ -41,3 +41,4 @@ ALTER table wvp_media_server ADD COLUMN IF NOT EXISTS mp4_ssl_port integer; ALTER table wvp_device_channel ADD COLUMN IF NOT EXISTS enable_broadcast integer default 0; ALTER table wvp_device_channel ADD COLUMN IF NOT EXISTS map_level integer default 0; ALTER table wvp_common_group ADD COLUMN IF NOT EXISTS alias varchar(255) default null; +ALTER table wvp_stream_proxy DROP COLUMN IF NOT EXISTS enable_remove_none_reader;