diff --git a/sql/2.6.8升级2.6.9.sql b/sql/2.6.8升级2.6.9.sql index a398cb8d..7b16c357 100644 --- a/sql/2.6.8升级2.6.9.sql +++ b/sql/2.6.8升级2.6.9.sql @@ -455,6 +455,23 @@ rename table stream_push to wvp_stream_push; rename table user to wvp_user; rename table user_role to wvp_user_role; +alter table wvp_device add column broadcast_push_after_ack bool default false; +alter table wvp_device_channel add column custom_name varchar(255) null ; +alter table wvp_device_channel add column custom_longitude double null ; +alter table wvp_device_channel add column custom_latitude double null ; +alter table wvp_device_channel add column custom_ptz_type int null ; + +create table wvp_resources_tree ( + id serial primary key , + is_catalog bool default true, + device_channel_id integer , + gb_stream_id integer, + name character varying(255), + parentId integer, + path character varying(255) +); + + diff --git a/sql/初始化.sql b/sql/初始化.sql index 421760fe..f2952ba1 100644 --- a/sql/初始化.sql +++ b/sql/初始化.sql @@ -32,6 +32,7 @@ create table wvp_device ( as_message_channel bool default false, keepalive_interval_time integer, switch_primary_sub_stream bool default false, + broadcast_push_after_ack bool default false, constraint uk_device_device unique (device_id) ); @@ -53,6 +54,7 @@ create table wvp_device_channel ( id serial primary key , channel_id character varying(50) not null, name character varying(255), + custom_name character varying(255), manufacture character varying(50), model character varying(50), owner character varying(50), @@ -71,9 +73,12 @@ create table wvp_device_channel ( port integer, password character varying(255), ptz_type integer, + custom_ptz_type integer, status bool default false, longitude double precision, + custom_longitude double precision, latitude double precision, + custom_latitude double precision, stream_id character varying(50), device_id character varying(50) not null, parental character varying(50), @@ -278,6 +283,16 @@ create table wvp_user_role ( create_time character varying(50), update_time character varying(50) ); +create table wvp_resources_tree ( + id serial primary key , + is_catalog bool default true, + device_channel_id integer , + gb_stream_id integer, + name character varying(255), + parentId integer, + path character varying(255) +); + /*初始数据*/ INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3'); diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java index 1c233f6c..baf0f5a4 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java @@ -195,10 +195,10 @@ public class ZLMRESTfulUtils { } else { logger.error(String.format("[ %s ]请求失败: %s %s", url, response.code(), response.message())); } - Objects.requireNonNull(response.body()).close(); } else { logger.error(String.format("[ %s ]请求失败: %s %s", url, response.code(), response.message())); } + Objects.requireNonNull(response.body()).close(); } catch (ConnectException e) { logger.error(String.format("连接ZLM失败: %s, %s", e.getCause().getMessage(), e.getMessage())); logger.info("请检查media配置并确认ZLM已启动..."); diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index 0d4ae778..bdedfc78 100644 --- a/src/main/resources/all-application.yml +++ b/src/main/resources/all-application.yml @@ -5,6 +5,10 @@ spring: + # 设置接口超时时间 + mvc: + async: + request-timeout: 20000 # [可选]上传文件大小限制 servlet: multipart: diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index f5404e26..504c9c66 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,4 +1,8 @@ spring: + # 设置接口超时时间 + mvc: + async: + request-timeout: 20000 thymeleaf: cache: false # [可选]上传文件大小限制 diff --git a/web_src/src/App.vue b/web_src/src/App.vue index e7d45b75..103cbe1a 100644 --- a/web_src/src/App.vue +++ b/web_src/src/App.vue @@ -11,6 +11,7 @@ export default { data(){ return { isLogin: false, + excludeLoginCheck: ["/play/wasm", "/play/rtc"], userInfo: { //保存用户信息 nick: null, ulevel: null, @@ -21,27 +22,29 @@ export default { }, created() { if (userService.getToken() == null){ + console.log(22222) + console.log(this.$route.path) + try { + if (this.excludeLoginCheck && this.excludeLoginCheck.length > 0) { + for (let i = 0; i < this.excludeLoginCheck.length; i++) { + if (this.$route.path.startsWith(this.excludeLoginCheck[i])){ + return; + } + } + } + }catch (e) { + console.error(e) + } //如果没有登录状态则跳转到登录页 this.$router.push('/login'); } }, - //监听路由检查登录 - watch:{ - "$route" : 'checkLogin' - }, + mounted(){ //组件开始挂载时获取用户信息 // this.getUserInfo(); }, methods: { - checkLogin(){ - //检查是否存在session - if (userService.getToken() == null){ - //如果没有登录状态则跳转到登录页 - // this.$router.push('/login'); - } - - }, }, components: {} }; diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue index f56134e1..7ed893a7 100644 --- a/web_src/src/components/dialog/StreamProxyEdit.vue +++ b/web_src/src/components/dialog/StreamProxyEdit.vue @@ -84,9 +84,9 @@ - 不做处理 - 停用 - 移除 + 不做处理 + 停用 + 移除