Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 048a6ce072 优化报警时间 648540858 2023-03-08 11:42:28 +08:00
• a7c3cf5316 优化跨域配置，支持同域的前后端分离部署 648540858 2023-03-05 09:53:26 +08:00
• 8acd64eac6 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mrjackwang 2023-03-04 21:37:39 +08:00
• 2177e9dbf9 修复查询历史录像无记录时报错问题 wangyimeng 2023-03-04 20:55:48 +08:00
• c662a53098 请求历史媒体下载增加回复事件处理ssrc与下级不一致情况 wangyimeng 2023-03-04 20:47:48 +08:00
• a5d9afeb60 Merge pull request #753 from lovemen/wvp-28181-2.0 648540858 2023-03-04 14:47:47 +08:00
• a0cdc7c59d 修复查询历史录像无记录时报错问题 wangyimeng 2023-03-03 21:01:43 +08:00
• 9c34978963 修复查询设备通道目录时查询报错的问题 wangyimeng 2023-03-03 20:59:56 +08:00
• 6afcd5176b 请求历史媒体下载增加回复事件处理ssrc与下级不一致情况 wangyimeng 2023-03-03 20:59:10 +08:00
• 845ce53313 解决上级平台点播proxy代理流时未携带SSRC信息,gbStream采用默认0000000000作为SSRC无法播放问题。以及上级平台点播proxy代理流时回复的SDP本地端口号为0不兼容问题。 lovemen 2023-02-23 15:35:42 +08:00
• 420dbce900 Merge branch 'main' into 级联 648540858 2023-02-22 18:14:53 +08:00
• 019d95cfba Merge branch 'wvp-28181-2.0' 648540858 2023-02-22 18:08:25 +08:00
• 100252a253 完善语音对讲 648540858 2023-02-22 18:06:52 +08:00
• 2d2832dbe9 优化各个配置启动顺序 648540858 2023-02-22 18:01:30 +08:00
• db8971302a 完善支持语音级联 648540858 2023-02-22 15:53:33 +08:00
• 4446218f9e 修复通道导入bug 648540858 2023-02-20 15:21:41 +08:00
• 21d5bed1a9 Merge pull request #744 from gaofuwang/wvp-28181-2.0 648540858 2023-02-20 09:57:21 +08:00
• d0532e7749 Merge pull request #751 from yjkhtddx/wvp-28181-2.0 648540858 2023-02-20 09:51:51 +08:00
• 307a68de73 Merge pull request #752 from stayorigin/wvp-28181-2.0 648540858 2023-02-20 09:50:14 +08:00
• 663130df45 完善支持语音对讲talk 648540858 2023-02-19 12:46:53 +08:00
• 9dcae6e4bf 替换前端编译npm源地址为https://registry.npmmirror.com hujian 2023-02-16 23:08:34 +08:00
• f7b67e28cc 替换前端编译npm源地址 hujian 2023-02-16 23:04:33 +08:00
• 7c019dbeef RTP推流地址应使用SDP中Connection中的IP地址，原来使用Origin中的IP地址，在流媒体服务和信令服务不在同一台设备上时，媒体流数据将发给信令服务器，导致无法播放BUG。 刘跃龙 2023-02-16 18:18:10 +08:00
• b13ecc578c 修复级联推送通道时缺少的信息 648540858 2023-02-16 16:25:47 +08:00
• 842f40df34 修复更新通道是更新各个坐标系的位置信息 648540858 2023-02-16 14:01:09 +08:00
• 7be636f8b8 修复更新通道是更新各个坐标系德位置信息 648540858 2023-02-15 18:30:35 +08:00
• 2c7ed82b3e 修复缺少的属性 648540858 2023-02-15 15:38:49 +08:00
• bdc0f83e29 启动时清理无效的设备缓存数据，避免设备无法注册 648540858 2023-02-14 15:12:53 +08:00
• 81da03d981 Merge pull request #743 from zhulangren/patch-1 648540858 2023-02-14 14:47:07 +08:00
• a209d17390 Merge branch 'wvp-28181-2.0' 648540858 2023-02-14 11:29:44 +08:00
• d5f26faf15 优化语音对讲级联，目前等待zlm支持openRTPServer仅收音频 648540858 2023-02-14 11:29:22 +08:00
• 5cae58c691 Merge branch 'wvp-28181-2.0' into main2 648540858 2023-02-14 10:04:48 +08:00
• 3380ce30a2 合并主线 648540858 2023-02-13 20:52:36 +08:00
• d79eec25b0 优化日志打印，去除数据库打印，优化控制台打印效果 648540858 2023-02-13 18:19:34 +08:00
• 39199a1daa 优化WVP作为下级平台查询设备录像列表上报缓慢问题 gaofw189 2023-02-13 10:37:00 +08:00
• 342361cef8 Update CloudRecordDetail.vue 逐浪人 2023-02-11 22:08:51 +08:00
• 93c632f208 合并主线 648540858 2023-02-10 16:47:04 +08:00
• 197f80581b Merge branch 'main' into main2 648540858 2023-02-10 16:25:33 +08:00
• f2c6210539 Merge branch 'wvp-28181-2.0' 648540858 2023-02-10 16:24:27 +08:00
• ec95a42985 Merge branch 'main' into main2 648540858 2023-02-10 15:54:42 +08:00
• bb49f1f0d6 添加文档 648540858 2023-02-10 15:33:00 +08:00
• b010e63dc0 更新文档 648540858 2023-02-09 14:36:04 +08:00
• e0c8216f58 恢复默认判断 648540858 2023-02-09 14:22:12 +08:00
• 48fad3582d Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-02-09 14:13:57 +08:00
• 03ee15ece2 Merge pull request #741 from gaofuwang/wvp-28181-2.0 648540858 2023-02-09 14:13:44 +08:00
• 5462b1f6c6 去除lombok依赖-后续考虑引入 gaofw189 2023-02-09 09:20:46 +08:00
• 6484f52e46 同时支持打包为Jar和War 648540858 2023-02-07 20:59:33 +08:00
• 31dcdab4d8 修复点播信令 648540858 2023-02-07 16:45:17 +08:00
• 922a9e8b32 修复语音对讲返回的地址 648540858 2023-02-07 14:52:33 +08:00
• c226deacff 修复语音对讲发送页 648540858 2023-02-07 10:04:15 +08:00
• c2e26291ce 修复WVP作为下级平台接受recordinfo指令上报上级平台的问题 gaofw189 2023-02-07 09:28:55 +08:00
• 55ee6f5f0d 修复WVP作为下级平台接受devicecontrol命令处理-调试修改逻辑 gaofw189 2023-02-07 09:26:08 +08:00
• e46bf8a8bd 支持同时打war包和jar包 648540858 2023-02-06 17:34:47 +08:00
• 375cd03575 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 lin 2023-02-06 16:43:04 +08:00
• aa3cec0dfc 去除数据库自动更新，自动更新会导致wvp在arm架构服务上无法启动 648540858 2023-02-06 10:46:23 +08:00
• 25fca14e62 修复WVP作为下级平台接受deviceControl指令的问题-修复指令响应 gaofw189 2023-02-06 10:35:32 +08:00
• fdd732250a Merge pull request #739 from xiaoQQya/wvp-28181-2.0 648540858 2023-02-06 10:35:16 +08:00
• a5ed284658 fix(JsonUtil): 修复 Redis 中 Object 序列化与反序列化不一致导致报错的问题 xiaoQQya 2023-02-04 18:13:47 +08:00
• d50dd3fe84 perf(ZLMRESTfulUtils): 修改OkHttpClient 读取超时时间，解决点播时截图快照获取超时的问题 xiaoQQya 2023-02-04 18:12:25 +08:00
• 9586f58a30 Merge pull request #738 from gaoxun1937/wvp-28181-2.0 648540858 2023-02-03 17:51:47 +08:00
• 40ece192fe 修复WVP作为下级平台接收设备告警消息后上报上级平台的问题 gaofw189 2023-02-03 14:35:44 +08:00
• 0a380c6ff9 解决截图被占用无法打开问题 gaoxun250@sina.com 2023-02-03 14:19:10 +08:00
• e5b1876012 修复WVP作为下级平台接收上级平台DeviceControl信令不做处理的问题。-修改日志备注 gaofw189 2023-02-02 18:24:32 +08:00
• 7a9f001dcb 修复WVP作为下级平台接收上级平台DeviceControl信令不做处理的问题。 gaofw189 2023-02-02 18:21:25 +08:00
• 6246ce6ba8 Merge pull request #736 from kunlong-luo/fix-null-point-and-cast-exception 648540858 2023-02-02 16:24:02 +08:00
• b89e46871a fix: 修复一些问题 kunlong-luo 2023-02-02 16:19:02 +08:00
• 192f012829 Merge pull request #735 from kunlong-luo/fix-host-bug 648540858 2023-02-02 15:11:33 +08:00
• 8f2ce95165 fix: 修复空指针和类型转换问题 kunlong-luo 2023-02-02 14:36:19 +08:00
• 166272ad11 增加数据库自动更新开关 648540858 2023-02-01 15:54:03 +08:00
• 7470e1fe8e 优化数据库自动更新功能 648540858 2023-02-01 15:37:19 +08:00
• d395f5d6c0 Merge pull request #730 from shijinting0321/wvp-28181-2.0 648540858 2023-02-01 15:25:49 +08:00
• fb4336c5e0 Merge pull request #276 from brokge/fix-269 648540858 2023-02-01 10:57:02 +08:00
• 2b1f7a4739 Merge branch 'wvp-28181-2.0' into fix-269 648540858 2023-02-01 10:56:40 +08:00
• 2d492c5b6b 国标回放超时时间使用点播超时一样的字段 lin 2023-02-01 10:09:01 +08:00
• df7171353b Merge pull request #729 from gaofuwang/wvp-28181-2.0 648540858 2023-02-01 09:48:05 +08:00
• bdf799fb64 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-02-01 09:47:58 +08:00
• 44b250eed2 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 lin 2023-02-01 09:32:52 +08:00
• aedbc4ed75 补充sql lin 2023-01-31 22:05:11 +08:00
• f3e4928995 Merge pull request #731 from zl2fxy/patch-1 648540858 2023-01-31 14:16:47 +08:00
• 10be210b57 Update config.md zl2fxy 2023-01-31 10:05:46 +08:00
• 6374a8f2e5 优化目录推送 648540858 2023-01-30 14:25:25 +08:00
• ca1d66cfb8 数据库脚本版本管理，便于表结构更新维护 sjt 2023-01-18 15:27:24 +08:00
• 141b228267 修复WVP作为下级平台接收DeviceInfo指令固定响应的问题 gaofw189 2023-01-17 17:22:38 +08:00
• c19ad94c3e 优化目录更新，更新失败时只更新收到的内容不重置所有通道和自动拉流 648540858 2023-01-15 15:27:47 +08:00
• dea44dcd78 Merge branch 'wvp-28181-2.0' 648540858 2023-01-13 16:21:17 +08:00
• ebcd2320a9 修复推流鉴权 648540858 2023-01-13 11:19:30 +08:00
• e2944938cd 更新README 648540858 2023-01-12 18:05:29 +08:00
• 955c893428 Merge pull request #724 from gaofuwang/wvp-28181-2.0 648540858 2023-01-12 15:53:24 +08:00
• fb8a5d483b 修复redis查询 648540858 2023-01-11 11:33:01 +08:00
• d4fdea3df9 修复国标录像查询ui 648540858 2023-01-11 10:43:56 +08:00
• e429c9f5a7 更新README 648540858 2023-01-10 17:05:20 +08:00
• 4babf2b47b 更新README 648540858 2023-01-10 16:26:52 +08:00
• 26cd7dbaf9 修复WVP作为下级平台接收DeviceStatus指令固定响应的问题 gaofw189 2023-01-10 15:55:56 +08:00
• 72a1f12208 优化国标录像UI 648540858 2023-01-10 14:01:03 +08:00
• 8b0662ebfe 优化国标录像下载错误提示 648540858 2023-01-10 11:36:54 +08:00
• 88878940af 修复录像下载 648540858 2023-01-09 18:12:41 +08:00
• 9b9a13ab36 国标录像UI重构 648540858 2023-01-09 16:31:51 +08:00
• fd3a4ef472 修复国标录像回放以及录像下载 648540858 2023-01-06 11:43:27 +08:00
• d03e8b0428 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-01-05 17:49:50 +08:00
• 09a23bc80e 修复布防撤防 #717 648540858 2023-01-05 17:49:34 +08:00