Commit Graph

68 Commits (5777a8e93ca92f12370f7c4af8e28c295934bb25)

Author SHA1 Message Date
648540858 0f4b5eed7d 优化apikey列表样式 2024-04-10 23:09:28 +08:00
leesam 16b7e4a7ef Merge branch 'refs/heads/master' into develop-add-api-key 2024-04-10 20:49:44 +08:00
648540858 54b878d2e1 优化代码,升级版本号为2.7.1 2024-04-09 22:43:45 +08:00
648540858 b1b6fae22c Merge branch 'master' into dev/zlm
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
2024-04-09 10:35:11 +08:00
ancienter 25ff2fc4ef
Merge branch '648540858:master' into develop-add-api-key 2024-04-09 09:52:23 +08:00
648540858 48351c875e 国标级联支持制定200OK中sdp的IP 2024-04-08 18:13:15 +08:00
648540858 8b90fade9e 支持使用abl接收国标流 2024-04-02 00:05:09 +08:00
648540858 181bf76862 优化节点在线状态 2024-03-20 18:54:39 +08:00
leesam 76208975bf [add]支持其他平台通过ApiKey调用系统相关接口 2024-03-19 16:53:01 +08:00
648540858 1768565ce0 优化媒体节点服务的代码结构 2024-03-18 23:42:18 +08:00
648540858 0c327b3a25 添加sql缺失的字段 2024-03-08 15:37:17 +08:00
648540858 f6c48588da 支持支持主码流子码流切换 2024-02-22 17:22:28 +08:00
648540858 a23c1aca40 合并269分支修复的内容 2024-01-10 19:14:11 +08:00
648540858 81a32fdb47 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-10 19:12:06 +08:00
648540858 29f7a6b6eb 修复多wvp模式推流时信息存储错误 2024-01-10 18:55:14 +08:00
648540858 9d61a93077 优化数据库sql文件组织方式 2024-01-03 15:50:47 +08:00
648540858 f36eb7ebeb 添加打包文件 2023-11-02 14:17:20 +08:00
648540858 84c78be91c sql重命名为数据库 2023-11-01 15:36:35 +08:00