Commit Graph

224 Commits

Author SHA1 Message Date
junleea 68d9082f96 Merge branch 'refs/heads/feat-video-stream' 2024-12-26 13:37:09 +08:00
junleea 586356c18a 添加视频流接口 2024-12-26 13:36:51 +08:00
junleea 0f37e738a7 添加视频流接口 2024-12-26 13:30:53 +08:00
junleea edef1fd7e0 Merge branch 'refs/heads/feat-conf-redis' 2024-12-21 18:36:17 +08:00
junleea ec0c152032 video option只保留10条 2024-12-21 18:36:10 +08:00
junleea 3ab7556b38 Merge branch 'refs/heads/feat-conf-redis' 2024-12-21 17:17:00 +08:00
junleea c5258b3fb2 添加redis查询功能 2024-12-21 17:16:38 +08:00
junleea be079f9b31 Merge branch 'refs/heads/feat-video' into release 2024-12-17 18:58:24 +08:00
junleea 39cb9bc91f Merge branch 'refs/heads/feat-video' 2024-12-17 18:31:49 +08:00
junleea a803991a42 修改删除逻辑,添加逻辑删除回归 2024-12-17 18:31:14 +08:00
junleea 4128347eab Merge branch 'refs/heads/feat-video' 2024-12-17 17:57:35 +08:00
junleea e9f089c6a2 修改视频查询及删除逻辑 2024-12-17 17:57:26 +08:00
junleea 7b93f3a801 Merge branch 'refs/heads/feat-video' 2024-12-17 17:16:32 +08:00
junleea d8967012d3 添加视频根据id查询 2024-12-17 17:16:22 +08:00
junleea 8187c36585 Merge branch 'refs/heads/feat-user-sync' 2024-12-15 16:14:30 +08:00
junleea 80602dd4c4 添加日志输出 2024-12-15 16:14:25 +08:00
junleea c5dcd895f4 Merge branch 'refs/heads/feat-user-sync' 2024-12-15 15:44:07 +08:00
junleea e9a95012bd 修复部分错误,添加请求数据及确认 2024-12-15 15:43:57 +08:00
junleea a05d3b3c7f Merge branch 'refs/heads/feat-user-sync' 2024-12-15 15:10:46 +08:00
junleea f10e46761b 修复循环引用问题 2024-12-15 15:10:41 +08:00
junleea 1bb639504d Merge branch 'refs/heads/feat-user-sync' 2024-12-15 15:06:20 +08:00
junleea 64069034db 修复循环引用问题 2024-12-15 15:06:14 +08:00
junleea eb7a57c215 Merge branch 'refs/heads/feat-user-sync' 2024-12-15 14:55:01 +08:00
junleea 3571772bb1 添加用户数据同步确认部分 2024-12-13 20:21:05 +08:00
junleea 8796ef784b 完善用户数据同步,待完善同步确认 2024-12-12 21:08:53 +08:00
junleea 29e8151420 用户数据同步部分 2024-12-11 17:43:44 +08:00
junleea 65f98fe9de 修复回调接口问题 2024-12-06 19:33:52 +08:00
junleea 27ba32888d Merge branch 'refs/heads/feat-tool' 2024-11-30 11:15:54 +08:00
junleea a730599641 修复监控的设备时间未修改导致每天都发送邮件通知 2024-11-30 11:15:43 +08:00
junleea 4275ef7593 Merge branch 'refs/heads/feat-tool' 2024-11-27 11:28:32 +08:00
junleea 268d646d71 修复发送邮件错误导致程序停止 2024-11-27 11:28:23 +08:00
junleea 3be19bf29c Merge branch 'refs/heads/feat-tool' 2024-11-26 10:58:32 +08:00
junleea 16ab36261e 修复monitor 时间问题 2024-11-26 10:58:07 +08:00
junleea f10e583aa8 Merge branch 'refs/heads/feat-tool' 2024-11-24 15:50:18 +08:00
junleea a3eff32f47 修复monitor问题 2024-11-24 15:50:11 +08:00
junleea 28edd048ed Merge branch 'refs/heads/feat-tool' 2024-11-24 15:19:59 +08:00
junleea b2053f14e4 修复monitor问题 2024-11-24 15:19:37 +08:00
junleea 35823bee30 Merge branch 'refs/heads/feat-tool'
# Conflicts:
#	proto/conf.go
2024-11-24 15:10:47 +08:00
junleea cf7d5d7992 Merge branch 'refs/heads/feat-cid' 2024-11-23 17:46:49 +08:00
junleea 32b108c314 定时任务redis更新 2024-11-23 17:46:13 +08:00
junleea b83195da91 监控接口不进行登录检测,修改接口错误返回 2024-11-07 15:52:55 +08:00
junleea 42942e8876 添加服务器、设备监控功能,邮件通知;添加服务端口及监控配置文件更改功能 2024-11-07 15:46:12 +08:00
junleea 021c475720 Merge branch 'refs/heads/feat-cid' 2024-11-06 21:56:35 +08:00
junleea eda29d09a4 删除定时任务日志输出 2024-11-06 21:56:28 +08:00
junleea 73e3db98db Merge branch 'refs/heads/feat-realvp' 2024-11-06 21:53:03 +08:00
junleea 65ac4802f5 修复多用户查看实时视频,设备关闭后连接未正常关闭问题 2024-11-06 21:52:57 +08:00
junleea 542935cb8f Merge branch 'refs/heads/feat-realvp' 2024-11-06 21:41:13 +08:00
junleea 54b67296bd 修复多用户查看实时视频,设备关闭后连接未正常关闭问题 2024-11-06 21:41:02 +08:00
junleea 69f04c09a6 修复定时任务功能 2024-11-06 21:25:57 +08:00
junleea 66ec0ff947 修复定时任务功能 2024-11-06 21:20:12 +08:00