Commit Graph

Select branches

Hide Pull Requests

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

2.7.0

2.7.1

2.7.1-t

2.7.1-多对一语音对讲

2.7.2

2.7.3

dev/1400

dev/abl支持

dev/springBoot3

dev/压力测试

dev/多线程性能优化

dev/异常挂载数据处理

master

sip

storage-sqlite

ui-optimization

wvp-28181-record

wvp-dialog

xinchuang

结构优化

#1

#1

#10

#10

#11

#11

#12

#12

#13

#13

#14

#14

#15

#15

#16

#16

#17

#17

#18

#18

#19

#19

#2

#2

#20

#20

#21

#21

#22

#22

#23

#23

#24

#24

#25

#25

#26

#26

#27

#27

#28

#28

#29

#29

#3

#3

#30

#30

#31

#31

#32

#32

#33

#33

#34

#34

#35

#35

#36

#36

#37

#37

#38

#38

#39

#39

#4

#4

#40

#40

#41

#41

#42

#42

#43

#43

#44

#44

#45

#45

#46

#46

#5

#5

#6

#6

#7

#7

#8

#8

#9

#9

v1.0

Mono Color

• f513f5ef67 解决海康设备在实时监控模块中无法获取到通道信息 mk1990 2022-05-25 14:09:43 +0800
• 4e13489366 解决设备第一次注册获取不到设备信息和通道信息的问题 mk1990 2022-05-25 13:39:34 +0800
• 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 +0800
• 46c77302a1
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-23 13:02:50 +0800
• 7a917ee50a 修复国标录像播放 648540858 2022-05-23 10:50:29 +0800
• a4a0394f6b
  Merge pull request #487 from hotcoffie/wvp-28181-2.0 648540858 2022-05-23 10:39:05 +0800
• 6cee5a0751 fix：之前引入了错误的DigestServerAuthenticationHelper xiaoxie 2022-05-23 10:37:38 +0800
• cb845726f6 优化代码 648540858 2022-05-23 10:16:46 +0800
• 72852799fc
  Merge pull request #486 from hotcoffie/wvp-28181-2.0 648540858 2022-05-23 09:49:37 +0800
• d739bfa597 处理冲突 xiaoxie 2022-05-23 09:44:21 +0800
• 07fa589e06 处理冲突 xiaoxie 2022-05-23 09:42:32 +0800
• 3aa2665fb2
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 hotcoffie 2022-05-23 09:15:59 +0800
• 590358c313 修复国标级联录像查询 #485 648540858 2022-05-21 21:13:12 +0800
• 78fac69cd5 支持sdp ip 配置为域名 648540858 2022-05-19 17:00:47 +0800
• 9c555b56b7 优化语音广播的TCP主动模式 648540858 2022-05-18 18:14:46 +0800
• 6fa9dae824 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-18 18:13:59 +0800
• 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 +0800
• 7bb38c5c7b
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-18 16:57:06 +0800
• d202291aa8 优化单端口下的ssrc修复 648540858 2022-05-18 16:46:09 +0800
• 973e75f808 优化收到心跳的信息更新判断 648540858 2022-05-18 16:08:52 +0800
• 1e75b2567f 兼容海康ssrc问题 648540858 2022-05-18 15:47:20 +0800
• 9ef1a0277b 更新jessibuca播放器 648540858 2022-05-18 15:36:33 +0800
• 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 +0800
• 6fbac144d6
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-18 14:36:47 +0800
• 549bdfdd6a Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-18 11:20:13 +0800
• 0ad8a11d8d Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2022-05-18 10:44:39 +0800
• ff83f2c7c8 优化播放页面 648540858 2022-05-18 10:42:27 +0800
• 36e3398b76
  Merge pull request #478 from wmz46/wvp-28181-2.0 648540858 2022-05-18 10:29:17 +0800
• 17f219d351 优化播放页面 648540858 2022-05-18 10:01:58 +0800
• b9ffcd1d38 修复播放页面 648540858 2022-05-18 09:57:36 +0800
• 3051fc82ee 添加直接支持切换多种开源播放器 648540858 2022-05-18 09:49:25 +0800
• 1d753b48c0
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 hotcoffie 2022-05-17 11:53:42 +0800
• debfb2222f 无认证密码时，不校验是否存在授权头 钢翼 2022-05-17 08:18:38 +0800
• bfb3b4ea13 播放页面显示所有流地址 648540858 2022-05-16 17:49:44 +0800
• 39efda779f Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-16 11:47:17 +0800
• 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 +0800
• e541341504 修改application-dev.yml mk1990 2022-05-16 10:10:50 +0800
• 850f20143f
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-16 09:38:06 +0800
• bbf8ab9310 添加on_record_ts事件支持 WuPeng 2022-05-13 22:22:10 +0800
• 9a80e10f6e 使用 java.time.Instant代替 java.util.Date 648540858 2022-05-13 22:15:31 +0800
• 95642d0bb8 优化录像结束发送BYE判断 648540858 2022-05-13 21:10:02 +0800
• 98e6cf5bae 优化海康录像下载 648540858 2022-05-13 21:05:33 +0800
• d571e44040 去除过时注释 648540858 2022-05-13 15:45:02 +0800
• 4d3f0a8d79 优化海康国标录像播放的控制 648540858 2022-05-13 15:41:50 +0800
• 1757203202 支持海康摄像头国标录像查看播放 648540858 2022-05-13 15:32:30 +0800
• 95b1cbba65
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-13 10:58:33 +0800
• a240a6bae6
  Pre Merge pull request !14 from AlphaWu/Zafu-Dev-PR AlphaWu 2022-05-12 10:17:28 +0000
• ec749de7c1 #470 648540858 2022-05-12 18:17:15 +0800
• 4199650c20 #471 648540858 2022-05-12 18:15:35 +0800
• 0781d9bc28 修复缺失的设备时间 648540858 2022-05-12 17:48:52 +0800
• 2d7a202096
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-12 16:16:55 +0800
• 9fa739ac02 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-12 10:54:46 +0800
• a030d00c88 修复代码 648540858 2022-05-12 10:48:50 +0800
• 3cd1378d39 修复新设备注册 648540858 2022-05-12 10:24:08 +0800
• 715ecb1d64 修复设备缺失的数据 648540858 2022-05-11 20:22:15 +0800
• f6893cf95b 优化设备在线状态 648540858 2022-05-11 18:37:24 +0800
• fc81854830 增加拉流代理删除确认功能。 WuPeng 2022-05-04 17:49:40 +0800
• c38aa291dd 添加on_record_ts事件支持 WuPeng 2022-05-01 14:10:13 +0800
• 6bab3b6740
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-10 18:02:09 +0800
• a9bdb0a706 优化语音广播流程 648540858 2022-05-10 17:45:07 +0800
• f8f65d473b 优化语音广播流程 648540858 2022-05-10 13:08:32 +0800
• 65fa75fb44 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-10 11:02:02 +0800
• c395cf42d1 修复发流接口的调用 648540858 2022-05-10 11:01:33 +0800
• 16cb8cd195 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-10 11:00:51 +0800
• a1321c29c5 优化级联点播流程 648540858 2022-05-10 10:58:26 +0800
• 4a0f5cf76d 去除调试内容 648540858 2022-05-10 10:11:46 +0800
• 6e48dd3f32 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-10 09:46:47 +0800
• 93e6347f18 优化推流调用 648540858 2022-05-10 09:45:09 +0800
• bd21d0e391 优化目录获取并法能力 648540858 2022-05-10 09:38:05 +0800
• c2aaae9325 初步实现语音喊话 648540858 2022-05-09 18:15:30 +0800
• ec8ab540f8
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 hotcoffie 2022-05-07 17:42:31 +0800
• 9f0ef439cc Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-07 15:21:48 +0800
• 36170df3f4 修复打包优化pom 648540858 2022-05-07 15:13:56 +0800
• a8097c35da 更新readme 648540858 2022-05-07 14:44:00 +0800
• 88db57697a
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-07 11:25:13 +0800
• ca16a79255 添加语音发送通道和语音接收通道字段 648540858 2022-05-07 09:52:02 +0800
• ee2dda21f0 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-07 09:03:20 +0800
• 523139143f
  Merge pull request #468 from TristingChen/resetQuery--add 648540858 2022-05-07 09:00:22 +0800
• a2182b5a7b
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-06 17:46:01 +0800
• cc63a52884 开发----增加预置位查询接口开发 chenjialing 2022-05-06 17:41:46 +0800
• 22d8d22238 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 648540858 2022-05-06 17:30:31 +0800
• e218553685 去除多与引用 648540858 2022-05-06 17:29:24 +0800
• e7f5cfc422 test 648540858 2022-05-06 17:26:36 +0800
• afe2450a14 优化地图功能的开关 648540858 2022-05-06 16:01:36 +0800
• ee62f17170 统一userAgent 648540858 2022-05-06 15:55:32 +0800
• 04f938ef62 Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 wangyimeng 2022-05-06 12:19:44 +0800
• 3469694ed1 1 wangyimeng 2022-05-06 12:05:12 +0800
• c8831bc58f 更新同步wvp wangyimeng 2022-05-06 11:56:29 +0800
• bfaa519e49
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 hotcoffie 2022-05-06 10:59:33 +0800
• 5d901b5e3f 使用阿里代码规范。规范代码写法 648540858 2022-05-06 10:12:34 +0800
• c286ecb455 使用阿里代码规范。规范代码写法 648540858 2022-05-05 17:07:16 +0800
• 7f0ca85850 规范代码写法 648540858 2022-05-05 14:36:27 +0800
• ff3c30f32e 优化收到心跳设置设备上线的逻辑 648540858 2022-05-05 14:26:42 +0800
• 05a324a07a
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-05-05 08:43:10 +0800
• c592740efa 升级shelljs，解决较高版本node打包时的警告 xiaoxie 2022-05-01 21:33:56 +0800
• 260bfd5935 替换一个过时的API，解决maven打包警告 xiaoxie 2022-05-01 21:32:43 +0800
• db865cc9cc #453 648540858 2022-04-28 18:18:09 +0800
• c4a2854e1b 修复添加/修改节点页面的BUG 648540858 2022-04-28 17:58:47 +0800
• d679a9fcf8 添加对点播时设备自定义ssrc的支持 648540858 2022-04-28 17:28:51 +0800
• a0537d74df
  Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mk1990 2022-04-28 16:32:09 +0800