panlinlin
|
ded8262985
|
去除pom多余文件
|
4 years ago |
|
panlinlin
|
e960720298
|
通过重写的方式解决与国标时间格式不一致的问题， 不需要修改jar包了。
|
4 years ago |
|
648540858
|
c8b6ed5823
|
Merge pull request #38 from lawrencehj/wvp-28181-2.0
修改不能创建多个上级平台的问题等
|
4 years ago |
|
Lawrence
|
1b200bcc90
|
将上级平台标识改为serverGBId
|
4 years ago |
|
Lawrence
|
fede5969f9
|
通道查询排序输出，避免列表杂乱无章
|
4 years ago |
|
Lawrence
|
f34eb9c9e6
|
通道查询排序输出，避免列表杂乱无章
|
4 years ago |
|
Lawrence
|
8a4e915fe1
|
修改catalog请求还是响应的判断方法
|
4 years ago |
|
Lawrence
|
217d42983e
|
parent_platform表修改主键为serverGBId
|
4 years ago |
|
Lawrence
|
1885b2120c
|
修正修改过上级平台信息后再次创建上级平台按钮不会变为'立即创建'的问题
|
4 years ago |
|
Lawrence
|
fcb76a9ebc
|
修正初次打开通道选择列表每页数量不对的问题
|
4 years ago |
|
panlinlin
|
6c4da7bebe
|
完成向上级联->通道推送
修复选择通道是查询的bug
|
4 years ago |
|
panlinlin
|
ccc188c113
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
4 years ago |
|
panlinlin
|
518f0b0265
|
回滚修复登陆的bug时不必修改的代码
|
4 years ago |
|
panlinlin
|
9e09755ef0
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
4 years ago |
|
panlinlin
|
ac45e4f6c8
|
修复登陆的bug
|
4 years ago |
|
panlinlin
|
9335e2a6c9
|
完成向上级联->选择通道-编辑页面密码不隐藏
|
4 years ago |
|
panlinlin
|
f082797d9b
|
完成向上级联->选择通道-003
|
4 years ago |
|
panlinlin
|
b613747153
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
4 years ago |
|
648540858
|
9de1bef821
|
Merge pull request #34 from lawrencehj/wvp-28181-2.0
解决非默认端口无法Send Bye的问题
|
4 years ago |
|
648540858
|
ff427e6dcb
|
Merge pull request #35 from lawrencehj/master
解决非默认端口无法Send Bye的问题
|
4 years ago |
|
Lawrence
|
5257c7c9f4
|
与master分支同步
|
4 years ago |
|
Lawrence
|
dd0a234c05
|
进一步优化录像列表获取算法
|
4 years ago |
|
Lawrence
|
92e9a3b91c
|
进一步优化录像列表获取算法
|
4 years ago |
|
Lawrence
|
d563527289
|
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
|
panlinlin
|
71aace5569
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
4 years ago |
|
panlinlin
|
a683d9f676
|
关闭播放窗口停止回放
回滚回放代码
|
4 years ago |
|
panlinlin
|
700398ba13
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
4 years ago |
|
panlinlin
|
6e4a8cac04
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
4 years ago |
|
Lawrence
|
5a3a346c59
|
解决非默认端口无法Send Bye的问题
|
4 years ago |
|
Lawrence
|
a8108748fe
|
解决非默认端口无法Send Bye的问题
|
4 years ago |
|
648540858
|
d8635682bb
|
Merge pull request #33 from lawrencehj/wvp-28181-2.0
优化录像列表获取算法等
|
4 years ago |
|
648540858
|
2d8054be18
|
Merge pull request #32 from lawrencehj/master
优化录像列表获取算法等
|
4 years ago |
|
Lawrence
|
80b5dc0068
|
修正页码计算错误
|
4 years ago |
|
Lawrence
|
d568a18e0a
|
与master分支同步
|
4 years ago |
|
Lawrence
|
dc1d9646a9
|
优化录像列表获取算法
|
4 years ago |
|
Lawrence
|
df321f27af
|
平台向上级联，重新启用时自动重设Expires值
|
4 years ago |
|
Lawrence
|
6735b01775
|
设备注册时更新设备与通道信息
|
4 years ago |
|
Lawrence
|
ae4d330131
|
修正播放回放ssrc
|
4 years ago |
|
Lawrence
|
5de358d38e
|
格式调整
|
4 years ago |
|
Lawrence
|
6faf7fc994
|
修正录像回放streamId赋值
|
4 years ago |
|
Lawrence
|
8b66abfbfc
|
设备注册更新设备信息
|
4 years ago |
|
Lawrence
|
b8e67deb13
|
优化录像清单获取算法
|
4 years ago |
|
panlinlin
|
8b4d8a76ac
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
4 years ago |
|
panlinlin
|
021b820736
|
通过前端文件修复分页错误
|
4 years ago |
|
panlinlin
|
d94135c9cd
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
4 years ago |
|
648540858
|
e3943cb07e
|
Merge pull request #31 from BradyXuBin/master
修复分页错误和增加配置忽略文件
|
4 years ago |
|
panlinlin
|
74c9e0400d
|
修复错误的使用stream作为ssrc导致的无法stop问题
|
4 years ago |
|
BradyXuBin
|
255d2d4581
|
1.修复分页错误，pageHelper是从1开始,目前是在后端的+1解决。
2.增加忽略自己本身配置文件。
|
4 years ago |
|
648540858
|
872d336ded
|
Merge pull request #29 from lawrencehj/wvp-28181-2.0
Wvp 28181 2.0
|
4 years ago |
|
648540858
|
4005962c5b
|
Merge pull request #30 from lawrencehj/master
与2.0同步修正部分错误
|
4 years ago |
