xubinbin
|
5a9621840c
|
修改控制台输出日志格式，增加显示线程名称，调用类的全类路径以及日子输出行的行号。
|
2023-12-12 16:37:06 +08:00 |
648540858
|
ffc8a530f3
|
修复定时录像删除
|
2023-11-24 10:47:33 +08:00 |
|
648540858
|
fc8bb378de
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-11-21 10:50:02 +08:00 |
|
648540858
|
8422d3a343
|
添加数据库链接参数
|
2023-11-21 10:49:29 +08:00 |
|
648540858
|
a01295603a
|
简化配置
|
2023-11-03 17:32:37 +08:00 |
|
648540858
|
f36eb7ebeb
|
添加打包文件
|
2023-11-02 14:17:20 +08:00 |
|
648540858
|
5d3f307b44
|
将录像存储路径迁移至wvp中配置，assist以有在需要视频合成的时候才会用
|
2023-11-01 14:07:32 +08:00 |
|
648540858
|
99506108cd
|
添加日志
|
2023-10-26 15:29:04 +08:00 |
|
648540858
|
4df90d9ba4
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-09-20 09:17:28 +08:00 |
|
648540858
|
a6fb1cdb74
|
修复Web页面播放国标录像无声音的问题
|
2023-09-11 16:17:29 +08:00 |
|
648540858
|
88350873ee
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.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/service/impl/MediaServerServiceImpl.java
|
2023-09-11 11:21:50 +08:00 |
chenzhangyue
|
73f6f044a1
|
local dev
|
2023-09-01 17:53:48 +08:00 |
AlphaWu
|
b5ccb1636f
|
修正Database拼写错误。
|
2023-08-20 15:50:24 +08:00 |
|
648540858
|
fc9ed976cf
|
合并主线
|
2023-08-07 18:09:45 +08:00 |
|
648540858
|
e898c344aa
|
Merge branch 'wvp-28181-2.0' into main-dev
# 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/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2023-08-07 17:28:02 +08:00 |
|
648540858
|
e5cba6022f
|
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
|
3de49d1c2a
|
优化发流逻辑
|
2023-07-31 16:42:12 +08:00 |
|
648540858
|
7d3cbb8253
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-07-24 09:42:32 +08:00 |
|
648540858
|
13811b0c78
|
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
|
48a1a24769
|
添加配置
|
2023-07-20 17:29:36 +08:00 |
|
648540858
|
db6dd3f755
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# 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/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/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-19 11:33:58 +08:00 |
xiaoQQya
|
153523a32f
|
perf(config): 补全 all-application.yml 配置文件
|
2023-07-17 15:51:09 +08:00 |
|
648540858
|
ef5018de2d
|
修复合并错误
|
2023-07-13 14:57:30 +08:00 |
|
648540858
|
4604aaea99
|
优化语音对讲支持根据设备设置释放收到ACK后开始发流
|
2023-07-02 13:53:45 +08:00 |
|
648540858
|
3571ca272b
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# web_src/config/index.js
|
2023-07-02 12:42:05 +08:00 |
|
648540858
|
5a7a7a12bd
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# src/main/resources/all-application.yml
# web_src/config/index.js
# web_src/src/components/dialog/devicePlayer.vue
|
2023-06-27 16:46:26 +08:00 |
dsk
|
7749ea3421
|
新增接口超时时间配置，修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException
|
2023-06-25 16:16:40 +08:00 |
|
648540858
|
7b24d51db9
|
优化国标级联的端口保持
|
2023-06-21 14:03:31 +08:00 |
|
648540858
|
9e28923b8c
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2023-06-20 14:15:27 +08:00 |
|
648540858
|
6b3732b8c4
|
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
|
8cf5b65e38
|
优化国标级联注册机制
|
2023-06-19 20:09:16 +08:00 |
|
648540858
|
8942ab0112
|
优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范
|
2023-06-19 18:42:36 +08:00 |
‘sxh’
|
652489b47e
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2023-06-15 11:10:20 +08:00 |
|
‘sxh’
|
15df08964b
|
新增设备主子码流选择，默认为不开启
|
2023-06-15 11:00:29 +08:00 |
|
648540858
|
e68eb850a9
|
去除多余日志
|
2023-06-13 23:11:56 +08:00 |
|
648540858
|
b7f2a6b25b
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
|
2023-06-07 20:21:10 +08:00 |
|
648540858
|
97b04c4dba
|
修复录像下载，优化拉流代理接口
|
2023-06-07 20:15:08 +08:00 |
|
648540858
|
ffb21248cb
|
去除多余配置
|
2023-05-30 11:20:22 +08:00 |
|
648540858
|
50240b4e39
|
移除手动配置mybatis下划线转驼峰
|
2023-05-30 10:32:08 +08:00 |
|
648540858
|
a91fe69f76
|
添加文档
|
2023-05-29 09:40:36 +08:00 |
|
648540858
|
30ae9e929f
|
合并主线
|
2023-05-25 17:28:57 +08:00 |
|
648540858
|
3fe47021b9
|
优化国标规范，参考国标文档中-点播外域设备媒体流SSRC处理方式，上级点播时自定义ssrc，不适用上级携带的ssrc，也避免上级兼容性差，不携带ssrc的问题，可通过配置关闭此特性
|
2023-05-04 14:21:58 +08:00 |
QingObject
|
97b673d6ad
|
新增JT1078 Template支持
|
2023-04-28 10:10:06 +08:00 |
|
648540858
|
94da74901c
|
优化Sip.ip的注释
|
2023-04-23 17:33:28 +08:00 |
|
648540858
|
0f50904992
|
支持设备/通道状态变化时发送redis通知
|
2023-04-20 10:26:42 +08:00 |
|
648540858
|
db2ccfedfa
|
优化notify性能，增加notify超出处理能力时直接回复错误码，不做处理。
|
2023-04-19 11:09:26 +08:00 |
|
648540858
|
d295f3c512
|
修复合并后的问题
|
2023-04-18 14:06:07 +08:00 |
|
648540858
|
e3d7be9d81
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-04-08 15:37:22 +08:00 |
canghai809
|
e21e419361
|
开发及Docker配置文件数据源更新
|
2023-04-04 18:52:13 +08:00 |
|
648540858
|
59ab2adb2e
|
去除flyway配置
|
2023-04-04 11:14:08 +08:00 |
|
648540858
|
b4048fbe80
|
合并开源主线
|
2023-04-04 09:09:07 +08:00 |
|
648540858
|
2e5d94181a
|
支持修改页面展示的sip ip
|
2023-03-31 08:56:54 +08:00 |
|
648540858
|
6c969a63dd
|
去除druid数据库连接池，使用spring支持的hikari
|
2023-03-29 09:44:45 +08:00 |
|
648540858
|
782300452c
|
优化对海康平台的兼容性
|
2023-03-17 17:08:37 +08:00 |
|
648540858
|
2bf07305aa
|
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
|
5fab97cf7e
|
支持不同域的前后端分离部署
|
2023-03-15 19:05:56 +08:00 |
|
648540858
|
943f95ba8c
|
增加消息通道配置，可以通道redis在wvp上下级之间发送消息
|
2023-03-14 14:02:33 +08:00 |
|
648540858
|
2d2832dbe9
|
优化各个配置启动顺序
|
2023-02-22 18:01:30 +08:00 |
|
648540858
|
db8971302a
|
完善支持语音级联
|
2023-02-22 15:53:33 +08:00 |
|
648540858
|
5cae58c691
|
Merge branch 'wvp-28181-2.0' into main2
|
2023-02-14 10:04:48 +08:00 |
|
648540858
|
d79eec25b0
|
优化日志打印，去除数据库打印，优化控制台打印效果
|
2023-02-13 18:19:34 +08:00 |
|
648540858
|
197f80581b
|
Merge branch 'main' into main2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-02-10 16:25:33 +08:00 |
|
648540858
|
f2c6210539
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# doc/_content/introduction/deployment.md
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
# src/main/resources/all-application.yml
# web_src/src/components/dialog/devicePlayer.vue
|
2023-02-10 16:24:27 +08:00 |
|
648540858
|
ec95a42985
|
Merge branch 'main' into main2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/resources/all-application.yml
# web_src/src/components/dialog/devicePlayer.vue
|
2023-02-10 15:54:42 +08:00 |
|
648540858
|
166272ad11
|
增加数据库自动更新开关
|
2023-02-01 15:54:03 +08:00 |
|
648540858
|
7470e1fe8e
|
优化数据库自动更新功能
|
2023-02-01 15:37:19 +08:00 |
|
648540858
|
d395f5d6c0
|
Merge pull request #730 from shijinting0321/wvp-28181-2.0
数据库脚本版本管理，便于表结构更新维护
|
2023-02-01 15:25:49 +08:00 |
lin
|
2d492c5b6b
|
国标回放超时时间使用点播超时一样的字段
|
2023-02-01 10:09:01 +08:00 |
sjt
|
ca1d66cfb8
|
数据库脚本版本管理，便于表结构更新维护
|
2023-01-18 15:27:24 +08:00 |
|
648540858
|
dea44dcd78
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/resources/all-application.yml
# web_src/src/components/dialog/devicePlayer.vue
|
2023-01-13 16:21:17 +08:00 |
|
648540858
|
ebcd2320a9
|
修复推流鉴权
|
2023-01-13 11:19:30 +08:00 |
|
648540858
|
fd3a4ef472
|
修复国标录像回放以及录像下载
|
2023-01-06 11:43:27 +08:00 |
|
648540858
|
6fa5b37b96
|
Merge branch 'main' into main2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# 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/message/response/cmd/BroadcastResponseMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/resources/all-application.yml
|
2023-01-05 11:07:06 +08:00 |
|
648540858
|
fc90cd7951
|
优化tcp主动方式的语音对讲
|
2022-12-19 14:20:22 +08:00 |
|
648540858
|
4b827f3897
|
级联语音对讲部分
|
2022-12-13 11:57:07 +08:00 |
|
648540858
|
c1145a8163
|
优化级联注册，以及sip日志
|
2022-12-12 10:28:36 +08:00 |
|
648540858
|
131ea77669
|
接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址
|
2022-12-06 10:33:43 +08:00 |
|
648540858
|
3aabbd6919
|
更新配置说明文件
|
2022-11-29 12:13:54 +08:00 |
|
648540858
|
fb957b0dba
|
优化注释
|
2022-11-25 12:12:35 +08:00 |
|
648540858
|
1469971102
|
支持配置设备上线时自动更新查询通道，修复通道刷新进度展示
|
2022-11-22 15:02:25 +08:00 |
|
648540858
|
d340a37a00
|
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
|
694076dc8c
|
优化国标级联发流并发能力
|
2022-11-16 09:39:27 +08:00 |
|
648540858
|
8870f5f5a1
|
优化使用来源ip作为流ip
|
2022-11-10 09:40:01 +08:00 |
|
648540858
|
96bb3814f6
|
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
|
cc4c4ac144
|
支持配置是否开去推流鉴权
|
2022-11-08 20:29:27 +08:00 |
|
648540858
|
aed45e0f0d
|
优化多网卡
|
2022-10-28 16:40:12 +08:00 |
|
648540858
|
688e222dcc
|
优化按需拉流配置，拉流代理支持按需拉流
|
2022-10-18 17:35:32 +08:00 |
|
648540858
|
5e73874880
|
添加队列处理redis消息和sip消息，支持使用推流状态作为通道在线状态
|
2022-09-22 11:22:08 +08:00 |
|
648540858
|
243edbd143
|
为User-Agent添加必要的版本信息
|
2022-09-09 23:19:19 +08:00 |
|
648540858
|
ec0ec5eb54
|
修复并发点播时可能出现的rtpServer开启但是还未收到流的情况，编码类型136，137,138默认开启音频通道
|
2022-09-07 16:18:35 +08:00 |
|
648540858
|
2de4c322f6
|
去除对redis key过期事件的使用；重构国标级联的注册保活
|
2022-08-31 11:29:13 +08:00 |
|
648540858
|
9f680a2e9e
|
修复bug以及日志按照，错误/sip/数据库 分割
|
2022-08-26 18:03:09 +08:00 |
|
648540858
|
977bab158b
|
修复使用ssl的配置
|
2022-08-22 23:00:13 +08:00 |
|
648540858
|
117387be8f
|
更新在线文档的等新方式
|
2022-08-19 17:22:08 +08:00 |
|
648540858
|
1a9e49d9ff
|
依赖包版本升级
|
2022-08-19 17:11:51 +08:00 |
|
648540858
|
e666bb0407
|
去除连接池中wall配置，此配制影响批量执行sql
|
2022-08-18 10:15:49 +08:00 |
|
648540858
|
142efdd915
|
修复单个添加的推流级联国标的问题
|
2022-08-05 09:48:13 +08:00 |
|
648540858
|
0b1cae75fe
|
动态人物管理增加自检机制。防止内存溢出
|
2022-07-12 10:32:45 +08:00 |
|
648540858
|
1a1a68784b
|
去除失效的配置，增加人物结束时移除人物缓存
|
2022-07-11 16:41:32 +08:00 |
|
648540858
|
f5fcc79a2c
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |