From cec266d3cd27e79e61b7e614d0c85e0b43492115 Mon Sep 17 00:00:00 2001 From: dsk <2514169858@qq.com> Date: Sun, 25 Jun 2023 16:00:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=8A=A5=E9=94=99404=E7=AD=89=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=E5=AF=BC=E8=87=B4ResponseBody=E6=9C=AA=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a350469d..222fbd46 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 @@ -192,10 +192,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已启动..."); From 7749ea3421f6cc48a59db04bc9babfb8a404d740 Mon Sep 17 00:00:00 2001 From: dsk <2514169858@qq.com> Date: Sun, 25 Jun 2023 16:16:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E6=92=AD=E8=B6=85=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E6=8A=A5=E9=94=99org.springframewor?= =?UTF-8?q?k.web.context.request.async.AsyncRequestTimeoutException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/all-application.yml | 4 ++++ src/main/resources/application-dev.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index 0b079f10..ef247f7f 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 # [可选]上传文件大小限制 From 228c57399a4ca2ac7c95f3a2f277cf224172b3cd Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Sat, 1 Jul 2023 22:14:53 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=BC=80?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=A1=B5=E9=9C=80=E8=A6=81=E7=99=BB=E9=99=86?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/config/index.js | 4 ++-- web_src/src/App.vue | 27 +++++++++++++++------------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/web_src/config/index.js b/web_src/config/index.js index a7b68469..b1e1cbe1 100644 --- a/web_src/config/index.js +++ b/web_src/config/index.js @@ -12,14 +12,14 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/debug': { - target: 'http://localhost:18978', + target: 'http://localhost:18080', changeOrigin: true, pathRewrite: { '^/debug': '/' } }, '/static/snap': { - target: 'http://localhost:18978', + target: 'http://localhost:18080', changeOrigin: true, // pathRewrite: { // '^/static/snap': '/static/snap' 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: {} }; From 8237cd25af7b7d1ac437cf2e04be36add6b8c12c Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Sat, 1 Jul 2023 22:50:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8B=89=E6=B5=81=E4=BB=A3=E7=90=86=E6=8F=90=E4=BA=A4=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/dialog/StreamProxyEdit.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 @@ - 不做处理 - 停用 - 移除 + 不做处理 + 停用 + 移除 From 64cd48a92b722153066befdc6bda2993fab5f001 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Sun, 2 Jul 2023 00:03:21 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/2.6.8升级2.6.9.sql | 17 +++++++++++++++++ sql/初始化.sql | 15 +++++++++++++++ 2 files changed, 32 insertions(+) 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..273da91b 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), @@ -279,6 +284,16 @@ create table wvp_user_role ( 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'); INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57'); From 27b125cf98c0b503347bfb18b98b9afadf636d87 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Sun, 2 Jul 2023 12:40:41 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/初始化.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/初始化.sql b/sql/初始化.sql index 273da91b..f2952ba1 100644 --- a/sql/初始化.sql +++ b/sql/初始化.sql @@ -283,7 +283,6 @@ 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, @@ -294,6 +293,7 @@ create table wvp_resources_tree ( 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'); INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');