Commit Graph

65 Commits (dev/数据库统合)

Author SHA1 Message Date
648540858 d5eb13192e 更新README 2024-11-04 17:02:01 +08:00
Shynur bdd17ce48e
Update compile.md
修复如 https://doc.wvp-pro.cn/#/_content/introduction/compile?id=_54-%e7%94%9f%e6%88%90war 所示的渲染错误
2024-11-01 09:58:27 +08:00
648540858 7c41b38747 新增宇视科技设备接入文档 2024-10-31 11:21:53 +08:00
Klu5ure 22d6350778 修正拼写错误:重命名 ZLMMediaServerStatusManger 为 ZLMMediaServerStatusManager,node_manger.md 为 node_manager.md 2024-10-21 18:12:16 +08:00
648540858 38f476c86b 调整配置文件详情名称便于新手理解 2024-10-13 20:54:33 +08:00
648540858 a59854e244 更新前端截图 2024-10-12 10:42:30 +08:00
648540858 3078162c58 优化文档, 优化notify-catalog大并发处理 2024-10-11 15:24:46 +08:00
648540858 028274a088 补充文档 2024-10-10 15:55:29 +08:00
648540858 3f85c66328 补充文档, 修复通道查询错误 2024-10-10 14:48:53 +08:00
rongzedong 72f7e1a1d1
Update deployment.md
增加wvp的默认账号密码。有人反馈,之前文档里并未提及。
2024-09-02 16:22:17 +08:00
648540858 26e2e8b2a3 更新文档 2024-06-25 17:03:28 +08:00
648540858 da2662ab27 国标28181-支持自动识别网卡监听,可以不再配置SIP.IP 2024-06-13 18:10:01 +08:00
648540858 fe55920dab 更新文档 2024-04-10 23:17:27 +08:00
648540858 e9a7e74a6b 添加语音对讲文档 2024-03-08 15:07:53 +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
AlphaWu b5ccb1636f 修正Database拼写错误。 2023-08-20 15:50:24 +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
dodu2014 f60494d641
Update config.md
修复文档错别字
2023-08-07 09:55:19 +08:00
648540858 c014a90cc6 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/ByeRequestProcessor.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
2023-06-29 16:08:05 +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 6fcff0567e doc去除cdn依赖 2023-06-28 09:15:07 +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
648540858 3350b65259 添加文档依赖,去除cdn依赖 2023-06-20 15:25:56 +08:00
648540858 8d6de72429 优化日志 2023-06-02 16:40:19 +08:00
648540858 50240b4e39 移除手动配置mybatis下划线转驼峰 2023-05-30 10:32:08 +08:00
648540858 a91fe69f76 添加文档 2023-05-29 09:40:36 +08:00
648540858 5639719879 Merge branch 'postgresql' into wvp-28181-2.0 2023-05-29 09:25:45 +08:00
648540858 30ae9e929f 合并主线 2023-05-25 17:28:57 +08:00
648540858 e3225d4844 本地集成人大金仓连接jar 2023-05-17 10:29:45 +08:00
648540858 cf48bd95ff 更新文档 2023-05-12 12:40:22 +08:00
648540858 b498e2fcf2 更新文档 2023-05-12 12:36:38 +08:00
648540858 db2ccfedfa 优化notify性能,增加notify超出处理能力时直接回复错误码,不做处理。 2023-04-19 11:09:26 +08:00
648540858 b4048fbe80 合并开源主线 2023-04-04 09:09:07 +08:00
648540858 85c5fafda5 更新前后端分离部署文档 2023-03-16 09:34:20 +08:00
648540858 5cd3e0e919 更新前后端分离部署文档 2023-03-16 09:32:21 +08:00
648540858 71cf9852ec 更新前后端分离部署文档 2023-03-16 09:18:27 +08:00
648540858 efbc3a31c0 支持登录返回值中携带token 2023-03-15 22:56:47 +08:00
648540858 a7c3cf5316 优化跨域配置,支持同域的前后端分离部署 2023-03-05 09:53:26 +08:00
648540858 420dbce900 Merge branch 'main' into 级联
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.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/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
2023-02-22 18:14:53 +08:00
648540858 019d95cfba Merge branch 'wvp-28181-2.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
2023-02-22 18:08:25 +08:00
hujian 9dcae6e4bf 替换前端编译npm源地址为https://registry.npmmirror.com 2023-02-16 23:08:34 +08:00
hujian f7b67e28cc 替换前端编译npm源地址 2023-02-16 23:04:33 +08:00
648540858 a209d17390 Merge branch 'wvp-28181-2.0' 2023-02-14 11:29:44 +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 bb49f1f0d6 添加文档 2023-02-10 15:33:00 +08:00
648540858 b010e63dc0 更新文档 2023-02-09 14:36:04 +08:00