 648540858
|
2d423d9668
Merge branch 'xinchuang' into wvp-28181-2.0
|
2 gadi atpakaļ |
|
648540858
|
d05bce8f7f
修复对接金仓数据库中的问题
|
2 gadi atpakaļ |
|
648540858
|
a6fb1cdb74
修复Web页面播放国标录像无声音的问题
|
2 gadi atpakaļ |
|
648540858
|
f57ed350b3
添加设置mobilePosition中ChannelId #1054
|
2 gadi atpakaļ |
|
648540858
|
4f90b28b93
修复自动点播超时后无法继续点播的问题
|
2 gadi atpakaļ |
|
648540858
|
d02078397e
修复修改流传输模式
|
2 gadi atpakaļ |
|
648540858
|
212218c7c4
Merge pull request #1057 from lunasaw/dev-wvp-0906
|
2 gadi atpakaļ |
|
648540858
|
3cdede80f9
Merge pull request #1059 from DavidSche/fix_#1058
|
2 gadi atpakaļ |
 davidche
|
18aff4b546
修复 #1058
|
2 gadi atpakaļ |
|
648540858
|
33d4107d0c
修复启动时如果上机平台不可连接的导致的持续报错
|
2 gadi atpakaļ |
 chenzhangyue
|
1d0c9c6a31
fix set password
|
2 gadi atpakaļ |
|
648540858
|
fd0ff18a71
Merge pull request #1055 from lunasaw/dev-wvp-0905
|
2 gadi atpakaļ |
|
648540858
|
0e9cb5ceb6
Merge pull request #1048 from lunasaw/wvp-dev-0901
|
2 gadi atpakaļ |
|
chenzhangyue
|
7155680793
fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set
|
2 gadi atpakaļ |
|
chenzhangyue
|
73f6f044a1
local dev
|
2 gadi atpakaļ |
|
chenzhangyue
|
bf8fbf4927
bugfix:这里应该不存在key才初始化一次
|
2 gadi atpakaļ |
|
648540858
|
cde7f6460a
Merge pull request #999 from a24211317/wvp-28181-2.0
|
2 gadi atpakaļ |
|
648540858
|
a426b9bc53
Merge pull request #1036 from daniel10917/fix-channel-catalog
|
2 gadi atpakaļ |
|
648540858
|
44aef5d358
Merge pull request #1043 from xu-bin-bin/wvp-28181-2.0
|
2 gadi atpakaļ |
|
648540858
|
393d25f739
Merge pull request #1045 from lunasaw/wvp-dev-0830
|
2 gadi atpakaļ |
|
chenzhangyue
|
d38ccc257c
页面表单更新修复，这里update应该为查出来的DO，不是前端的DO，采用更安全的redis策略，更新DB删除缓存，查询设备的时候补充缓存
|
2 gadi atpakaļ |
 ChengHong
|
d0ef68af3f
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2 gadi atpakaļ |
 xu-bin-bin
|
e46f1ae915
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2 gadi atpakaļ |
|
648540858
|
9a64be46ba
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2 gadi atpakaļ |
|
648540858
|
d739017678
适配assist新的命名规则
|
2 gadi atpakaļ |
 xubinbin
|
e8b2ca4686
将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产；剔除jwt token中包含的password和roleId，防止密码泄露。
|
2 gadi atpakaļ |
 yangjunyi
|
1b81080f6f
修复通道目录同步异常问题
|
2 gadi atpakaļ |
|
648540858
|
dc37f66792
Merge pull request #1028 from nikmu/wvp-28181-2.0
|
2 gadi atpakaļ |
|
648540858
|
760b14eaaa
恢复级联点播
|
2 gadi atpakaļ |
|
648540858
|
4ae8c5ac3e
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2 gadi atpakaļ |
