Commit Graph

Select branches

Hide Pull Requests

feature

master

Mono Color

• 19a52a20f3 固定时区为Asia/Shanghai 648540858 2022-06-03 18:52:40 +08:00
• acac24f0db okhttp-digest的Maven仓库调整 #506 648540858 2022-06-03 17:07:19 +08:00
• 47abdde339 解决设备上线停止线程导致的报错，优化录像的获取以及通道的更新 648540858 2022-06-03 16:24:11 +08:00
• d88c95f409 更新 DOCKERFILE 648540858 2022-06-02 16:01:50 +08:00
• 9ae0691c80 优化快照的存储与显示 648540858 2022-06-02 10:55:41 +08:00
• 936adf31fe Merge pull request #504 from TristingChen/fixed--reset-channel 648540858 2022-06-02 09:31:06 +08:00
• ed2680bf03 修复--重设通道多个设备注册下发生的sql错误修复 chenjialing 2022-06-01 14:11:06 +08:00
• 9a0ea9e322 修复级联点播时海康使用自定义ssrc的情况 648540858 2022-06-01 11:35:53 +08:00
• 8555d64f95 修复点播超时的事件设置 648540858 2022-05-31 16:20:46 +08:00
• cf35daeb98 优化大数据下的设备树加载 648540858 2022-05-31 15:54:39 +08:00
• 0e2908c1be #488 648540858 2022-05-27 23:14:17 +08:00
• f09f1c9a2a 换种写法 648540858 2022-05-27 18:23:43 +08:00
• eda9bafd77 Merge pull request #497 from TristingChen/fixed--getAllSsrc 648540858 2022-05-27 18:22:23 +08:00
• 0cd9a20242 修复--获取全部ssrc的缓存问题修复 chenjialing 2022-05-27 18:15:06 +08:00
• 2a5404c68f 兼容海康信令问题 #493 648540858 2022-05-26 13:45:57 +08:00
• dc6769664e 兼容不规范的时间格式iso8601格式；升级fastjson版本 648540858 2022-05-26 12:10:46 +08:00
• 632630817b Merge pull request #492 from mk1990/wvp-28181-2.0 648540858 2022-05-25 14:18:27 +08:00
• 0726bca36f Merge pull request #491 from mk1990/wvp-28181-2.0 648540858 2022-05-25 14:09:43 +08:00
• f513f5ef67 解决海康设备在实时监控模块中无法获取到通道信息 mk1990 2022-05-25 14:09:43 +08:00
• 4e13489366 解决设备第一次注册获取不到设备信息和通道信息的问题 mk1990 2022-05-25 13:39:34 +08:00
• 3c48ef8f43 Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0 mk1990 2022-05-23 13:03:51 +08:00
• 46c77302a1 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-23 13:02:50 +08:00
• 7a917ee50a 修复国标录像播放 648540858 2022-05-23 10:50:29 +08:00
• a4a0394f6b Merge pull request #487 from hotcoffie/wvp-28181-2.0 648540858 2022-05-23 10:39:05 +08:00
• 6cee5a0751 fix：之前引入了错误的DigestServerAuthenticationHelper xiaoxie 2022-05-23 10:37:38 +08:00
• cb845726f6 优化代码 648540858 2022-05-23 10:16:46 +08:00
• 72852799fc Merge pull request #486 from hotcoffie/wvp-28181-2.0 648540858 2022-05-23 09:49:37 +08:00
• d739bfa597 处理冲突 xiaoxie 2022-05-23 09:44:21 +08:00
• 07fa589e06 处理冲突 xiaoxie 2022-05-23 09:42:32 +08:00
• 3aa2665fb2 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 hotcoffie 2022-05-23 09:15:59 +08:00
• 590358c313 修复国标级联录像查询 #485 648540858 2022-05-21 21:13:12 +08:00
• 78fac69cd5 支持sdp ip 配置为域名 648540858 2022-05-19 17:00:47 +08:00
• 9c555b56b7 优化语音广播的TCP主动模式 648540858 2022-05-18 18:14:46 +08:00
• 6fa9dae824 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-18 18:13:59 +08:00
• fe576c5838 Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0 mk1990 2022-05-18 16:58:26 +08:00
• 7bb38c5c7b Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-18 16:57:06 +08:00
• d202291aa8 优化单端口下的ssrc修复 648540858 2022-05-18 16:46:09 +08:00
• 973e75f808 优化收到心跳的信息更新判断 648540858 2022-05-18 16:08:52 +08:00
• 1e75b2567f 兼容海康ssrc问题 648540858 2022-05-18 15:47:20 +08:00
• 9ef1a0277b 更新jessibuca播放器 648540858 2022-05-18 15:36:33 +08:00
• 491286095c Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0 mk1990 2022-05-18 14:40:32 +08:00
• 6fbac144d6 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-18 14:36:47 +08:00
• 549bdfdd6a Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-18 11:20:13 +08:00
• 0ad8a11d8d Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2022-05-18 10:44:39 +08:00
• ff83f2c7c8 优化播放页面 648540858 2022-05-18 10:42:27 +08:00
• 36e3398b76 Merge pull request #478 from wmz46/wvp-28181-2.0 648540858 2022-05-18 10:29:17 +08:00
• 17f219d351 优化播放页面 648540858 2022-05-18 10:01:58 +08:00
• b9ffcd1d38 修复播放页面 648540858 2022-05-18 09:57:36 +08:00
• 3051fc82ee 添加直接支持切换多种开源播放器 648540858 2022-05-18 09:49:25 +08:00
• 1d753b48c0 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 hotcoffie 2022-05-17 11:53:42 +08:00
• debfb2222f 无认证密码时，不校验是否存在授权头 钢翼 2022-05-17 08:18:38 +08:00
• bfb3b4ea13 播放页面显示所有流地址 648540858 2022-05-16 17:49:44 +08:00
• 39efda779f Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-16 11:47:17 +08:00
• e6790d88fc Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0 mk1990 2022-05-16 10:14:24 +08:00
• e541341504 修改application-dev.yml mk1990 2022-05-16 10:10:50 +08:00
• 850f20143f Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-16 09:38:06 +08:00
• bbf8ab9310 添加on_record_ts事件支持 WuPeng 2022-05-13 22:22:10 +08:00
• 9a80e10f6e 使用 java.time.Instant代替 java.util.Date 648540858 2022-05-13 22:15:31 +08:00
• 95642d0bb8 优化录像结束发送BYE判断 648540858 2022-05-13 21:10:02 +08:00
• 98e6cf5bae 优化海康录像下载 648540858 2022-05-13 21:05:33 +08:00
• d571e44040 去除过时注释 648540858 2022-05-13 15:45:02 +08:00
• 4d3f0a8d79 优化海康国标录像播放的控制 648540858 2022-05-13 15:41:50 +08:00
• 1757203202 支持海康摄像头国标录像查看播放 648540858 2022-05-13 15:32:30 +08:00
• 95b1cbba65 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-13 10:58:33 +08:00
• ec749de7c1 #470 648540858 2022-05-12 18:17:15 +08:00
• 4199650c20 #471 648540858 2022-05-12 18:15:35 +08:00
• 0781d9bc28 修复缺失的设备时间 648540858 2022-05-12 17:48:52 +08:00
• 2d7a202096 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-12 16:16:55 +08:00
• 9fa739ac02 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-12 10:54:46 +08:00
• a030d00c88 修复代码 648540858 2022-05-12 10:48:50 +08:00
• 3cd1378d39 修复新设备注册 648540858 2022-05-12 10:24:08 +08:00
• 715ecb1d64 修复设备缺失的数据 648540858 2022-05-11 20:22:15 +08:00
• f6893cf95b 优化设备在线状态 648540858 2022-05-11 18:37:24 +08:00
• 6bab3b6740 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-10 18:02:09 +08:00
• a9bdb0a706 优化语音广播流程 648540858 2022-05-10 17:45:07 +08:00
• f8f65d473b 优化语音广播流程 648540858 2022-05-10 13:08:32 +08:00
• 65fa75fb44 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-10 11:02:02 +08:00
• c395cf42d1 修复发流接口的调用 648540858 2022-05-10 11:01:33 +08:00
• 16cb8cd195 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-10 11:00:51 +08:00
• a1321c29c5 优化级联点播流程 648540858 2022-05-10 10:58:26 +08:00
• 4a0f5cf76d 去除调试内容 648540858 2022-05-10 10:11:46 +08:00
• 6e48dd3f32 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-10 09:46:47 +08:00
• 93e6347f18 优化推流调用 648540858 2022-05-10 09:45:09 +08:00
• bd21d0e391 优化目录获取并法能力 648540858 2022-05-10 09:38:05 +08:00
• c2aaae9325 初步实现语音喊话 648540858 2022-05-09 18:15:30 +08:00
• ec8ab540f8 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 hotcoffie 2022-05-07 17:42:31 +08:00
• 9f0ef439cc Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-07 15:21:48 +08:00
• 36170df3f4 修复打包优化pom 648540858 2022-05-07 15:13:56 +08:00
• a8097c35da 更新readme 648540858 2022-05-07 14:44:00 +08:00
• 88db57697a Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-07 11:25:13 +08:00
• ca16a79255 添加语音发送通道和语音接收通道字段 648540858 2022-05-07 09:52:02 +08:00
• ee2dda21f0 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-07 09:03:20 +08:00
• 523139143f Merge pull request #468 from TristingChen/resetQuery--add 648540858 2022-05-07 09:00:22 +08:00
• a2182b5a7b Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-06 17:46:01 +08:00
• cc63a52884 开发----增加预置位查询接口开发 chenjialing 2022-05-06 17:41:46 +08:00
• 22d8d22238 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-06 17:30:31 +08:00
• e218553685 去除多与引用 648540858 2022-05-06 17:29:24 +08:00
• e7f5cfc422 test 648540858 2022-05-06 17:26:36 +08:00
• afe2450a14 优化地图功能的开关 648540858 2022-05-06 16:01:36 +08:00
• ee62f17170 统一userAgent 648540858 2022-05-06 15:55:32 +08:00