Commit Graph

374 Commits

Author SHA1 Message Date
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 a621cb5ad2 Merge branch 'refs/heads/feat-user-sync' 2024-12-15 15:08:26 +08:00
junleea f720eb509b 修复循环引用问题 2024-12-15 15:08:20 +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 62d336e1c0 修改用户数据同步配置文件读取及配置方式 2024-12-15 14:54:43 +08:00
junleea 71783fe15f 添加用户数据同步确认部分 2024-12-13 20:26:39 +08:00
junleea 3571772bb1 添加用户数据同步确认部分 2024-12-13 20:21:05 +08:00
junleea 8796ef784b 完善用户数据同步,待完善同步确认 2024-12-12 21:08:53 +08:00
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