Commit Graph

130 Commits (dev/数据库统合)

Author SHA1 Message Date
648540858 6eb8249f0a 更新README 2024-12-09 15:46:40 +08:00
648540858 5b393b7273 提供打包方便使用 2024-11-15 17:09:29 +08:00
648540858 d5eb13192e 更新README 2024-11-04 17:02:01 +08:00
648540858 a59854e244 更新前端截图 2024-10-12 10:42:30 +08:00
648540858 71fe60d885 更新README 2024-04-11 15:34:56 +08:00
648540858 62f716be9c 添加idea logo 2024-04-03 15:04:33 +08:00
648540858 5743917439 添加idea logo 2024-04-03 15:03:49 +08:00
648540858 f1fed36cf3 更新README 2024-03-28 10:18:38 +08:00
648540858 f95ca2248e 更新readme 2024-03-08 09:39:19 +08:00
648540858 509d9b3cbb Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
2024-02-27 10:22:13 +08:00
648540858 f6c48588da 支持支持主码流子码流切换 2024-02-22 17:22:28 +08:00
648540858 7d3cbb8253 Merge branch 'wvp-28181-2.0' into main-dev 2023-07-24 09:42:32 +08:00
648540858 7d7528cc27 更新readme 2023-07-21 15:55:49 +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 8d6de72429 优化日志 2023-06-02 16:40:19 +08:00
648540858 a91fe69f76 添加文档 2023-05-29 09:40:36 +08:00
648540858 30ae9e929f 合并主线 2023-05-25 17:28:57 +08:00
648540858 cf48bd95ff 更新文档 2023-05-12 12:40:22 +08:00
648540858 b498e2fcf2 更新文档 2023-05-12 12:36:38 +08:00
648540858 d6262acf6a 更新readme 2023-04-20 16:42:44 +08:00
648540858 25b400cbe3 更新readme 2023-04-20 14:38:22 +08:00
648540858 cf1696e0d6 修复使用jwt后导致的用户管理功能异常 2023-04-15 09:03:41 +08:00
648540858 71030ca6bc 更新readme 2023-04-13 17:50:33 +08:00
648540858 72f59e1cd4 增加知识星球 2023-04-13 17:28:54 +08:00
648540858 b4048fbe80 合并开源主线 2023-04-04 09:09:07 +08:00
648540858 efbc3a31c0 支持登录返回值中携带token 2023-03-15 22:56:47 +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 b010e63dc0 更新文档 2023-02-09 14:36:04 +08:00
648540858 dea44dcd78 Merge branch 'wvp-28181-2.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.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
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
2023-01-13 16:21:17 +08:00
648540858 e2944938cd 更新README 2023-01-12 18:05:29 +08:00
648540858 e429c9f5a7 更新README 2023-01-10 17:05:20 +08:00
648540858 4babf2b47b 更新README 2023-01-10 16:26:52 +08:00
648540858 dfb87c7685 合并主线 2022-11-25 10:58:26 +08:00
648540858 f9ae4cfdbe 更新readme 2022-10-18 22:40:43 +08:00
648540858 cd626ac2d7 更新readme 2022-10-18 17:06:37 +08:00
648540858 a88518f8b5 更新文档 2022-08-09 10:58:38 +08:00
648540858 af9dd1800b 更新readme 2022-08-09 10:50:02 +08:00
648540858 9ce6045f56 更新README 2022-06-14 17:28:56 +08:00
648540858 dc6769664e 兼容不规范的时间格式iso8601格式;升级fastjson版本 2022-05-26 12:10:46 +08:00
648540858 d571e44040 去除过时注释 2022-05-13 15:45:02 +08:00
648540858 a8097c35da 更新readme 2022-05-07 14:44:00 +08:00
648540858 92421b46cc 支持关闭地图功能,添加授权声明 2022-04-22 16:55:46 +08:00
648540858 d36920c699 添加自动拉起未推流设备的控制开关 2022-04-18 10:52:38 +08:00
648540858 fcf8c40150 默认推流通道始终在线 2022-04-11 14:59:31 +08:00
648540858 fb977546f3 更新README 2022-03-28 17:50:00 +08:00
648540858 cec21940f7 更新README 2022-03-28 15:40:07 +08:00
648540858 a2b873c14e 更新README 2022-03-28 15:39:58 +08:00
648540858 1f39c6c62f readme更新 2022-03-04 10:32:28 +08:00
648540858 b10a65483d 去除lombok,readme更新 2022-03-04 10:30:55 +08:00
648540858 f5640fddb7 优化国标级联的目录订阅 2022-03-02 11:48:20 +08:00