648540858
|
2858444ffe
|
修复gps位置更新时时间格式错误的问题 #971
|
2023-08-01 10:37:00 +08:00 |
|
648540858
|
27d77f77e9
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-08-01 10:29:20 +08:00 |
|
648540858
|
dcbf0bfe7e
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
|
2023-08-01 10:28:41 +08:00 |
|
648540858
|
4a58530498
|
Merge pull request #978 from dodu2014/wvp-28181-2.0
docs: 修正日志管理控制器mapping的错误描述
|
2023-08-01 09:47:14 +08:00 |
|
tnt group
|
87a23ff3d7
|
docs: 修正日志管理控制器mapping的错误描述
|
2023-08-01 08:27:47 +08:00 |
|
648540858
|
8749ff5148
|
Merge pull request #976 from dodu2014/wvp-28181-2.0
fix: 修复请求截图api生成文件名称的异常 #975
|
2023-07-31 17:01:10 +08:00 |
|
648540858
|
d93e4e0204
|
优化发流逻辑
|
2023-07-31 16:42:12 +08:00 |
|
648540858
|
2c5c957f9d
|
移除无用代码
|
2023-07-31 12:26:42 +08:00 |
|
tnt group
|
2d16661827
|
fix: 修复请求截图api生成文件名称的异常
|
2023-07-30 13:25:38 +08:00 |
|
648540858
|
2b5738cc3e
|
支持录像回放使用固定流地址以及自动点播录像回放
|
2023-07-25 11:14:43 +08:00 |
|
648540858
|
aad7228578
|
Merge pull request #965 from wanghui0961/wvp-28181-2.0
feat:支持级联tcp主动
|
2023-07-25 10:14:06 +08:00 |
|
648540858
|
bd94c1e539
|
Merge pull request #964 from DavidSche/wvp-28181-2.0
修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/…
|
2023-07-25 10:13:24 +08:00 |
|
wanghui
|
08da3511d9
|
feat:支持级联tcp主动
|
2023-07-24 15:57:11 +08:00 |
|
che_shuai
|
e3d7996865
|
修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958
|
2023-07-24 14:10:46 +08:00 |
|
648540858
|
ec93a616f3
|
修复端口分配的并发问题
|
2023-07-24 09:06:49 +08:00 |
|
648540858
|
3e5e7f5477
|
修复端口分配的并发问题
|
2023-07-24 09:04:47 +08:00 |
|
648540858
|
a92775ec49
|
优化sip协议栈调用
|
2023-07-21 20:01:01 +08:00 |
|
648540858
|
c68611cad6
|
优化sip协议栈调用
|
2023-07-21 19:57:49 +08:00 |
|
648540858
|
cd68a402c5
|
更新readme
|
2023-07-21 15:55:49 +08:00 |
|
648540858
|
f17aac9021
|
修复空指针异常
|
2023-07-21 15:13:20 +08:00 |
|
648540858
|
f9264b585a
|
合并分支新内容
|
2023-07-20 17:56:04 +08:00 |
|
648540858
|
605969b60a
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# sql/初始化.sql
# src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
# src/main/resources/all-application.yml
|
2023-07-20 17:51:16 +08:00 |
|
648540858
|
d84b987f70
|
添加配置
|
2023-07-20 17:29:36 +08:00 |
|
648540858
|
5eeb77faad
|
扩展兼容接口，支持HTTPS接口
|
2023-07-20 17:18:11 +08:00 |
|
648540858
|
7b33a790a8
|
Merge pull request #957 from orcfnjmlns908/wvp-28181-2.0
优化拉流代理保存
|
2023-07-20 13:00:02 +08:00 |
|
648540858
|
f8908474b3
|
修复civilCode判断错误导致civilCode丢失
|
2023-07-19 20:48:15 +08:00 |
|
648540858
|
a0a4fdb032
|
修复国标级联时添加目录不同平台无法使用同一个目录的问题
|
2023-07-19 15:33:21 +08:00 |
|
tonyjianhua
|
99221a34c3
|
优化拉流代理保存
|
2023-07-19 13:33:53 +08:00 |
|
648540858
|
631179d0c1
|
添加缺少的sql字段
|
2023-07-17 17:33:19 +08:00 |
|
648540858
|
1d5320836f
|
合并分支功能
|
2023-07-17 17:28:49 +08:00 |
|
648540858
|
84ea0d313f
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-07-17 16:56:58 +08:00 |
|
648540858
|
0d1abf5580
|
优化发流端口分配
|
2023-07-17 16:55:41 +08:00 |
|
648540858
|
02bc1c393d
|
优化日志
|
2023-07-17 16:54:00 +08:00 |
|
648540858
|
28af94d18c
|
Merge pull request #956 from xiaoQQya/develop
perf(config): 补全 all-application.yml 配置文件
|
2023-07-17 16:42:16 +08:00 |
|
xiaoQQya
|
f707dee47d
|
perf(config): 补全 all-application.yml 配置文件
|
2023-07-17 15:51:09 +08:00 |
|
648540858
|
6fddd1d34a
|
Merge pull request #939 from xiaoQQya/wvp-28181-2.0
修复设备通道列表按通道类型筛选不准确等问题
|
2023-07-17 15:44:10 +08:00 |
|
648540858
|
12d3e26ecc
|
Merge pull request #955 from nikmu/wvp-28181-2.0
修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突
|
2023-07-17 14:30:55 +08:00 |
|
朱俊杰
|
5ee2d26ed1
|
修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突
|
2023-07-17 10:54:34 +08:00 |
|
648540858
|
a9bd11b9d4
|
优化拉流代理的添加
|
2023-07-14 19:46:41 +08:00 |
|
648540858
|
60007bb552
|
推流默认开启音频
|
2023-07-14 11:27:58 +08:00 |
|
648540858
|
c5ebd79093
|
修复因为心跳重发导致的心跳间隔异常
|
2023-07-14 09:10:59 +08:00 |
|
648540858
|
77cebecd45
|
修复数据存储
|
2023-07-14 08:34:15 +08:00 |
|
648540858
|
f7d6ec1332
|
修复合并错误
|
2023-07-13 14:57:30 +08:00 |
|
648540858
|
e6d9d65e51
|
Merge branch '2.6.8' into wvp-28181-2.0
# 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/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-13 14:47:24 +08:00 |
|
648540858
|
c6cc5209c0
|
增加发流音视频分开发送
|
2023-07-13 14:30:41 +08:00 |
|
648540858
|
561591b8bb
|
Merge pull request #948 from DavidSche/wvp-28181-2.0
修复多级级联平台平台时，上级平台无法获取设备录像列表问题。问题详见 https://github.com/648540858/wvp-G…
|
2023-07-13 14:07:58 +08:00 |
|
che_shuai
|
e94ffbdd5f
|
修复多级级联平台平台时，上级平台无法获取设备录像列表问题。问题详见 https://github.com/648540858/wvp-GB28181-pro/issues/914
|
2023-07-13 10:22:42 +08:00 |
|
648540858
|
f167a9c9e8
|
修复发流复盖的为问题
|
2023-07-12 15:13:53 +08:00 |
|
648540858
|
d10d7ab89c
|
合并主线的发流端口管理逻辑
|
2023-07-10 14:30:59 +08:00 |
|
xiaoQQya
|
44680ebe63
|
fix(play): 修复作为上级平台点播截取快照问题
|
2023-07-09 20:22:40 +08:00 |
|