648540858
|
d21322a932
|
优化国标级联录像预览
|
2022-03-03 18:23:52 +08:00 |
|
648540858
|
01a619f9e3
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-03-03 16:55:20 +08:00 |
|
648540858
|
28d7fd3b58
|
参数名错误
|
2022-03-03 16:54:47 +08:00 |
|
648540858
|
14174ff400
|
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
|
b019106c44
|
Merge pull request #365 from TristingChen/zlm-node-manage
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 16:23:03 +08:00 |
|
648540858
|
2eb1ca2d94
|
国标录像支持多端同时播放
|
2022-03-03 15:57:28 +08:00 |
|
chenjialing
|
af885ca4d9
|
节点管理--某个zlm节点删除之后，数据库中仍有数据，导致再次添加该zlm节点
|
2022-03-03 15:40:12 +08:00 |
|
chenjialing
|
b225b53510
|
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 15:30:16 +08:00 |
|
648540858
|
6a4cdc36b1
|
修复正则×号是引起的错误
|
2022-03-02 18:11:43 +08:00 |
|
648540858
|
d73630c49f
|
修复bug
|
2022-03-02 15:04:24 +08:00 |
|
panll
|
128ccc7ff7
|
!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
|
0993bedb46
|
!11 修改内存泄露
Merge pull request !11 from ydpd/wvp-28181-2.0
|
2022-03-02 06:26:54 +00:00 |
|
panll
|
bbb808d83f
|
!9 update sql/mysql.sql.
Merge pull request !9 from 随波/N/A
|
2022-03-02 06:25:19 +00:00 |
|
panll
|
ae83bd6d06
|
!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
|
94af90fa14
|
!7 rPort 变更了HostAddres也要变
Merge pull request !7 from ckb_test/N/A
|
2022-03-02 06:23:31 +00:00 |
|
648540858
|
1dcdbc3742
|
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
|
f5640fddb7
|
优化国标级联的目录订阅
|
2022-03-02 11:48:20 +08:00 |
|
648540858
|
8f9a530296
|
Merge pull request #360 from TristingChen/alarm-test
告警信息上报过程中，AlarmType存储失败的解决
|
2022-03-02 09:22:20 +08:00 |
|
chenjialing
|
fe0b5c33f9
|
告警信息上报过程中，AlarmType存储失败的解决
|
2022-03-02 09:18:17 +08:00 |
|
ydpd
|
86f87c4665
|
修改内存泄露
|
2022-03-02 00:24:14 +08:00 |
|
ydpd
|
e66b839659
|
修改内存泄露
|
2022-03-02 00:02:03 +08:00 |
|
648540858
|
29191373aa
|
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
|
298d104fec
|
优化配置文件与日志
|
2022-03-01 21:59:31 +08:00 |
|
648540858
|
1ea95d2b87
|
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
|
4c53b10737
|
解决对接中遇到的问题
|
2022-03-01 17:42:22 +08:00 |
|
648540858
|
97698ee716
|
Merge pull request #346 from TristingChen/log-optimization
Log optimization
|
2022-03-01 17:37:19 +08:00 |
|
648540858
|
347eec086d
|
Merge pull request #356 from SaltFish001/wvp-28181-2.0
注释无用的引入, 修复打jar包失败问题
|
2022-03-01 17:36:23 +08:00 |
|
SaltFish
|
bb1fada32c
|
Update StreamPushMapper.java
|
2022-03-01 14:33:04 +08:00 |
|
随波
|
b1d4123d29
|
update sql/mysql.sql.
修改拉流代理缺少“名称”字段问题
|
2022-02-28 15:34:20 +00:00 |
|
随波
|
e4e0cde16c
|
update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
修改新建拉流代理时不保存“名称”字段问题
|
2022-02-28 15:31:50 +00:00 |
|
648540858
|
9c5b1060af
|
支持删除在线设备
|
2022-02-28 17:56:27 +08:00 |
|
ckb_test
|
6d454423a2
|
rPort 变更了HostAddres也要变
|
2022-02-28 09:07:02 +00:00 |
|
648540858
|
0cd86a79c2
|
修复设备删除
|
2022-02-28 10:39:51 +08:00 |
|
648540858
|
e94b99d11c
|
实现国标录像级联播放，优化点播流程，加快点播速度
|
2022-02-27 20:01:31 +08:00 |
|
648540858
|
917e2b577d
|
Merge pull request #352 from walkTtalk/wvp-28181-2.0
Fix issue #347: 修改前端启动报错
|
2022-02-26 15:38:59 +08:00 |
|
walkTtalk
|
f52be30399
|
Fix issue #347: 修改前端启动报错
|
2022-02-26 00:01:35 +08:00 |
|
648540858
|
10f776678e
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-25 20:33:38 +08:00 |
|
648540858
|
7400ace65d
|
规范数据库，解决bug
|
2022-02-25 20:33:02 +08:00 |
|
chenjialing
|
777f2e2121
|
日志优化--修改本地配置文件local的mysql连接方式
|
2022-02-25 09:54:18 +08:00 |
|
chenjialing
|
e0f8acf09f
|
添加git的忽略logs
|
2022-02-25 09:36:05 +08:00 |
|
chenjialing
|
7852c4fde7
|
research--local文件
|
2022-02-25 09:36:05 +08:00 |
|
chenjialing
|
c8b9e590ef
|
日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式
|
2022-02-25 09:23:46 +08:00 |
|
648540858
|
c9bfdf2525
|
实现国标的级联录像查询
|
2022-02-24 21:10:34 +08:00 |
|
648540858
|
00afecac47
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-24 17:18:36 +08:00 |
|
648540858
|
a42dda2bd3
|
规范数据库，添加必要约束，优化通道批量导入功能
|
2022-02-24 16:55:06 +08:00 |
|
648540858
|
0191e93768
|
同步主线
|
2022-02-23 21:55:46 +08:00 |
|
648540858
|
f4c03c1808
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
e861c9dfab
|
Merge remote-tracking branch 'origin/master' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
2157bb0270
|
规范数据库，给各个标设置主键ID
|
2022-02-22 11:44:56 +08:00 |
|
648540858
|
0a44eb8965
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:33:17 +08:00 |
|