648540858
|
16256537fb
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
# src/main/resources/all-application.yml
# web_src/package-lock.json
|
2023-06-19 20:19:31 +08:00 |
|
648540858
|
c64fb0d3db
|
优化国标级联注册机制
|
2023-06-19 20:09:16 +08:00 |
|
648540858
|
0333d83b6c
|
去除多余配置
|
2023-05-30 11:20:22 +08:00 |
|
648540858
|
7e818d0c07
|
移除手动配置mybatis下划线转驼峰
|
2023-05-30 10:32:08 +08:00 |
|
648540858
|
0400f66e85
|
添加文档
|
2023-05-29 09:40:36 +08:00 |
|
648540858
|
c9757ca645
|
优化国标规范，参考国标文档中-点播外域设备媒体流SSRC处理方式，上级点播时自定义ssrc，不适用上级携带的ssrc，也避免上级兼容性差，不携带ssrc的问题，可通过配置关闭此特性
|
2023-05-04 14:21:58 +08:00 |
|
QingObject
|
19df27aca6
|
新增JT1078 Template支持
|
2023-04-28 10:10:06 +08:00 |
|
648540858
|
d772e20179
|
优化Sip.ip的注释
|
2023-04-23 17:33:28 +08:00 |
|
648540858
|
c73f6d6287
|
支持设备/通道状态变化时发送redis通知
|
2023-04-20 10:26:42 +08:00 |
|
648540858
|
12aea2853d
|
优化notify性能，增加notify超出处理能力时直接回复错误码，不做处理。
|
2023-04-19 11:09:26 +08:00 |
|
648540858
|
cf0ff7ed44
|
支持修改页面展示的sip ip
|
2023-03-31 08:56:54 +08:00 |
|
648540858
|
da6a8b6db2
|
去除druid数据库连接池，使用spring支持的hikari
|
2023-03-29 09:44:45 +08:00 |
|
648540858
|
7e01babe80
|
优化对海康平台的兼容性
|
2023-03-17 17:08:37 +08:00 |
|
648540858
|
4f3d660b0d
|
Merge branch 'wvp-28181-2.0' into wvp-jwt-token
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/resources/all-application.yml
|
2023-03-15 22:58:28 +08:00 |
|
648540858
|
6bf6a045b5
|
支持不同域的前后端分离部署
|
2023-03-15 19:05:56 +08:00 |
|
648540858
|
0b8a0d2f8f
|
增加消息通道配置，可以通道redis在wvp上下级之间发送消息
|
2023-03-14 14:02:33 +08:00 |
|
648540858
|
81de91d9da
|
增加数据库自动更新开关
|
2023-02-01 15:54:03 +08:00 |
|
lin
|
868de3225f
|
国标回放超时时间使用点播超时一样的字段
|
2023-02-01 10:09:01 +08:00 |
|
648540858
|
80786de468
|
修复推流鉴权
|
2023-01-13 11:19:30 +08:00 |
|
648540858
|
75230e249e
|
修复国标录像回放以及录像下载
|
2023-01-06 11:43:27 +08:00 |
|
648540858
|
11e343a24f
|
优化级联注册，以及sip日志
|
2022-12-12 10:28:36 +08:00 |
|
648540858
|
11907b7ae7
|
接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址
|
2022-12-06 10:33:43 +08:00 |
|
648540858
|
a2cb2a4f02
|
更新配置说明文件
|
2022-11-29 12:13:54 +08:00 |
|
648540858
|
57f1f599d4
|
优化注释
|
2022-11-25 12:12:35 +08:00 |
|
648540858
|
e7952f1e12
|
支持配置设备上线时自动更新查询通道，修复通道刷新进度展示
|
2022-11-22 15:02:25 +08:00 |
|
648540858
|
6c0a609134
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-11-17 11:31:30 +08:00 |
|
648540858
|
5057c16f14
|
优化国标级联发流并发能力
|
2022-11-16 09:39:27 +08:00 |
|
648540858
|
d84fbe5ad9
|
优化使用来源ip作为流ip
|
2022-11-10 09:40:01 +08:00 |
|
648540858
|
f210b0b736
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# web_src/src/components/dialog/devicePlayer.vue
# web_src/src/components/live.vue
|
2022-11-08 20:43:25 +08:00 |
|
648540858
|
5699c7d0e4
|
支持配置是否开去推流鉴权
|
2022-11-08 20:29:27 +08:00 |
|
648540858
|
4d3b5853f9
|
优化多网卡
|
2022-10-28 16:40:12 +08:00 |
|
648540858
|
c8c1779bab
|
优化按需拉流配置，拉流代理支持按需拉流
|
2022-10-18 17:35:32 +08:00 |
|
648540858
|
5a7b10caa8
|
添加队列处理redis消息和sip消息，支持使用推流状态作为通道在线状态
|
2022-09-22 11:22:08 +08:00 |
|
648540858
|
162395d227
|
为User-Agent添加必要的版本信息
|
2022-09-09 23:19:19 +08:00 |
|
648540858
|
e4bd61860d
|
去除对redis key过期事件的使用；重构国标级联的注册保活
|
2022-08-31 11:29:13 +08:00 |
|
648540858
|
9ef08551b6
|
修复使用ssl的配置
|
2022-08-22 23:00:13 +08:00 |
|
648540858
|
8ef0619d9a
|
更新在线文档的等新方式
|
2022-08-19 17:22:08 +08:00 |
|
648540858
|
3e6f161100
|
依赖包版本升级
|
2022-08-19 17:11:51 +08:00 |
|
648540858
|
1d2c9f2049
|
去除连接池中wall配置，此配制影响批量执行sql
|
2022-08-18 10:15:49 +08:00 |
|
648540858
|
a4c5184706
|
修复单个添加的推流级联国标的问题
|
2022-08-05 09:48:13 +08:00 |
|
648540858
|
56265c2f40
|
去除失效的配置，增加人物结束时移除人物缓存
|
2022-07-11 16:41:32 +08:00 |
|
648540858
|
8b0b208952
|
设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84
|
2022-06-14 17:00:24 +08:00 |
|
648540858
|
84a4bc354f
|
去除过时注释
|
2022-05-13 15:45:02 +08:00 |
|
648540858
|
28638c7898
|
支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
|
2022-04-01 16:45:29 +08:00 |
|
648540858
|
e1cb286392
|
必须提前在zlm上配置port_range属性，不然自动配置此属性可能不成功
|
2022-03-15 15:40:15 +08:00 |
|
648540858
|
13899f771b
|
优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项
|
2022-03-07 01:17:45 +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
|
ed9e8ef456
|
修复正则×号是引起的错误
|
2022-03-02 18:11:43 +08:00 |
|
648540858
|
76397fecf8
|
优化配置文件与日志
|
2022-03-01 21:59:31 +08:00 |
|
648540858
|
48fac476dc
|
同步主线
|
2022-02-23 21:55:46 +08:00 |
|