Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,041 Commits 2 Branches 0 Tags 42 MiB
db1cbe4dbc
Commit Graph

1041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
648540858
bdc704644a Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题" 
This reverts commit 16e8aa323f.
 2022-03-04 15:36:16 +08:00
648540858
922d61c781 Merge remote-tracking branch 'origin/wvp-pro-record' into wvp-28181-2.0 
# Conflicts:
#	web_src/src/components/control.vue
 2022-03-04 15:29:56 +08:00
648540858
d6d226ef2c Merge branch 'wvp-28181-2.0' into wvp-pro-record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-03-04 15:27:28 +08:00
648540858
346c90d9d0 修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题 2022-03-04 11:26:53 +08:00
648540858
c1231f28d8 readme更新 2022-03-04 10:32:28 +08:00
648540858
b48e93e97a 去除lombok，readme更新 2022-03-04 10:30:55 +08:00
648540858
7af0cc437a 优化国标级联录像预览 2022-03-03 18:23:52 +08:00
648540858
42cbec85e8 Merge branch 'wvp-28181-2.0' into wvp-pro-record 2022-03-03 16:55:20 +08:00
648540858
5c69ffce33 参数名错误 2022-03-03 16:54:47 +08:00
648540858
cc7f784198 Merge branch 'wvp-28181-2.0' into wvp-pro-record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-03-03 16:28:32 +08:00
648540858
0c909e0c85 Merge pull request #365 from TristingChen/zlm-node-manage 
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
 2022-03-03 16:23:03 +08:00
648540858
1527b0e839 国标录像支持多端同时播放 2022-03-03 15:57:28 +08:00
chenjialing
6e147c44e2 节点管理--某个zlm节点删除之后，数据库中仍有数据，导致再次添加该zlm节点 2022-03-03 15:40:12 +08:00
chenjialing
1f9b3271bb fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复 2022-03-03 15:30:16 +08:00
648540858
ed9e8ef456 修复正则×号是引起的错误 2022-03-02 18:11:43 +08:00
648540858
2e49a48bb1 修复bug 2022-03-02 15:04:24 +08:00
panll
2f06d3152a !6 update web_src/src/components/dialog/changePassword.vue. 
Merge pull request !6 from lanss/N/A
 2022-03-02 06:27:57 +00:00
panll
479411f406 !11 修改内存泄露 
Merge pull request !11 from ydpd/wvp-28181-2.0
 2022-03-02 06:26:54 +00:00
panll
d4b8190caa !9 update sql/mysql.sql. 
Merge pull request !9 from 随波/N/A
 2022-03-02 06:25:19 +00:00
panll
17f2fdc344 !8 update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java. 
Merge pull request !8 from 随波/N/A
 2022-03-02 06:24:26 +00:00
panll
698ea11b16 !7 rPort 变更了HostAddres也要变 
Merge pull request !7 from ckb_test/N/A
 2022-03-02 06:23:31 +00:00
648540858
f61d0c35d7 Merge branch 'wvp-28181-2.0' into wvp-pro-record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
 2022-03-02 12:52:37 +08:00
648540858
78bad59518 优化国标级联的目录订阅 2022-03-02 11:48:20 +08:00
648540858
1da1dd68e5 Merge pull request #360 from TristingChen/alarm-test 
告警信息上报过程中，AlarmType存储失败的解决
 2022-03-02 09:22:20 +08:00
chenjialing
22fd9e6f8c 告警信息上报过程中，AlarmType存储失败的解决 2022-03-02 09:18:17 +08:00
ydpd
31b1728313 修改内存泄露 2022-03-02 00:24:14 +08:00
ydpd
3525fccd40 修改内存泄露 2022-03-02 00:02:03 +08:00
648540858
6d8ea04fe0 Merge branch 'wvp-28181-2.0' into wvp-pro-record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	web_src/src/components/control.vue
 2022-03-01 22:07:01 +08:00
648540858
76397fecf8 优化配置文件与日志 2022-03-01 21:59:31 +08:00
648540858
cf5a8515df Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 2022-03-01 17:48:21 +08:00
648540858
4c53e56d90 解决对接中遇到的问题 2022-03-01 17:42:22 +08:00
648540858
52622fe991 Merge pull request #346 from TristingChen/log-optimization 
Log optimization
 2022-03-01 17:37:19 +08:00
648540858
a0876c4172 Merge pull request #356 from SaltFish001/wvp-28181-2.0 
注释无用的引入, 修复打jar包失败问题
 2022-03-01 17:36:23 +08:00
SaltFish
aabd3ea659 Update StreamPushMapper.java 2022-03-01 14:33:04 +08:00
随波
0a6649afe1 update sql/mysql.sql. 
修改拉流代理缺少“名称”字段问题
 2022-02-28 15:34:20 +00:00
随波
bffca58385 update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java. 
修改新建拉流代理时不保存“名称”字段问题
 2022-02-28 15:31:50 +00:00
648540858
ac56757291 支持删除在线设备 2022-02-28 17:56:27 +08:00
ckb_test
3787640dd1 rPort 变更了HostAddres也要变 2022-02-28 09:07:02 +00:00
648540858
05ca880eb1 修复设备删除 2022-02-28 10:39:51 +08:00
648540858
1bbf270fec 实现国标录像级联播放，优化点播流程，加快点播速度 2022-02-27 20:01:31 +08:00
648540858
354bca84b0 Merge pull request #352 from walkTtalk/wvp-28181-2.0 
Fix issue #347: 修改前端启动报错
 2022-02-26 15:38:59 +08:00
walkTtalk
9dcb270efd Fix issue #347: 修改前端启动报错 2022-02-26 00:01:35 +08:00
648540858
1fa0046395 Merge branch 'wvp-28181-2.0' into wvp-pro-record 2022-02-25 20:33:38 +08:00
648540858
bd4f730d79 规范数据库，解决bug 2022-02-25 20:33:02 +08:00
chenjialing
9a65c66dfd 日志优化--修改本地配置文件local的mysql连接方式 2022-02-25 09:54:18 +08:00
chenjialing
e2d7a6ce95 添加git的忽略logs 2022-02-25 09:36:05 +08:00
chenjialing
571f50b63c research--local文件 2022-02-25 09:36:05 +08:00
chenjialing
813b2ae203 日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式 2022-02-25 09:23:46 +08:00
648540858
8dfb2fc4a2 实现国标的级联录像查询 2022-02-24 21:10:34 +08:00
648540858
fa51af1e84 Merge branch 'wvp-28181-2.0' into wvp-pro-record 2022-02-24 17:18:36 +08:00