Commit Graph

86 Commits (f36eb7ebebf5b4bbe79d27636d4a4ddb49067273)

Author SHA1 Message Date
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
AlphaWu b5ccb1636f 修正Database拼写错误。 2023-08-20 15:50:24 +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 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
xiaoQQya 153523a32f perf(config): 补全 all-application.yml 配置文件 2023-07-17 15:51:09 +08:00
dsk 7749ea3421 新增接口超时时间配置,修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException 2023-06-25 16:16:40 +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 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 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 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 166272ad11 增加数据库自动更新开关 2023-02-01 15:54:03 +08:00
lin 2d492c5b6b 国标回放超时时间使用点播超时一样的字段 2023-02-01 10:09:01 +08:00
648540858 ebcd2320a9 修复推流鉴权 2023-01-13 11:19:30 +08:00
648540858 fd3a4ef472 修复国标录像回放以及录像下载 2023-01-06 11:43:27 +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 2de4c322f6 去除对redis key过期事件的使用;重构国标级联的注册保活 2022-08-31 11:29:13 +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