648540858
|
7c07ae9421
|
修复文档页面不可用BUG，支持设置认证消息头来方便调用其他接口
|
2023-12-26 15:03:00 +08:00 |
|
648540858
|
0a245c4cfe
|
修复非鉴权接口的跨域失败问题
|
2023-12-15 17:54:34 +08:00 |
|
xubinbin
|
42a2772d1a
|
bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
|
2023-12-12 17:09:04 +08:00 |
|
xiaoQQya
|
f78657473e
|
fix(报警推送): 修复报警推送功能无效的问题
该问题原因为 com.genersoft.iot.vmp.conf.GlobalResponseAdvice 类改变了 sse 响应体的数据结构，导致前端无法正确解析 sse 数据，调试后未发现 GlobalResponseAdvice 如何修改的 sse 数据结构，故根据 sse 消息体结构自定义实现了 sse 连接
|
2023-11-06 20:34:58 +08:00 |
|
648540858
|
33d4107d0c
|
修复启动时如果上机平台不可连接的导致的持续报错
|
2023-09-06 10:21:42 +08:00 |
|
xubinbin
|
e8b2ca4686
|
将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产；剔除jwt token中包含的password和roleId，防止密码泄露。
|
2023-08-31 16:39:18 +08:00 |
|
朱俊杰
|
49a8a08c94
|
捕获启动过程中发送sip异常导致的启动失败
|
2023-08-24 17:12:39 +08:00 |
|
AlphaWu
|
b5ccb1636f
|
修正Database拼写错误。
|
2023-08-20 15:50:24 +08:00 |
|
chenzhangyue
|
dd2ae65786
|
修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted
|
2023-08-10 20:00:43 +08:00 |
|
648540858
|
988dc36fa5
|
重构点播，回放，下载时ssrc不一致以及TCP主动播放的逻辑
|
2023-08-04 15:47:56 +08:00 |
|
648540858
|
a01086fe1c
|
修复tcp主动录像回放时ssrc不一致时点播失败的问题
|
2023-08-03 15:50:15 +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
|
ef5018de2d
|
修复合并错误
|
2023-07-13 14:57:30 +08:00 |
|
648540858
|
668dc8f0dd
|
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
|
04e7f48fde
|
合并主线的发流端口管理逻辑
|
2023-07-10 14:30:59 +08:00 |
|
648540858
|
b64f320805
|
优化发流逻辑
|
2023-07-01 18:10:33 +08:00 |
|
648540858
|
f62bf7b2c6
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.java
# 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/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
|
2023-06-29 09:52:05 +08:00 |
|
648540858
|
bfae9780f7
|
增加流关闭时的处理
|
2023-06-28 20:32:48 +08:00 |
|
648540858
|
def56793ba
|
增加上级推流和停止推流的通知
|
2023-06-28 16:52:27 +08:00 |
|
648540858
|
155838ce2e
|
优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895
|
2023-06-22 22:35:35 +08:00 |
|
648540858
|
a7bf29a4cb
|
恢复默认值
|
2023-06-20 14:17:44 +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
|
534be3f580
|
支持redis消息强制关闭流
|
2023-06-07 20:58:35 +08:00 |
|
648540858
|
50240b4e39
|
移除手动配置mybatis下划线转驼峰
|
2023-05-30 10:32:08 +08:00 |
|
648540858
|
57192a49d1
|
修复引入的错误Order
|
2023-05-29 20:18:42 +08:00 |
|
Kairlec
|
ca103731c7
|
fix response content-type is not set if access without access token
|
2023-05-15 16:26:37 +08:00 |
|
xubinbin
|
b726dc9753
|
"@schedule"是Spring框架提供的一种定时任务执行机制，默认情况下它是单线程执行，项目中多次使用fixedRate按指定频率执行任务(不管前面任务是否已经完成)，在同时执行多个定时任务时可能会出现阻塞和性能问题，为了解决这种单线程瓶颈问题，将定时任务的执行机制改为支持多线程
|
2023-05-10 15:38:22 +08:00 |
|
648540858
|
e2f9ee8f7b
|
修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题
|
2023-05-06 17:40:57 +08:00 |
|
648540858
|
3fe47021b9
|
优化国标规范，参考国标文档中-点播外域设备媒体流SSRC处理方式，上级点播时自定义ssrc，不适用上级携带的ssrc，也避免上级兼容性差，不携带ssrc的问题，可通过配置关闭此特性
|
2023-05-04 14:21:58 +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
|
cf1696e0d6
|
修复使用jwt后导致的用户管理功能异常
|
2023-04-15 09:03:41 +08:00 |
|
648540858
|
cef04a8b5a
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-04-13 17:29:17 +08:00 |
|
648540858
|
5c5699ae11
|
redis优化
|
2023-04-13 17:14:04 +08:00 |
|
648540858
|
15f718bd64
|
修复空指针异常 #813
|
2023-04-11 11:23:36 +08:00 |
|
648540858
|
403f1e16a3
|
合并优化ssrc存储结构
|
2023-04-08 15:36:59 +08:00 |
|
648540858
|
8c4922cbe1
|
Merge branch '2.6.7' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2023-04-08 15:29:15 +08:00 |
|
648540858
|
0858f7995b
|
优化ssrc存储结构，避免因为大量ssrc存在MediaServer中导致redis读取超时
|
2023-04-08 15:22:18 +08:00 |
|
648540858
|
3dfbc843ad
|
修复关闭接口鉴权时，处于忽略地址中的接口不可用的问题
|
2023-04-03 10:53:54 +08:00 |
|
648540858
|
4f2d47385d
|
去除redis工具类直接使用RedisTemplate存取数据
|
2023-04-03 10:26:55 +08:00 |
|
648540858
|
056162d742
|
去除测试代码
|
2023-03-31 09:03:14 +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
|
91bfbc36f1
|
优化设备注册，支持到期续订，优化国标级联到期续订。
|
2023-03-28 14:09:41 +08:00 |
|