From 3571ca272b5c4d0b9df0d3e2c99f0384ba203797 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期日, 02 七月 2023 12:42:05 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev --- sql/2.6.8升级2.6.9.sql | 17 ++++++++ web_src/src/App.vue | 27 +++++++------ src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 2 sql/初始化.sql | 15 +++++++ src/main/resources/application-dev.yml | 4 ++ src/main/resources/all-application.yml | 4 ++ web_src/src/components/dialog/StreamProxyEdit.vue | 6 +- 7 files changed, 59 insertions(+), 16 deletions(-) diff --git "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql" "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql" index a398cb8..7b16c35 100644 --- "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql" +++ "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql" @@ -455,6 +455,23 @@ 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/\345\210\235\345\247\213\345\214\226.sql" "b/sql/\345\210\235\345\247\213\345\214\226.sql" index 421760f..f2952ba 100644 --- "a/sql/\345\210\235\345\247\213\345\214\226.sql" +++ "b/sql/\345\210\235\345\247\213\345\214\226.sql" @@ -32,6 +32,7 @@ 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 @@ 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 @@ 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_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 1c233f6..baf0f5a 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 @@ } 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("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�..."); diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index 0d4ae77..bdedfc7 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 f5404e2..504c9c6 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 e7d45b7..103cbe1 100644 --- a/web_src/src/App.vue +++ b/web_src/src/App.vue @@ -11,6 +11,7 @@ data(){ return { isLogin: false, + excludeLoginCheck: ["/play/wasm", "/play/rtc"], userInfo: { //淇濆瓨鐢ㄦ埛淇℃伅 nick: null, ulevel: null, @@ -21,27 +22,29 @@ }, 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(){ - //妫�鏌ユ槸鍚﹀瓨鍦╯ession - 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 f56134e..7ed893a 100644 --- a/web_src/src/components/dialog/StreamProxyEdit.vue +++ b/web_src/src/components/dialog/StreamProxyEdit.vue @@ -84,9 +84,9 @@ </el-form-item> <el-form-item label="鏃犱汉瑙傜湅" prop="rtpType" > - <el-radio v-model="proxyParam.noneReader" label="1">涓嶅仛澶勭悊</el-radio> - <el-radio v-model="proxyParam.enableDisableNoneReader" label="2">鍋滅敤</el-radio> - <el-radio v-model="proxyParam.enableRemoveNoneReader" label="3">绉婚櫎</el-radio> + <el-radio v-model="proxyParam.noneReader" label="0">涓嶅仛澶勭悊</el-radio> + <el-radio v-model="proxyParam.noneReader" label="1">鍋滅敤</el-radio> + <el-radio v-model="proxyParam.noneReader" label="2">绉婚櫎</el-radio> <!-- <el-select--> <!-- @change="noneReaderHandler"--> <!-- v-model="proxyParam.noneReader"--> -- Gitblit v1.8.0