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 |
|
junleea
|
d9e622e37b
|
添加定时任务功能，及定时任务处理
|
2024-11-06 15:13:06 +08:00 |
|
junleea
|
9f21e7c1d5
|
Merge branch 'refs/heads/feat-realvp'
|
2024-11-06 12:05:01 +08:00 |
|
junleea
|
e651a844f5
|
修复多连接查看实时视频不正常关闭问题
|
2024-11-06 12:04:51 +08:00 |
|
junleea
|
fa554de402
|
Merge branch 'refs/heads/feat-realvp'
|
2024-11-06 12:00:10 +08:00 |
|
junleea
|
3a7590ae8d
|
修复多连接查看实时视频不正常关闭问题
|
2024-11-06 11:59:53 +08:00 |
|
junleea
|
6ba661c0f8
|
离线聊天消息使用redis发布订阅模式
|
2024-10-29 18:53:08 +08:00 |
|
junleea
|
e1bae50a04
|
修复实时查看redis发布订阅模式
|
2024-10-28 21:18:54 +08:00 |
|
junleea
|
f53af2c097
|
修复实时查看
|
2024-10-28 21:11:44 +08:00 |
|
junleea
|
9a234f50fb
|
修复实时查看
|
2024-10-28 21:01:23 +08:00 |
|
junleea
|
81e0c2a5bf
|
修复实时查看
|
2024-10-28 20:56:26 +08:00 |
|
junleea
|
1ce27b543d
|
设备实时图片通过redis发布订阅模式实现，修改redis参数
|
2024-10-28 17:17:23 +08:00 |
|
junleea
|
7770efd21a
|
修复视频查询初未设置情况
|
2024-10-25 18:45:04 +08:00 |
|
junleea
|
b5f01572cc
|
添加修改群信息功能
|
2024-10-25 18:23:58 +08:00 |
|
junleea
|
f17467d451
|
修复查询视频时间范围错误
|
2024-10-25 18:04:08 +08:00 |
|
junleea
|
6545dc72ac
|
Merge branch 'refs/heads/feature-im'
|
2024-10-18 19:56:58 +08:00 |
|
junleea
|
6cded474a0
|
im修复用户在线及群在线消息转发
|
2024-10-18 19:56:49 +08:00 |
|
junleea
|
756b7af9fe
|
Merge branch 'refs/heads/feature-cid'
|
2024-10-08 13:57:12 +08:00 |
|
junleea
|
15507c6cfc
|
cid 删除控制台输出
|
2024-10-08 13:57:03 +08:00 |
|
junleea
|
e7898bdd9b
|
Merge branch 'refs/heads/feature-im'
# Conflicts:
# service/imService.go
|
2024-10-07 17:05:30 +08:00 |
|
junleea
|
6d45baa4bd
|
拒绝与同意用户加入群聊
|
2024-10-07 17:03:45 +08:00 |
|
junleea
|
bb901e8f40
|
Merge branch 'refs/heads/feature-im'
|
2024-10-07 16:35:33 +08:00 |
|
junleea
|
0543b82a8f
|
修改添加管理员踢群成员功能,修改获取加入群聊请求列表
|
2024-10-07 16:35:27 +08:00 |
|
junleea
|
fa1753389e
|
Merge branch 'refs/heads/feature-im'
|
2024-10-07 16:23:43 +08:00 |
|
junleea
|
27a8561448
|
修改添加管理员踢群成员功能
|
2024-10-07 16:23:35 +08:00 |
|
junleea
|
1e559ac29d
|
Merge branch 'refs/heads/feature-im'
|
2024-10-07 15:59:06 +08:00 |
|
junleea
|
a1247d9ca4
|
添加获取群成员，添加管理员踢群成员功能
|
2024-10-07 15:58:58 +08:00 |
|
junleea
|
f9b62f6618
|
添加修改用户信息功能
|
2024-10-06 16:35:54 +08:00 |
|
junleea
|
53e04c2fc2
|
获取用户信息功能
|
2024-10-06 15:43:30 +08:00 |
|
junleea
|
a13bcd437d
|
获取用户信息功能
|
2024-10-06 15:30:38 +08:00 |
|
junleea
|
a717b4099b
|
添加拒绝好友请求接口
|
2024-10-04 11:30:53 +08:00 |
|
junleea
|
a7742b304e
|
添加redis bitmap设置，修改消息群消息发送
|
2024-10-01 20:45:31 +08:00 |
|
junleea
|
27cd64640f
|
修改跨域处理
|
2024-09-27 21:13:56 +08:00 |
|
junleea
|
56cab15a73
|
修改跨域处理
|
2024-09-27 20:52:14 +08:00 |
|
junleea
|
56514b5e0d
|
使用配置文件读取配置
|
2024-09-22 13:59:33 +08:00 |
|
junleea
|
75fdf7c1d8
|
文件上传功能
|
2024-08-30 22:31:08 +08:00 |
|
junleea
|
27972c1619
|
文件上传功能、删除功能
|
2024-08-30 21:46:28 +08:00 |
|
junleea
|
d33597766a
|
download file
|
2024-08-30 15:47:57 +08:00 |
|
junleea
|
9e5ca5e897
|
download file
|
2024-08-30 15:41:51 +08:00 |
|
junleea
|
5228a4270e
|
download file
|
2024-08-30 15:40:45 +08:00 |
|
junleea
|
a295d750cc
|
upload type
|
2024-08-30 15:28:39 +08:00 |
|
junleea
|
c943ced9f6
|
upload type
|
2024-08-30 15:26:39 +08:00 |
|
junleea
|
db726b078e
|
upload type
|
2024-08-30 15:13:23 +08:00 |
|
junleea
|
0b503558ef
|
upload type
|
2024-08-30 15:03:33 +08:00 |
|
junleea
|
743ac6a55f
|
upload type
|
2024-08-30 14:48:19 +08:00 |
|
junleea
|
8189048e5b
|
添加文件上传及下载功能
|
2024-08-30 11:28:27 +08:00 |
|
junleea
|
fc9a1b3402
|
Merge branch 'refs/heads/feature-im-gitea'
|
2024-08-20 15:55:00 +08:00 |
|
junleea
|
ea6a87bb33
|
添加加入群组请求
|
2024-08-20 15:25:13 +08:00 |
|
junleea
|
44e2240637
|
Merge branch 'refs/heads/feature-im-gitea'
|
2024-08-20 10:27:51 +08:00 |
|
junleea
|
a83c31e3fc
|
添加群搜索
|
2024-08-20 10:27:42 +08:00 |
|
junleea
|
b726b2c8f4
|
Merge branch 'refs/heads/feature-im-gitea'
|
2024-08-16 16:03:29 +08:00 |
|
junleea
|
b1fec34718
|
群组管理及发送群聊消息，用户设置
|
2024-08-16 15:25:10 +08:00 |
|
junleea
|
5cd0a0a208
|
Merge branch 'refs/heads/feature-im-gitea'
|
2024-08-09 20:59:15 +08:00 |
|
junleea
|
4c20d06327
|
获取请求用户
|
2024-08-09 20:58:56 +08:00 |
|
junleea
|
1a9a8ecefc
|
Merge branch 'refs/heads/feature-im-gitea'
|
2024-08-09 20:53:28 +08:00 |
|
junleea
|
fe9a0b3caf
|
获取请求用户
|
2024-08-09 20:52:47 +08:00 |
|
junleea
|
700f9a474d
|
Merge branch 'refs/heads/fearture-realvp'
|
2024-08-08 20:57:48 +08:00 |
|
junleea
|
25e5ba0d21
|
修复查看实时视频问题
|
2024-08-08 20:57:23 +08:00 |