wangchuxiao
|
782ad07940
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d57729d3d7
|
fix bug
|
2 years ago |
|
wangchuxiao
|
6553ada66f
|
add set client init
|
2 years ago |
Gordon
|
c0b49ff219
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
d20c89ba21
|
merge shichuang 2 v2.3.0release
|
2 years ago |
|
wangchuxiao
|
ee577cae4c
|
add conversationCache
|
2 years ago |
|
Gordon
|
ed5b215bbb
|
pc terminal can login at same time
|
2 years ago |
skiffer-git
|
9f002172db
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
5d661f2fc6
|
add user register IP
|
2 years ago |
|
wangchuxiao
|
840e08fc8a
|
Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
761b8c40d6
|
conversation cache function
|
2 years ago |
|
Gordon
|
40b7314f6d
|
model add update time
|
2 years ago |
|
wangchuxiao
|
5c3a43f602
|
fix bug
|
2 years ago |
|
skiffer-git
|
85a52f5d6b
|
get grpc conn from config
|
2 years ago |
|
Gordon
|
97b1a774fb
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
12a4c12753
|
notification
|
2 years ago |
|
wangchuxiao
|
2016a1656b
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
3f74022142
|
Merge branch 'main' into del
|
2 years ago |
|
wangchuxiao
|
ad1015c8b0
|
fix code
|
2 years ago |
|
wangchuxiao
|
d666f0245d
|
Merge pull request #267 from ouyangshi/del
封禁用户列表
|
2 years ago |
|
wangchuxiao
|
7f252909fc
|
fix code
|
2 years ago |
欧阳氏
|
7b9d0b4f1f
|
封禁用户列表
|
2 years ago |
|
wangchuxiao
|
1747ae8984
|
fix code
|
2 years ago |
|
wangchuxiao
|
dfee8891d3
|
fix code
|
2 years ago |
|
wangchuxiao
|
cb10df7c9f
|
fix code
|
2 years ago |
|
wangchuxiao
|
919e2543ca
|
fix code
|
2 years ago |
|
wangchuxiao
|
b705ac24fa
|
fix code
|
2 years ago |
|
wangchuxiao
|
4ec255917d
|
Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
|
2 years ago |
|
wangchuxiao
|
9b86a18752
|
Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/ip_model.go
|
2 years ago |
|
skiffer-git
|
630fef29a2
|
Restrict user login with IP
|
2 years ago |
|
wangchuxiao
|
05d45c94d5
|
ip limit
|
2 years ago |
|
skiffer-git
|
8b857f9980
|
Restrict user login with IP
|
2 years ago |
|
wangchuxiao
|
7d1707ca7c
|
fix log
|
2 years ago |
|
skiffer-git
|
5e3a3c61f3
|
Set the token activity time to five minutes ago
|
2 years ago |
|
skiffer-git
|
073b6d200a
|
Set the token activity time to five minutes ago
|
2 years ago |
|
wangchuxiao
|
d5239365be
|
hide jwt not active yet
|
2 years ago |
|
欧阳氏
|
ac7f905248
|
完善 用户注册 用户更新
|
2 years ago |
|
欧阳氏
|
39606248a1
|
邀请码功能
1、新增邀请码功能
needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
|
2 years ago |
|
skiffer-git
|
4e5c1606f3
|
log
|
2 years ago |
|
wangchuxiao
|
9b130ae56c
|
fix log
|
2 years ago |
|
wangchuxiao
|
a48b2e9edb
|
cms
|
2 years ago |
|
wangchuxiao
|
e4bbd57c41
|
fix log
|
2 years ago |
|
wangchuxiao
|
69008e08be
|
cms api rpc
|
2 years ago |
|
wangchuxiao
|
60029fc618
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
f3e71fec91
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
c2bd1d0d83
|
callback kickoff
|
2 years ago |
|
skiffer-git
|
c53bcd990d
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
78c807a514
|
add Invitation Code
|
2 years ago |
|
wangchuxiao
|
c4084cbcec
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
062c4b53b6
|
Merge pull request #258 from ouyangshi/main
增加 AWS S3 存储
|
2 years ago |
|
wangchuxiao
|
5c5f80691a
|
fix delete
|
2 years ago |
|
wangchuxiao
|
429bee7e6c
|
Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
|
2 years ago |
Smile
|
547ad7a2c7
|
kafka topic优化及解释，删除废弃topic的冗余代码 (#255)
|
2 years ago |
|
wangchuxiao
|
6bfa8643d6
|
fix delete
|
2 years ago |
|
skiffer-git
|
281f4b38d2
|
add log
|
2 years ago |
|
skiffer-git
|
7b590e4bd6
|
add log
|
2 years ago |
|
skiffer-git
|
923a035e6e
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
a2a56980d9
|
add log
|
2 years ago |
|
wangchuxiao
|
a74168d1e1
|
fix delete
|
2 years ago |
|
wangchuxiao
|
6c0922a6d8
|
fix delete
|
2 years ago |
|
wangchuxiao
|
706f6c6747
|
getui debug
|
2 years ago |
|
wangchuxiao
|
2c0a2d7877
|
getui debug
|
2 years ago |
|
欧阳氏
|
9358aa1bd8
|
用户表增加注册IP 登陆IP
1、用户表增加注册IP 登陆IP
2、新增ip_limit表、user_ip_limit表
3、用户创建需要增加createIp参数同步
用户登录需要增加loginIp参数同步
login_limit 限制说明
0:读取ip_limits表 限制用户注册+用户登陆IP
1:读取user_ip_limits表 限制用户在指定IP登陆
2:读取black_lists表 限制用户在限制时间不能登陆
|
2 years ago |
|
wangchuxiao
|
4cfa8d880f
|
getui debug
|
2 years ago |
|
skiffer-git
|
bba5e7db0c
|
fix bug
|
2 years ago |
|
skiffer-git
|
eb960f2606
|
fix bug
|
2 years ago |
|
skiffer-git
|
92a68108a6
|
fix bug
|
2 years ago |
|
wangchuxiao
|
11f29280b1
|
group hash
|
2 years ago |
|
wangchuxiao
|
faae01cb8a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d1ffa9b330
|
callback fix
|
2 years ago |
|
Gordon
|
ba5edabb2c
|
del conversation bug fix
|
2 years ago |
|
Gordon
|
319631b5c4
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
10c0f3075a
|
unread bug fix
|
2 years ago |
|
wangchuxiao
|
576348b1f2
|
callback fix
|
2 years ago |
|
wangchuxiao
|
db547d60df
|
callback fix
|
2 years ago |
|
wangchuxiao
|
0f655e9292
|
callback fix
|
2 years ago |
|
wangchuxiao
|
3d0827a6da
|
callback fix
|
2 years ago |
|
Gordon
|
0117e96d5b
|
callback msg content
|
2 years ago |
|
Gordon
|
ca7bba33e6
|
docker-compose file update
|
2 years ago |
|
wangchuxiao
|
a99dbf634b
|
callback fix
|
2 years ago |
|
wangchuxiao
|
b32463df53
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
f202d5f54a
|
fix bug
|
2 years ago |
|
Gordon
|
22a39ed4d3
|
config file update
|
2 years ago |
|
Gordon
|
4003befc2a
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
c17ca47e7d
|
config file update
|
2 years ago |
|
wangchuxiao
|
e2e5ab656f
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
b4d82579b7
|
fix bug
|
2 years ago |
|
Gordon
|
6734c714d7
|
config file update
|
2 years ago |
|
Gordon
|
526aa15ff6
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
bc0e9eb74e
|
config file update
|
2 years ago |
|
Gordon
|
a425c62156
|
config file update
|
2 years ago |
|
wangchuxiao
|
9136838b63
|
fix bug
|
2 years ago |
|
欧阳氏
|
cfa9f2d13f
|
增加 AWS S3 存储
|
2 years ago |
|
wangchuxiao
|
0a8a248349
|
fix bug
|
2 years ago |
|
Gordon
|
6def5bd3cf
|
add test file
|
2 years ago |
|
Gordon
|
c43290338d
|
add test file
|
2 years ago |
|
Gordon
|
783a982ca8
|
remove _:
|
2 years ago |
|
wangchuxiao
|
6e826cf369
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
8f12fa52b4
|
mongodb superGroup to cache
|
2 years ago |
|
Gordon
|
6d15e5b5a1
|
msg
|
2 years ago |
|
Gordon
|
787cef54f5
|
manger send msg modify
|
2 years ago |
|
Gordon
|
4b6332dbfa
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
bbc62ef907
|
remove cache message from redis
|
2 years ago |
|
wenxu12345
|
90401d4d12
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
5a626e9dab
|
add update conversation unread count
|
2 years ago |
|
wenxu12345
|
0ddf5eadb6
|
Push message to client through message queue
|
2 years ago |
|
wenxu12345
|
b1377218b1
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
80d74f6f38
|
Push message to client through message queue
|
2 years ago |
|
wangchuxiao
|
192c764c8c
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
041a35e3c8
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
cf205c2480
|
superGroupMaxSeq
|
2 years ago |
|
Gordon
|
a3530be7b4
|
firebase update
|
2 years ago |
|
Gordon
|
e61434347e
|
Merge branch 'superGroup' into v2.3.0release
# Conflicts:
# go.sum
# pkg/common/db/RedisModel.go
# pkg/common/db/model.go
|
2 years ago |
|
欧阳氏
|
84c068783d
|
新增 firebase cloud message 消息推送 (#236)
* 新增 firebase cloud message 消息推送
新增 api接口 /third/fcm_update_token 用于更新客户端获取到 FCM token 同步到服务器
* mongodb授权缺少授权数据库
windows下面的编译+启动
|
2 years ago |
|
wangchuxiao
|
a3f62e2246
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
a5ef78fd1e
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
a937a94e43
|
fix bug
|
2 years ago |
|
wangchuxiao
|
a6cf407a8f
|
fix bug
|
2 years ago |
|
wangchuxiao
|
eec8eb4766
|
dtm
|
2 years ago |
|
wangchuxiao
|
52c71e3843
|
dtm
|
2 years ago |
|
wangchuxiao
|
960e3d34eb
|
dtm
|
2 years ago |
|
wangchuxiao
|
cbb127ff38
|
Merge branch 'dtm' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
db1a043261
|
dtm
|
2 years ago |
|
wangchuxiao
|
f9eee19cbe
|
dtm
|
2 years ago |
|
wangchuxiao
|
eb1aeefc8c
|
Merge branch 'dtm' into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
|
2 years ago |
|
skiffer-git
|
f383d6c636
|
rename
|
2 years ago |
|
skiffer-git
|
53eebb0638
|
rename
|
2 years ago |
|
skiffer-git
|
4546e77d5b
|
rename
|
2 years ago |
|
skiffer-git
|
7d2eb31f05
|
rename
|
2 years ago |
|
skiffer-git
|
7c15a53a62
|
rename
|
2 years ago |
|
wangchuxiao
|
1531db0a35
|
departmentcache
|
2 years ago |
|
wangchuxiao
|
6d91f766e7
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
bf5bce9e64
|
rocks cache
|
2 years ago |
|
wangchuxiao
|
5afa3380a6
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
85f5c59781
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
8ee4ca0357
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
656241c23f
|
docker-compose fix
|
2 years ago |
|
skiffer-git
|
5936492f76
|
Filter out disbanded groups
|
2 years ago |
|
wangchuxiao
|
abe06b8753
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
1b4b2b9bb1
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
1e6a93b4b6
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
# internal/rpc/user/user.go
# pkg/common/db/mysql_model/im_mysql_model/group_model.go
|
2 years ago |
|
skiffer-git
|
8ad22f8148
|
fix bug
|
2 years ago |
|
wangchuxiao
|
b064244907
|
rocks cache
|
2 years ago |
|
skiffer-git
|
a01156feb6
|
fix bug
|
2 years ago |
|
skiffer-git
|
af1d8fa834
|
fix bug
|
2 years ago |
|
skiffer-git
|
58f4ebe411
|
Limit the number of members invited to join the group
|
2 years ago |
|
skiffer-git
|
d4e575f777
|
Show group notification editor
|
2 years ago |
|
skiffer-git
|
2d110deb09
|
Show group notification editor
|
2 years ago |
|
skiffer-git
|
fb4cef7ccb
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
3b6b88fd62
|
Source of joining the group
|
2 years ago |
|
Gordon
|
adb7da7aaf
|
group add field
|
2 years ago |
|
Gordon
|
504e4cc6a3
|
add super delete
|
2 years ago |
|
wangchuxiao
|
9e0e2fe124
|
fix bug
|
2 years ago |
|
Gordon
|
9cfbd8107e
|
add redis username
|
2 years ago |
|
Gordon
|
b70a4070f2
|
add redis username
|
2 years ago |
|
Gordon
|
d3b302ce66
|
add redis username
|
2 years ago |
|
Gordon
|
5a423f88dd
|
add redis username
|
2 years ago |
|
Gordon
|
f89c1edadf
|
add redis username
|
2 years ago |
|
Gordon
|
1aa106ba4a
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
c638072902
|
super group add
|
2 years ago |
|
wangchuxiao
|
4035f037d2
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
Gordon
|
2b6f861f3b
|
test group file
|
2 years ago |
|
Gordon
|
9a813030a3
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
04b7dd719c
|
test group
|
2 years ago |
|
wangchuxiao
|
3ad3b30d97
|
demo
|
2 years ago |
|
wangchuxiao
|
d0e7147911
|
demo
|
2 years ago |
|
skiffer-git
|
d7ce455f2f
|
Super code can be disabled
|
2 years ago |
|
Gordon
|
d8717bd0b4
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
cfcc5c1095
|
test
|
2 years ago |
|
wangchuxiao
|
99062805ec
|
add swagger demo
|
2 years ago |
|
wenxu12345
|
db7ef3ac4b
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
wenxu12345
|
5b8ef3a17c
|
verification gor joining group chat
|
2 years ago |
|
Gordon
|
ddddbf6987
|
remove old redis module
|
2 years ago |
|
Gordon
|
2f2f72fe4b
|
test
|
2 years ago |
|
Gordon
|
34fe9596a9
|
test
|
2 years ago |
|
Gordon
|
e4d35c2a86
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
af7dde61d6
|
model update
|
2 years ago |
|
wenxu12345
|
a62388759a
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
9337d150b9
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
910876f323
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
af152aa9b9
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
f34fedd822
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
ac7c0015db
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
1a3b5d018a
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
d99d7ac63c
|
debug
|
2 years ago |
|
wenxu12345
|
c2686beb9b
|
debug
|
2 years ago |
|
wenxu12345
|
1bfae7627e
|
debug
|
2 years ago |
|
wenxu12345
|
06c523ea81
|
debug
|
2 years ago |
|
wenxu12345
|
7f4e21d4ba
|
debug
|
2 years ago |
|
wenxu12345
|
c993bb2f5e
|
debug
|
2 years ago |
|
wenxu12345
|
5527f7c78a
|
debug
|
2 years ago |
|
wenxu12345
|
8e9ad57173
|
debug
|
2 years ago |
|
wangchuxiao
|
b5c20f5be9
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
59a53c7c73
|
fix bug
|
2 years ago |
|
Gordon
|
b242aac7cd
|
jpush add config for ios env mode
|
2 years ago |
|
skiffer-git
|
127ad802ff
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
f42a2c9434
|
kickoff
|
2 years ago |
|
wangchuxiao
|
c5eb8a3f9b
|
入职流程
|
2 years ago |
|
Gordon
|
92cb2e7eab
|
config file update
|
2 years ago |
|
Gordon
|
04136d5b9d
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
fd256a6c28
|
config file update
|
2 years ago |
|
wangchuxiao
|
52ae2c3655
|
fix bug
|
2 years ago |
|
wangchuxiao
|
3892883470
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
d1049b8022
|
fix bug
|
2 years ago |
|
Gordon
|
903c39206f
|
msg transfer handle change
|
2 years ago |
|
Gordon
|
57d96b85f1
|
add global recv opt
|
2 years ago |
|
wangchuxiao
|
dd4817a65a
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
b3dcff2d76
|
redis interface
|
2 years ago |
|
skiffer-git
|
8c82f811cb
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
# internal/rpc/user/user.go
|
2 years ago |
|
skiffer-git
|
dbc2713495
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
wangchuxiao
|
96d3ae86cc
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
Gordon
|
7e6e214f08
|
add global recv opt
|
2 years ago |
|
Gordon
|
5e51eebe8a
|
msg handle
|
2 years ago |
|
wangchuxiao
|
f9a26e9195
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
ea76f20825
|
GlobalRecvMsgOpt
|
2 years ago |
|
skiffer-git
|
1a6a0d3592
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
0d2c0e91c8
|
use sarama v1.29.0
|
2 years ago |
|
Gordon
|
2e7e278ba4
|
redis restore
|
2 years ago |
|
Gordon
|
afa93aaf9e
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
d74bea25aa
|
redis replace to go_redis
|
2 years ago |
|
skiffer-git
|
f4f6ea681e
|
Optimization for log
|
2 years ago |
|
Gordon
|
f96e12a8b3
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
eef47017a3
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
4315d9dfbb
|
redis replace to go_redis
|
2 years ago |
|
Gordon
|
d7961bf226
|
redis replace to go_redis
|
2 years ago |
|
wangchuxiao
|
1aee41e7e7
|
go-redis
|
2 years ago |
|
wangchuxiao
|
f4cdbe985e
|
alter rtc timeout
|
2 years ago |
|
Gordon
|
d3279694b7
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
8fe6231ebc
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
6f0860d954
|
add global msg recv opt
|
2 years ago |
|
Gordon
|
ccc69ac2d0
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
wangchuxiao
|
a0581618a4
|
Merge branch 'tuoyun' into superGroup
# Conflicts:
# config/config.yaml
# internal/msg_gateway/gate/logic.go
# internal/msg_gateway/gate/ws_server.go
# internal/push/logic/push_to_client.go
# internal/rpc/group/group.go
# internal/rpc/msg/send_msg.go
# pkg/common/config/config.go
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
Gordon
|
cfcccd0240
|
user add global set message recv opt
|
2 years ago |
|
wangchuxiao
|
d190616d34
|
rtc
|
2 years ago |
|
wangchuxiao
|
d7884f89f5
|
rtc
|
2 years ago |
|
Gordon
|
d8ce122254
|
redis model update
|
2 years ago |
|
wangchuxiao
|
257e98edb2
|
group
|
2 years ago |
|
Gordon
|
034201a45b
|
redis model update
|
2 years ago |
|
Gordon
|
d43b9fc6c1
|
redis model update
|
2 years ago |
|
wangchuxiao
|
52d8ab5389
|
singal
|
2 years ago |
|
wangchuxiao
|
dbc055efb4
|
org
|
2 years ago |
|
wangchuxiao
|
1687b70bde
|
fix signal
|
2 years ago |
|
wangchuxiao
|
dbcfcafdfc
|
fix word
|
2 years ago |
|
wangchuxiao
|
ceca0f095b
|
demo
|
2 years ago |
|
wangchuxiao
|
ab76d46007
|
demo
|
2 years ago |
|
wangchuxiao
|
9b4890a99f
|
fix bug
|
2 years ago |
|
wangchuxiao
|
c8bf95578c
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7b08d98647
|
fix bug
|
2 years ago |
|
skiffer-git
|
32565dd188
|
config for msg read receipt
|
2 years ago |
|
skiffer-git
|
96f09c45f5
|
batch push
|
2 years ago |
|
wangchuxiao
|
6525d63459
|
fix bug
|
2 years ago |
|
wangchuxiao
|
ae684d6d39
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d9710ac244
|
fix bug
|
2 years ago |
|
wangchuxiao
|
dff7a28094
|
fix bug
|
2 years ago |
|
wangchuxiao
|
da18950b3d
|
fix bug
|
2 years ago |
|
wangchuxiao
|
f650e73d5c
|
fix bug
|
2 years ago |
|
Gordon
|
a7a69008d8
|
log
|
2 years ago |
|
Gordon
|
0214419446
|
log
|
2 years ago |
|
wangchuxiao
|
a4f69351ce
|
fix bug
|
2 years ago |
|
wangchuxiao
|
276328e0fd
|
fix bug
|
2 years ago |
|
wangchuxiao
|
5f42748e1b
|
Merge branch 'tuoyun' into superGroup
# Conflicts:
# internal/msg_gateway/gate/callback.go
# internal/msg_transfer/logic/online_history_msg_handler.go
# internal/push/logic/callback.go
# internal/push/logic/push_to_client.go
# pkg/common/db/model.go
# pkg/common/db/newRedisModel.go
# pkg/proto/group/group.pb.go
# pkg/proto/group/group.proto
|
2 years ago |
|
Gordon
|
f106664952
|
kick
|
2 years ago |
|
wangchuxiao
|
f3fc452904
|
group set memberInfo
|
2 years ago |
|
Gordon
|
89f40fe3de
|
kick
|
2 years ago |
|
skiffer-git
|
9106e70b37
|
group administrator access
|
2 years ago |
|
wangchuxiao
|
34c091f232
|
signal
|
2 years ago |
|
wangchuxiao
|
f8b4cbcc13
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
1a42f6dded
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
4efdd342d6
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
f15684a562
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
78dfba8771
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
ebf07eddfb
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
d3abc44976
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
1fffd36054
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
2b25fea86c
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
64fa52452c
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
16d33b1c1f
|
singal offline push
|
3 years ago |
|
Gordon
|
a18dcfce9e
|
ws and push update
|
3 years ago |
|
Gordon
|
48410c428a
|
redis update
|
3 years ago |
|
wenxu12345
|
b2df6e6d41
|
Clear msg
|
3 years ago |
|
wenxu12345
|
8315c61240
|
Clear msg
|
3 years ago |
|
wenxu12345
|
2b4df5be16
|
Clear personal chat history
|
3 years ago |
|
wangchuxiao
|
f98da25fda
|
organization
|
3 years ago |
|
Gordon
|
4c305b7cc0
|
redis replace go redis
|
3 years ago |
|
Gordon
|
5c979a532f
|
redis replace go redis
|
3 years ago |
|
Gordon
|
31e923fc67
|
redis replace go redis
|
3 years ago |
|
Gordon
|
1c2ebb8c5d
|
redis replace go redis
|
3 years ago |
|
wangchuxiao
|
29e75a4851
|
organization
|
3 years ago |
|
Gordon
|
3765661a4e
|
redis replace go redis
|
3 years ago |
|
Gordon
|
628984c09d
|
redis replace go redis
|
3 years ago |
|
Gordon
|
a630653d88
|
redis replace go redis
|
3 years ago |
|
Gordon
|
e693b908be
|
redis replace go redis
|
3 years ago |
|
Gordon
|
f36b2433a0
|
redis replace go redis
|
3 years ago |
|
Gordon
|
47af0d0356
|
redis replace go redis
|
3 years ago |
|
Gordon
|
d4c587c668
|
redis replace go redis
|
3 years ago |
|
Gordon
|
dda453975b
|
redis replace go redis
|
3 years ago |
|
Gordon
|
c28801ff27
|
redis replace go redis
|
3 years ago |
|
Gordon
|
4e609ebc33
|
redis replace go redis
|
3 years ago |
|
Gordon
|
1257e96d5e
|
redis replace go redis
|
3 years ago |
|
Gordon
|
122a3ab4ce
|
redis replace go redis
|
3 years ago |
|
Gordon
|
136cb43cd1
|
redis replace go redis
|
3 years ago |
|
Gordon
|
ad8086d2b6
|
redis replace go redis
|
3 years ago |
|
Gordon
|
d00641a73c
|
redis replace go redis
|
3 years ago |
|
Gordon
|
0aefab34f1
|
log
|
3 years ago |
|
wenxu12345
|
cd8e12c747
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
3 years ago |
|
wenxu12345
|
591b292fbf
|
super group
|
3 years ago |
|
wangchuxiao
|
0168ef4014
|
superGroup
|
3 years ago |
|
wangchuxiao
|
8cc6b048fd
|
superGroup
|
3 years ago |
|
wangchuxiao
|
cf094a2048
|
superGroup
|
3 years ago |
|
wangchuxiao
|
10881c8f5b
|
superGroup
|
3 years ago |
|
wangchuxiao
|
23c6c8b331
|
superGroup
|
3 years ago |
|
wangchuxiao
|
653c0faa18
|
superGroup
|
3 years ago |
|
wangchuxiao
|
edb5cb4ee5
|
superGroup
|
3 years ago |
|
wangchuxiao
|
0b9e6d52b4
|
superGroup
|
3 years ago |
|
wangchuxiao
|
ecf0a4f299
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
3 years ago |
|
wangchuxiao
|
d3fe5cdf34
|
superGroup
|
3 years ago |
|
wenxu12345
|
d3d5c11675
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
3 years ago |
|
wenxu12345
|
ae30b4359f
|
super group
|
3 years ago |
|
Gordon
|
bda1b0a304
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
3 years ago |
|
Gordon
|
839f3e52ef
|
pull message update
|
3 years ago |
|
wangchuxiao
|
a85f6b8287
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
3 years ago |
|
wangchuxiao
|
fe9f86b432
|
superGroup
|
3 years ago |
|
Gordon
|
7285e2b2c9
|
add super group
|
3 years ago |
|
wangchuxiao
|
b3ba06aecb
|
superGroup
|
3 years ago |
|
wangchuxiao
|
b55e13dbeb
|
superGroup
|
3 years ago |
|
wangchuxiao
|
bbe8c46df9
|
callback
|
3 years ago |
|
wangchuxiao
|
1eeb7f8303
|
callback
|
3 years ago |
|
wangchuxiao
|
4b7177101a
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
b4da35a0ab
|
ingress
|
3 years ago |
|
wenxu12345
|
8addb49012
|
add error handling : mongo
|
3 years ago |
|
wenxu12345
|
ac1e557c46
|
add error handling : mongo
|
3 years ago |
|
wangchuxiao
|
eb2218c220
|
del msg
|
3 years ago |
|
wangchuxiao
|
657ec411c3
|
del msg
|
3 years ago |
|
Gordon
|
061af3f827
|
push update
|
3 years ago |
|
wangchuxiao
|
e961a44511
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
3 years ago |
|
wangchuxiao
|
c16a35ec8c
|
del msg
|
3 years ago |
|
wangchuxiao
|
841566a5d1
|
del msg
|
3 years ago |
|
Gordon
|
b14b53329c
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
b8641258d6
|
message update
|
3 years ago |
|
wangchuxiao
|
18eaae80ec
|
del msg
|
3 years ago |
|
wenxu12345
|
1246f3aa21
|
msg cache
|
3 years ago |
|
wenxu12345
|
49cd31fd41
|
msg cache
|
3 years ago |
|
Gordon
|
79ff36d49a
|
redis add get message
|
3 years ago |
|
Gordon
|
d6742812c8
|
redis add get message
|
3 years ago |
|
Gordon
|
57967835bd
|
redis add get message
|
3 years ago |
|
wenxu12345
|
e2db8c07af
|
msg cache
|
3 years ago |
|
Gordon
|
c224892609
|
redis add get message
|
3 years ago |
|
Gordon
|
f5ed9d93c3
|
redis add get message
|
3 years ago |
|
Gordon
|
88145694ce
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
d58f7fd089
|
redis add get message
|
3 years ago |
|
wangchuxiao
|
c32b53b3c0
|
msg cache
|
3 years ago |
|
wangchuxiao
|
9dfef527a3
|
msg cache
|
3 years ago |
|
wangchuxiao
|
df51c8b9a4
|
msg cache
|
3 years ago |
|
wangchuxiao
|
499c4a27d3
|
k8s deploy
|
3 years ago |
|
Gordon
|
66c62d8875
|
consumer update
|
3 years ago |
|
Gordon
|
b7309cdda8
|
log
|
3 years ago |
|
wangchuxiao
|
8c64538207
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d1cb176b31
|
del msg sync
|
3 years ago |
|
skiffer-git
|
821ad4de2e
|
log
|
3 years ago |
|
skiffer-git
|
17b4a0525d
|
log
|
3 years ago |
|
skiffer-git
|
c2e7863ca0
|
fix bug
|
3 years ago |
|
skiffer-git
|
6e9dcdbb50
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# pkg/common/db/batch_insert_chat.go
|
3 years ago |
|
skiffer-git
|
0265ea45b2
|
fix bug
|
3 years ago |
|
Gordon
|
ccb7e41434
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
38317c5497
|
concurrent consumption of messages
|
3 years ago |
|
skiffer-git
|
9f62de0420
|
fix bug
|
3 years ago |
|
Gordon
|
adb6337a27
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
624bb0a7e5
|
concurrent consumption of messages
|
3 years ago |
|
skiffer-git
|
abcfaa05e2
|
log
|
3 years ago |
|
skiffer-git
|
223b2678b4
|
fix bug
|
3 years ago |
|
skiffer-git
|
f0c6295cff
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
866c7d4f2f
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
17695927d5
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
ea8638c843
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
0fbc1095be
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
b914e8388d
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
31911a40c0
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
00a2a23190
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
d4f81f086c
|
batch to mongo
|
3 years ago |
|
Gordon
|
ee0a71de1b
|
concurrent consumption of messages
|
3 years ago |
|
wangchuxiao
|
23b03919e6
|
office tag async send
|
3 years ago |
|
Gordon
|
355b64fda4
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
c1632f8e65
|
tag message sender not notification
|
3 years ago |
|
skiffer-git
|
313cf858f0
|
Statistics
|
3 years ago |
|
wangchuxiao
|
2454c50380
|
organization
|
3 years ago |
|
wangchuxiao
|
2534921af9
|
organization
|
3 years ago |
|
wangchuxiao
|
6b5fb81e01
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
bb5991b111
|
organization
|
3 years ago |
|
Gordon
|
f8af109821
|
send group message split topic
|
3 years ago |
|
wenxu12345
|
17e1fa54cf
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
a4f5dd9d89
|
add log
|
3 years ago |
|
wangchuxiao
|
3fca780132
|
update app
|
3 years ago |
|
wangchuxiao
|
98a903e60c
|
update app
|
3 years ago |
|
wangchuxiao
|
17759f9a98
|
update app
|
3 years ago |
|
wangchuxiao
|
6c0e96213f
|
update app
|
3 years ago |
|
wangchuxiao
|
7a423eb6e1
|
update app
|
3 years ago |
|
wangchuxiao
|
7137924baa
|
update app
|
3 years ago |
|
wangchuxiao
|
f5d4397f0b
|
update app
|
3 years ago |
|
wangchuxiao
|
472cda8315
|
update app
|
3 years ago |
|
wangchuxiao
|
7be5208daf
|
update app
|
3 years ago |
|
wangchuxiao
|
30fc4c28b7
|
cache
|
3 years ago |
|
Gordon
|
74b582369a
|
log change
|
3 years ago |
|
wangchuxiao
|
3a3ac012bb
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
00265a7e8e
|
cache
|
3 years ago |
|
wenxu12345
|
6226f65e20
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
7de29c29e9
|
add ParseToken
|
3 years ago |
|
wenxu12345
|
c234e2ca3d
|
log
|
3 years ago |
|
wenxu12345
|
98d5f5ee3e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
ba16fceeb8
|
log
|
3 years ago |
|
Gordon
|
c49b5f78bf
|
test
|
3 years ago |
|
Gordon
|
e2cacd9c4b
|
test
|
3 years ago |
|
skiffer-git
|
a251d521a1
|
set api ip in config
|
3 years ago |
|
skiffer-git
|
dca16e83d3
|
rpc register ip
|
3 years ago |
|
skiffer-git
|
e122349f9e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
bb07c3ab45
|
add err log
|
3 years ago |
|
wangchuxiao
|
bbc3f5c19a
|
cache
|
3 years ago |
|
skiffer-git
|
a9ce8a3b2e
|
upgrade etcd & grpc
|
3 years ago |
|
wangchuxiao
|
7914e7bc14
|
office
|
3 years ago |
|
wangchuxiao
|
ed8716510b
|
office
|
3 years ago |
|
wangchuxiao
|
efd2ae59f5
|
office
|
3 years ago |
|
wangchuxiao
|
1923d0b809
|
office
|
3 years ago |
|
wangchuxiao
|
99f6752590
|
office
|
3 years ago |
|
wangchuxiao
|
131746f94e
|
office
|
3 years ago |
|
wangchuxiao
|
f0ed6973c8
|
office
|
3 years ago |
|
wangchuxiao
|
2cf070a26c
|
office
|
3 years ago |
|
wangchuxiao
|
3c68ecb7f1
|
office
|
3 years ago |
|
wangchuxiao
|
d75eb456dc
|
office
|
3 years ago |
|
skiffer-git
|
185e0dce6e
|
delete msg by index
|
3 years ago |
|
skiffer-git
|
d9e74a78f0
|
delete msg by index
|
3 years ago |
|
wangchuxiao
|
f1dbec122a
|
cache
|
3 years ago |
|
wangchuxiao
|
47cb54461f
|
cache
|
3 years ago |
|
wangchuxiao
|
91e03f7cfd
|
cache
|
3 years ago |
|
wangchuxiao
|
d24a7d7b22
|
cache & workMoments
|
3 years ago |
|
wangchuxiao
|
88d4a670d4
|
cache
|
3 years ago |
|
wangchuxiao
|
ea0b6c5ee5
|
cache
|
3 years ago |
|
wangchuxiao
|
20f61042fc
|
cache
|
3 years ago |
|
wangchuxiao
|
93057870a7
|
cache
|
3 years ago |
|
wangchuxiao
|
b72787f5bb
|
cache
|
3 years ago |
|
wangchuxiao
|
0793b2ab38
|
cache
|
3 years ago |
|
wangchuxiao
|
604ed3e3e1
|
cache
|
3 years ago |
|
wangchuxiao
|
65f02e5139
|
cache
|
3 years ago |
|
wangchuxiao
|
59468eb162
|
fix work moments bug
|
3 years ago |
|
wangchuxiao
|
17f6b8eb2a
|
work moments
|
3 years ago |
|
skiffer-git
|
b211a66e99
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wangchuxiao
|
bd7266653f
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
08f968dced
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
a03f89fb68
|
cache rpc
|
3 years ago |
|
Gordon
|
9a9f26c435
|
conversation update
|
3 years ago |
|
Gordon
|
eebe9cbd5f
|
conversation update
|
3 years ago |
|
Gordon
|
b3077fc15d
|
conversation update
|
3 years ago |
|
wangchuxiao
|
bccaf16343
|
work_moments
|
3 years ago |
|
wangchuxiao
|
30df45ef2e
|
work_moments
|
3 years ago |
|
wangchuxiao
|
6500ba48a7
|
work_moments
|
3 years ago |
|
wangchuxiao
|
010f24e5c3
|
work_moments
|
3 years ago |
|
wangchuxiao
|
db9762c5b2
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d1ebcde725
|
work_moments
|
3 years ago |
|
Gordon
|
3247d84b6b
|
add modify conversation api
|
3 years ago |
|
Gordon
|
150af5ff8b
|
@ people update
|
3 years ago |
|
Gordon
|
df17dd749f
|
add rpc conversation
|
3 years ago |
|
wangchuxiao
|
f779ed7628
|
workMoments
|
3 years ago |
|
wangchuxiao
|
f2fdb74f23
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
4ba87e3349
|
workMoments
|
3 years ago |
|
Gordon
|
159a9e00c8
|
conversation update
|
3 years ago |
|
Gordon
|
17d8a124cd
|
kick group invite group update
|
3 years ago |
|
Gordon
|
67010e20d7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
704604f6fe
|
kick group invite group update
|
3 years ago |
|
wangchuxiao
|
ff85575e98
|
workMoments
|
3 years ago |
|
wangchuxiao
|
a243da8b1e
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
62e605a443
|
workMoments
|
3 years ago |
|
skiffer-git
|
2bdaaa5a33
|
log
|
3 years ago |
|
Gordon
|
b865f5d6e7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
00664822ec
|
conversation add fields
|
3 years ago |
|
skiffer-git
|
4594c15de7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
2b6ec1672c
|
Organization
|
3 years ago |
|
wangchuxiao
|
9df4a79827
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
071dd46a4c
|
workMoments
|
3 years ago |
|
skiffer-git
|
030d619910
|
Organization
|
3 years ago |
|
skiffer-git
|
51c3a753a9
|
Organization
|
3 years ago |
|
skiffer-git
|
88e9dd54b2
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
f53f34559a
|
organization
|
3 years ago |
|
wangchuxiao
|
3e5d9a394f
|
workMoments
|
3 years ago |
|
wangchuxiao
|
3f287eb148
|
workMoments
|
3 years ago |
|
wangchuxiao
|
dfe854a236
|
workMoments
|
3 years ago |
|
wangchuxiao
|
01c066419d
|
workMoments
|
3 years ago |
|
wangchuxiao
|
040b1d9bc8
|
workMoments
|
3 years ago |
|
wangchuxiao
|
b5c11ece57
|
workMoments
|
3 years ago |
|
wangchuxiao
|
50696d2e88
|
workMoments
|
3 years ago |
|
wangchuxiao
|
e7661fd4be
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
957e11eff0
|
workMoments
|
3 years ago |
|
skiffer-git
|
97fd107f47
|
add operationID when ws connecting
|
3 years ago |
|
skiffer-git
|
fc688dca99
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
fe3bd2a1f1
|
add operationID when ws connecting
|
3 years ago |
|
wangchuxiao
|
3625befc0b
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# pkg/common/constant/constant.go
|
3 years ago |
|
wangchuxiao
|
6e6508aafd
|
workMoments
|
3 years ago |
|
skiffer-git
|
b1c66997ca
|
organization
|
3 years ago |
|
skiffer-git
|
ad1770ec95
|
organization
|
3 years ago |
|
skiffer-git
|
c11094a11e
|
organization
|
3 years ago |
|
skiffer-git
|
f6b30ed0c6
|
organization
|
3 years ago |
|
skiffer-git
|
248de7f1f2
|
set groupmember nickname
|
3 years ago |
|
skiffer-git
|
3bbf84861e
|
organization
|
3 years ago |
|
skiffer-git
|
ecc47dcfbb
|
organization
|
3 years ago |
|
skiffer-git
|
af5ee45206
|
organization
|
3 years ago |
|
skiffer-git
|
42af55a740
|
organization
|
3 years ago |
|
skiffer-git
|
3c1e6d0e5c
|
organization
|
3 years ago |
|
skiffer-git
|
edf7df368e
|
organization
|
3 years ago |
|
skiffer-git
|
cde38e012f
|
organization
|
3 years ago |
|
skiffer-git
|
cc405b83e2
|
organization
|
3 years ago |
|
skiffer-git
|
c65f5b7279
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
c216340120
|
organization
|
3 years ago |
|
wangchuxiao
|
27cba5ba31
|
getui
|
3 years ago |
|
wangchuxiao
|
dbc5bd96f3
|
getui
|
3 years ago |
|
wangchuxiao
|
9489ab862b
|
getui
|
3 years ago |
|
wangchuxiao
|
1bb634bc6f
|
merge code
|
3 years ago |
|
wangchuxiao
|
4a7cfab543
|
getui
|
3 years ago |
|
wangchuxiao
|
d670356388
|
getui
|
3 years ago |
|
skiffer-git
|
659c3bc1cf
|
add department db
|
3 years ago |
|
skiffer-git
|
f5684f2c45
|
add department db
|
3 years ago |
|
skiffer-git
|
bc06ba54b9
|
organization && department
|
3 years ago |
|
wangchuxiao
|
4a8d37bde1
|
getui
|
3 years ago |
|
wangchuxiao
|
4264cd8830
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
edcc215774
|
getui
|
3 years ago |
|
skiffer-git
|
3085fffb49
|
add department db
|
3 years ago |
|
wangchuxiao
|
06370a763c
|
getui
|
3 years ago |
|
wangchuxiao
|
cbe3abeab0
|
getui
|
3 years ago |
|
wangchuxiao
|
3d5e3ce6cf
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/tag_send_msg.go
|
3 years ago |
|
wangchuxiao
|
4efdabc1ff
|
getui
|
3 years ago |
|
wenxu12345
|
42225dd35e
|
log
|
3 years ago |
|
Gordon
|
59cc45eaab
|
replace log
|
3 years ago |
|
wenxu12345
|
0232f52281
|
log
|
3 years ago |
|
wenxu12345
|
6efe13d142
|
log
|
3 years ago |
|
wangchuxiao
|
146aa497f9
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
f4921d1317
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
b82ff7b88d
|
tips info
|
3 years ago |
|
wangchuxiao
|
0e27b302bc
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
4390302384
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
929c5e7a5b
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d600042110
|
tag and set private tips
|
3 years ago |
|
Gordon
|
0a58e7433e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
5639c985df
|
OA tag fields modify
|
3 years ago |
|
wenxu12345
|
9fbfbfb23b
|
Merge log files
|
3 years ago |
|
wenxu12345
|
ecd2f0e2bf
|
Merge log files
|
3 years ago |
|
Gordon
|
60418276bd
|
oa notification add
|
3 years ago |
|
Gordon
|
6744745152
|
token add operationID
|
3 years ago |
|
skiffer-git
|
009ae6a235
|
mute group
|
3 years ago |
|
skiffer-git
|
bf5f72c00b
|
mute group
|
3 years ago |
|
skiffer-git
|
84aca5b9e1
|
mute group
|
3 years ago |
|
wangchuxiao
|
29a268d476
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
18d7aab703
|
tag
|
3 years ago |
|
skiffer-git
|
373e6b6c8e
|
mute group
|
3 years ago |
|
Gordon
|
e8517e954d
|
group add
|
3 years ago |
|
Gordon
|
bc260fffde
|
group add
|
3 years ago |
|
Gordon
|
acca147ff2
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
d53da0e422
|
group add
|
3 years ago |
|
wangchuxiao
|
d2fa0e7852
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f2b324abc2
|
tag
|
3 years ago |
|
skiffer-git
|
d2225dd841
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
8d26aa86b9
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wangchuxiao
|
7e937d7d29
|
tag
|
3 years ago |
|
skiffer-git
|
fe4b534b78
|
mute group
|
3 years ago |
|
wangchuxiao
|
d0a65c7c68
|
tag
|
3 years ago |
|
wangchuxiao
|
416f87f4bb
|
tag
|
3 years ago |
|
wangchuxiao
|
7eeb67be28
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
7ed6ee5075
|
tag
|
3 years ago |
|
skiffer-git
|
1aeff25316
|
mute group
|
3 years ago |
|
Gordon
|
c5828aba91
|
Merge branch 'tuoyun'
# Conflicts:
# cmd/open_im_api/main.go
# config/config.yaml
# go.sum
# pkg/common/config/config.go
# pkg/common/db/model.go
|
3 years ago |
|
skiffer-git
|
1286f9dcb6
|
mute group
|
3 years ago |
|
skiffer-git
|
391e525fc5
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
afc32b1cfa
|
mute group
|
3 years ago |
|
wangchuxiao
|
0797181967
|
tag
|
3 years ago |
|
wangchuxiao
|
14c5e631ff
|
tag
|
3 years ago |
|
wangchuxiao
|
5cdb039c33
|
tag
|
3 years ago |
|
wangchuxiao
|
a11c4fcb58
|
tag
|
3 years ago |
|
wangchuxiao
|
e95400988e
|
tag
|
3 years ago |
|
wangchuxiao
|
d92ac8f588
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
169665da32
|
tag
|
3 years ago |
|
Gordon
|
c4d80b4844
|
auto migrate test
|
3 years ago |
|
Gordon
|
7827749453
|
tag notification
|
3 years ago |
|
wangchuxiao
|
e9ea117985
|
tag
|
3 years ago |
|
wangchuxiao
|
b9ddb0140f
|
tag
|
3 years ago |
|
wangchuxiao
|
228cbb4082
|
tag
|
3 years ago |
|
wangchuxiao
|
c39f5a27b2
|
tag
|
3 years ago |
|
wangchuxiao
|
dbdb516f3c
|
tag
|
3 years ago |
|
wangchuxiao
|
c1a97b7356
|
tag
|
3 years ago |
|
wangchuxiao
|
a6d8f7ea24
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
574c7600e0
|
tag
|
3 years ago |
|
Gordon
|
d1c0205d77
|
add oa notification
|
3 years ago |
|
wangchuxiao
|
9d619d520d
|
tag
|
3 years ago |
|
wangchuxiao
|
46605479e9
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into office_tag
|
3 years ago |
|
wangchuxiao
|
6d20eddd43
|
mongo
|
3 years ago |
|
skiffer-git
|
9d29d49ada
|
group dismissed
|
3 years ago |
|
wangchuxiao
|
e7b95892ff
|
minio upload api
|
3 years ago |
|
wangchuxiao
|
e6c36411cb
|
mongo
|
3 years ago |
|
wangchuxiao
|
cc1ad41e94
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
8a38646bc5
|
mongo
|
3 years ago |
hxnets
|
6c43f75f9f
|
新增阿里云OSS文件上传参数获取接口 (#115)
* configure update
* mongo:4.0
* open-im-server -> open_im_server
* sleep 15
* 0.0.0.0
* sleep 10 15
* Update config.yaml
* config
* Update docker-compose.yaml
* Update config.yaml
* Create ISSUE_TEMPLATE.md
* Update ISSUE_TEMPLATE.md
* Create ISSUE_TEMPLATE
* add issue template
* add issue template
* add issue template
* add issue template
* Update README.md
* script
* script
* script
* config
* script
* config update
* script update
* image: openim/open_im_server:v1.0.6
* script
* script
* script
* version update
* sender message sync
* version update
* 阿里云oss sts上传参数
* 阿里云oss sts上传参数
Co-authored-by: wenxu12345 <44203734@qq.com>
Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>
Co-authored-by: Gordon <1432970085@qq.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
|
3 years ago |
马守越
|
1ab3e04cba
|
新增mongo.dbUrl配置 (#174)
* 当dbUri值不为空则直接使用该值
* 新增支持ali oss
Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn>
|
3 years ago |
|
Gordon
|
f93d22ae22
|
log update
|
3 years ago |
|
wangchuxiao
|
d77894c8fe
|
rtc add
|
3 years ago |
|
wangchuxiao
|
366f7621fa
|
rtc add
|
3 years ago |
|
wangchuxiao
|
604de144b9
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
7790686a84
|
ws add token platform verify
|
3 years ago |
|
wangchuxiao
|
f70a20f740
|
rtc add
|
3 years ago |
|
Gordon
|
bf09c88e6e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
cb8f7e0ddb
|
mongo single node
|
3 years ago |
|
wenxu12345
|
f63aa33082
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
7bdf6717e1
|
add log
|
3 years ago |
|
Gordon
|
2fc2801ad4
|
mongo single node
|
3 years ago |
|
wangchuxiao
|
b0aa168c9a
|
rtc add
|
3 years ago |
|
Gordon
|
ab9f3a1635
|
add friend and blacklist judge
|
3 years ago |
|
wangchuxiao
|
d90b31c5df
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
965dac5ff9
|
constant
|
3 years ago |
|
wangchuxiao
|
3693d2e93d
|
conversation table
|
3 years ago |
|
Gordon
|
24e04f1303
|
utils modify
|
3 years ago |
|
wangchuxiao
|
51c2f845d8
|
opt
|
3 years ago |
|
Gordon
|
edc81534c4
|
ws modify
|
3 years ago |
|
Gordon
|
e734b000de
|
log
|
3 years ago |
|
Gordon
|
a7c8eda290
|
log
|
3 years ago |
|
Gordon
|
1bcd2d4531
|
log
|
3 years ago |
|
Gordon
|
7e9234e712
|
log
|
3 years ago |
|
Gordon
|
af2917adb9
|
log
|
3 years ago |
|
wangchuxiao
|
bcae7720e1
|
add callback
|
3 years ago |
|
wangchuxiao
|
a5712e1216
|
msg callback
|
3 years ago |
|
wangchuxiao
|
3805db1263
|
msg callback
|
3 years ago |
|
wangchuxiao
|
9cec4b0c8e
|
alter callback fg
|
3 years ago |
|
FG
|
25f24801d6
|
log
|
3 years ago |
|
skiffer-git
|
e6b302abf9
|
log
|
3 years ago |
|
wangchuxiao
|
0bed7ee669
|
merge code
|
3 years ago |
|
skiffer-git
|
04f8a7247d
|
replace find with take
|
3 years ago |
|
skiffer-git
|
7b6ef76d54
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
ed65ad842f
|
Replace find with take
|
3 years ago |
|
Gordon
|
b30da3eea4
|
database judge modify
|
3 years ago |
|
Gordon
|
2c26efb5a9
|
log remove
|
3 years ago |
|
Gordon
|
e31da8bbd0
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
1e602975f3
|
test
|
3 years ago |
|
wangchuxiao
|
541ccda754
|
test mongo driver
|
3 years ago |
|
wangchuxiao
|
1b68363b80
|
test mongo driver
|
3 years ago |
|
wangchuxiao
|
fc11b3c463
|
test mongo driver
|
3 years ago |
|
wangchuxiao
|
f9f36cd1d6
|
test mongo driver
|
3 years ago |
|
wangchuxiao
|
566c05bcef
|
mongodriver test
|
3 years ago |
|
wenxu12345
|
dcacd88f11
|
UserNotificationBegin = 1301
|
3 years ago |
|
wangchuxiao
|
cae88e7946
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
952ad0e162
|
fix deploy
|
3 years ago |
|
Gordon
|
b751156b5c
|
redis ttl
|
3 years ago |
|
wangchuxiao
|
55d7c6e672
|
add log
|
3 years ago |
|
wangchuxiao
|
dfdb952e2b
|
fix reset password api
|
3 years ago |
|
wangchuxiao
|
079efe5de6
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
4d28ccebad
|
add reset pwd
|
3 years ago |
|
wenxu12345
|
2171acc909
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
1e05811c13
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
ec023ec13e
|
replace mongo driver
|
3 years ago |
