Commit Graph

459 Commits

Author SHA1 Message Date
junleea f60328be98 Merge branch 'refs/heads/feat-video' 2024-12-11 17:45:59 +08:00
junleea 1b9cf8b3d3 修复video按时间查询问题 2024-12-11 17:45:52 +08:00
junleea 29e8151420 用户数据同步部分 2024-12-11 17:43:44 +08:00
junleea 4918c54fc6 添加用户数据同步接口及,节点获取数据及系统定时任务添加 2024-12-11 16:10:56 +08:00
junleea 65f98fe9de 修复回调接口问题 2024-12-06 19:33:52 +08:00
junleea 9755d73b86 权限拦截部分 2024-12-04 19:23:57 +08:00
junleea 34027a1763 拦截部分 2024-12-04 19:19:13 +08:00
junleea a88002e3d0 定时任务部分bug 2024-12-04 19:16:13 +08:00
junleea 61b58ec546 定时任务部分bug 2024-12-04 19:13:38 +08:00
junleea ae38db28f7 定时任务部分bug 2024-12-04 19:09:08 +08:00
junleea c7dd994543 添加功能部分用户权限 2024-12-04 18:39:57 +08:00
junleea 8607efd319 添加用户权限功能权限 2024-12-04 18:23:49 +08:00
junleea beaecbbb01 添加日志保存处理及定时清除,添加通用系统内定时任务执行 2024-12-04 16:59:30 +08:00
junleea 785779d0c5 添加超级token权限 2024-12-04 16:07:51 +08:00
junleea 3135efa1b0 Merge branch 'refs/heads/master' into release
# Conflicts:
#	dao/user.go
2024-12-04 15:25:11 +08:00
junleea db7295465c Merge branch 'refs/heads/feat-user' 2024-12-04 14:58:09 +08:00
junleea 07cd44e62d 修复用户权限问题 2024-12-04 14:58:03 +08:00
junleea 44e12f0b65 Merge branch 'refs/heads/feat-user' 2024-12-04 14:55:43 +08:00
junleea 601e69a384 修复用户权限问题 2024-12-04 14:55:35 +08:00
junleea 4e9e2aa7fc Merge branch 'refs/heads/feat-user'
# Conflicts:
#	service/userService.go
2024-12-04 14:51:02 +08:00
junleea 92e7c94c62 修复用户权限问题 2024-12-04 14:48:25 +08:00
junleea f360bd750d Merge branch 'refs/heads/feat-user' 2024-12-04 14:39:35 +08:00
junleea be11fcbcef 修复用户权限问题 2024-12-04 14:39:29 +08:00
junleea 8e5ecc98ce 删除debug输出 2024-11-30 11:19:16 +08:00
junleea 8d0617c74e Merge branch 'refs/heads/master' into release 2024-11-30 11:16:16 +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 3b6b3612fb Merge branch 'refs/heads/master' into release 2024-11-27 11:29:16 +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 7bfe7b5855 Merge branch 'refs/heads/master' into release 2024-11-26 10:58:49 +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 3cb71c1bbf Merge branch 'refs/heads/master' into release 2024-11-24 15:50:36 +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 8daa1612c1 Merge branch 'refs/heads/master' into release 2024-11-24 15:27:15 +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 fec81d2bea 添加不需要token验证url 2024-11-24 15:04:19 +08:00
junleea d6b1788ae5 Merge branch 'refs/heads/master' into release
# Conflicts:
#	dao/cid.go
2024-11-24 14:56:22 +08:00
junleea 4bc84531d4 Merge branch 'refs/heads/feat-cid' 2024-11-23 18:14:41 +08:00
junleea d302535608 cid log查找只查最近30条 2024-11-23 18:14:35 +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 f15a1d605b 服务默认端口 2024-11-07 15:55:06 +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