648540858
|
97a87542a6
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# pom.xml
|
2024-01-22 10:37:13 +08:00 |
|
648540858
|
9a89cf81b8
|
添加多数据源配置实例
|
2024-01-22 00:33:04 +08:00 |
|
648540858
|
a2cac5ca12
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# pom.xml
|
2024-01-04 18:34:46 +08:00 |
|
648540858
|
6120e6bd7b
|
添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送
|
2024-01-04 17:26:47 +08:00 |
|
648540858
|
67d1ff0d26
|
Merge branch 'wvp-28181-2.0' into feature/record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-12-18 14:23:48 +08:00 |
|
648540858
|
df3f5795e7
|
修复非鉴权接口的跨域失败问题
|
2023-12-15 17:45:47 +08:00 |
|
648540858
|
eac72fd06e
|
优化日志打印样式
|
2023-12-13 14:37:08 +08:00 |
xubinbin
|
5a9621840c
|
修改控制台输出日志格式，增加显示线程名称，调用类的全类路径以及日子输出行的行号。
|
2023-12-12 16:37:06 +08:00 |
|
648540858
|
ffc8a530f3
|
修复定时录像删除
|
2023-11-24 10:47:33 +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
|
a6fb1cdb74
|
修复Web页面播放国标录像无声音的问题
|
2023-09-11 16:17:29 +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
|
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 |
|
648540858
|
ef5018de2d
|
修复合并错误
|
2023-07-13 14:57:30 +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
|
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
|
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
|
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 |