wangchuxiao
|
5ef7123f78
|
promethues
|
2 years ago |
|
wangchuxiao
|
5ae9b84cce
|
prome
|
2 years ago |
|
wangchuxiao
|
f41cebe776
|
prometheus
|
2 years ago |
|
wangchuxiao
|
aebcd1db2e
|
docker-compose
|
2 years ago |
|
wangchuxiao
|
602ac1ffb8
|
prome
|
2 years ago |
Gordon
|
f3a9c47c2a
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
3d184c95ba
|
Merge branch 'shichuang' of https://github.com/OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
6754fdb580
|
getui
|
2 years ago |
|
wangchuxiao
|
9842e5624e
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
d00b265347
|
prome
|
2 years ago |
|
Gordon
|
c72f898238
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
4a2a9eb997
|
fcm push modify
|
2 years ago |
skiffer-git
|
5b399d0d06
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
8edacbff2f
|
log
|
2 years ago |
|
wangchuxiao
|
156e9e2fc7
|
cms
|
2 years ago |
|
wangchuxiao
|
4682abf4c1
|
cms
|
2 years ago |
|
wangchuxiao
|
099461dbbf
|
cms
|
2 years ago |
|
wangchuxiao
|
5233e4c097
|
fix bug
|
2 years ago |
|
wangchuxiao
|
70e8811d5c
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
7208dd6b2a
|
cms
|
2 years ago |
|
Gordon
|
44af6740c7
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
8d1dd92df7
|
opid add
|
2 years ago |
|
wangchuxiao
|
a5cacaceda
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
821e704b5b
|
cms
|
2 years ago |
|
Gordon
|
bde0adfbd0
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
Gordon
|
6c8b115479
|
conversation unread modify
|
2 years ago |
|
wangchuxiao
|
82a8f18e88
|
merge cms into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
bdae1f10d4
|
merge cms into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
05b5a0ada3
|
add
|
2 years ago |
|
Gordon
|
f6137dfc34
|
fcm ios push badge
|
2 years ago |
|
wangchuxiao
|
6dfbb90b80
|
fix signal
|
2 years ago |
|
Gordon
|
72aff32024
|
fcm ios push badge
|
2 years ago |
|
wangchuxiao
|
9f4c367249
|
cms
|
2 years ago |
|
Gordon
|
3f87958328
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
a0e689c437
|
fcm ios push badge
|
2 years ago |
|
wangchuxiao
|
49f05d334d
|
cms
|
2 years ago |
|
wangchuxiao
|
06e48516bb
|
cms
|
2 years ago |
|
wangchuxiao
|
a317ebd8e7
|
cms
|
2 years ago |
|
wangchuxiao
|
6774a8594f
|
cms
|
2 years ago |
|
wangchuxiao
|
56fb579da2
|
Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
|
2 years ago |
|
wangchuxiao
|
b401917c19
|
cache
|
2 years ago |
|
skiffer-git
|
e990118475
|
fix bug :pushMsg.MsgData.OfflinePushInfo==nil
|
2 years ago |
|
wangchuxiao
|
ac2cc154b4
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
99ec0ed8df
|
del key
|
2 years ago |
|
Gordon
|
67e5e3b56b
|
fcm ios push badge
|
2 years ago |
|
Gordon
|
15ef064fc3
|
user conn map copy
|
2 years ago |
|
wangchuxiao
|
c7d544685e
|
cms
|
2 years ago |
|
wangchuxiao
|
d622f1df3d
|
fcm
|
2 years ago |
|
wangchuxiao
|
c7e1302377
|
add
|
2 years ago |
|
wangchuxiao
|
caea072f7d
|
fcm
|
2 years ago |
|
wangchuxiao
|
04b22c1a76
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
26d9d7630c
|
fcm
|
2 years ago |
|
skiffer-git
|
4529047349
|
log for msg_gateway cluster
|
2 years ago |
|
wangchuxiao
|
af110f75d6
|
add
|
2 years ago |
|
wangchuxiao
|
c2831e6676
|
cms
|
2 years ago |
|
skiffer-git
|
e5a7810d6e
|
add group member cache in msg rpc
|
2 years ago |
|
skiffer-git
|
99e913637a
|
add group member cache in push
|
2 years ago |
|
skiffer-git
|
67319031ea
|
log
|
2 years ago |
|
wangchuxiao
|
5134faeefd
|
cms
|
2 years ago |
|
wangchuxiao
|
77327f59b9
|
cms
|
2 years ago |
|
wangchuxiao
|
54c56037e7
|
cms
|
2 years ago |
|
wangchuxiao
|
87dfdb2ddc
|
cms
|
2 years ago |
|
wangchuxiao
|
2c2d3e4641
|
cms
|
2 years ago |
|
wangchuxiao
|
2a8b19d319
|
cms
|
2 years ago |
|
wangchuxiao
|
f43c042223
|
cms
|
2 years ago |
|
wangchuxiao
|
b75b46f415
|
cms
|
2 years ago |
|
wangchuxiao
|
a4767bc7e3
|
cms
|
2 years ago |
|
wangchuxiao
|
8d4e5ad3f1
|
cms
|
2 years ago |
|
skiffer-git
|
49a127d97d
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
8cfb604a0d
|
set mysql connection
|
2 years ago |
|
wangchuxiao
|
da9918b655
|
cms
|
2 years ago |
|
wangchuxiao
|
c41464b974
|
cms
|
2 years ago |
|
wangchuxiao
|
5657f617e7
|
merge
|
2 years ago |
|
wangchuxiao
|
bc1cfed389
|
xms
|
2 years ago |
|
wangchuxiao
|
9b5e1465c3
|
add
|
2 years ago |
|
wangchuxiao
|
7f5b12d4d2
|
cms
|
2 years ago |
|
wangchuxiao
|
c3d3f0986e
|
join groups
|
2 years ago |
|
skiffer-git
|
8c21d0360f
|
log
|
2 years ago |
|
wangchuxiao
|
650141a498
|
fix org
|
2 years ago |
|
skiffer-git
|
6ff8fc7f87
|
merge code : Filter push data by time
|
2 years ago |
|
skiffer-git
|
0f0e99b42e
|
merge code : Filter push data by time
|
2 years ago |
|
skiffer-git
|
96814109dc
|
fix bug: GetSelfUserInfo for no result
|
2 years ago |
|
skiffer-git
|
39720d401f
|
fix bug: msg_gateway/gate/ws_server.go:138
|
2 years ago |
|
wangchuxiao
|
5e6e30a5b3
|
fix bug
|
2 years ago |
|
wangchuxiao
|
a92c0ffac3
|
fix bug
|
2 years ago |
|
wangchuxiao
|
43f7ecc75a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d598ec1852
|
fix bug
|
2 years ago |
|
wangchuxiao
|
fad61a0a2a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
3886d49b0a
|
admin cms
|
2 years ago |
|
Gordon
|
93f8ed223e
|
group file update
|
2 years ago |
|
Gordon
|
96e0851563
|
group file update
|
2 years ago |
|
Gordon
|
aa2d07ca8d
|
callback add ex field and sdk server shell update
|
2 years ago |
|
wangchuxiao
|
9590d2865a
|
conversation
|
2 years ago |
|
wangchuxiao
|
d542cdd898
|
conversation
|
2 years ago |
|
wangchuxiao
|
1d0d063a6c
|
add
|
2 years ago |
|
skiffer-git
|
f0ebc151db
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
f0a9c63cd3
|
log for remote ip
|
2 years ago |
|
Gordon
|
ec0cd9a348
|
conversation update
|
2 years ago |
|
Gordon
|
b5afd304d0
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
4bd4e0863c
|
conversation update
|
2 years ago |
|
skiffer-git
|
463a5451e1
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
cb881e81a8
|
log for cost time
|
2 years ago |
|
wangchuxiao
|
3d5876a8c0
|
Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
7d04f06f7d
|
conversation fix
|
2 years ago |
|
Gordon
|
24137bffdd
|
conversation update
|
2 years ago |
|
Gordon
|
621051cfb9
|
pb update
|
2 years ago |
|
Gordon
|
2c21bf3e0e
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
c1a2dee0e9
|
pb update
|
2 years ago |
|
wangchuxiao
|
782ad07940
|
fix bug
|
2 years ago |
|
wangchuxiao
|
1f8c2ba8c5
|
fix bug
|
2 years ago |
|
wangchuxiao
|
b176701e51
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7dd6869cd1
|
fix bug
|
2 years ago |
|
wangchuxiao
|
33886f106c
|
fix bug
|
2 years ago |
|
wangchuxiao
|
94ed160eee
|
fix bug
|
2 years ago |
|
wangchuxiao
|
066eeb6ba6
|
fix bug
|
2 years ago |
|
wangchuxiao
|
402b3f5535
|
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 |
|
Gordon
|
9a82dd356c
|
callback add offline info
|
2 years ago |
|
skiffer-git
|
dd001ab0e7
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
30b55ce25e
|
GetSelfUserInfo: Handle the case where the user does not exist
|
2 years ago |
|
wangchuxiao
|
943a5b36e3
|
Merge branch 'del' into v2.3.0release
|
2 years ago |
|
Gordon
|
eee98c5175
|
revoke super group message and push message modify
|
2 years ago |
|
wangchuxiao
|
d0a200f652
|
etcd
|
2 years ago |
|
wangchuxiao
|
6f2451edd3
|
etcd
|
2 years ago |
|
Gordon
|
a38291fc17
|
notification
|
2 years ago |
|
wangchuxiao
|
bda96a2175
|
fix
|
2 years ago |
|
wangchuxiao
|
64e1361ef5
|
fix signal bug
|
2 years ago |
|
skiffer-git
|
2f6eb5969e
|
getui
|
2 years ago |
|
skiffer-git
|
125b6fa779
|
Merge remote-tracking branch 'origin/del' into del
|
2 years ago |
|
skiffer-git
|
5e78871c00
|
getui
|
2 years ago |
|
Gordon
|
487d9a6449
|
notification
|
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
|
e8fdc454db
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
69da4410dc
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
5fc6f78555
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
15e0a7aa38
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
a37d82e2dd
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
0a14c8b3e6
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
e779280428
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
753cd95a18
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
5bd34f19fe
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
0e5b17adcc
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
b23f10ecde
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
08d6e142c3
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
2016a1656b
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
5a44618289
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
338d7f0df6
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
6d19af02c9
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
5a6f96f84b
|
update orgnization after update user
|
2 years ago |
|
wangchuxiao
|
3f74022142
|
Merge branch 'main' into del
|
2 years ago |
|
wangchuxiao
|
da8755fcb7
|
fix code
|
2 years ago |
|
wangchuxiao
|
3be284c129
|
fix code
|
2 years ago |
|
wangchuxiao
|
15e2d172a4
|
fix code
|
2 years ago |
|
wangchuxiao
|
4e54cb56e5
|
fix code
|
2 years ago |
|
wangchuxiao
|
1dbe80afc4
|
Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
|
2 years ago |
|
wangchuxiao
|
0683352c4b
|
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
|
37193c48d9
|
fix code
|
2 years ago |
|
wangchuxiao
|
1747ae8984
|
fix code
|
2 years ago |
|
wangchuxiao
|
dfee8891d3
|
fix code
|
2 years ago |
|
wangchuxiao
|
c6b669eb9d
|
fix code
|
2 years ago |
|
wangchuxiao
|
919e2543ca
|
fix code
|
2 years ago |
|
wangchuxiao
|
9aa7ba77f5
|
fix code
|
2 years ago |
|
wangchuxiao
|
d5b873b70b
|
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 |
|
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
|
44e4c59493
|
Restrict user login with IP
|
2 years ago |
|
skiffer-git
|
24e7076423
|
Restrict user login with IP
|
2 years ago |
|
skiffer-git
|
8b857f9980
|
Restrict user login with IP
|
2 years ago |
|
wangchuxiao
|
7d1707ca7c
|
fix log
|
2 years ago |
|
Gordon
|
652d560a21
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
be69ee8b1d
|
fcm update
|
2 years ago |
|
欧阳氏
|
ac7f905248
|
完善 用户注册 用户更新
|
2 years ago |
|
wangchuxiao
|
1a2ea05361
|
fix bug
|
2 years ago |
|
欧阳氏
|
39606248a1
|
邀请码功能
1、新增邀请码功能
needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
|
2 years ago |
|
skiffer-git
|
4e5c1606f3
|
log
|
2 years ago |
|
Gordon
|
b8aa54a159
|
mark message
|
2 years ago |
|
wangchuxiao
|
7caccce907
|
fix log
|
2 years ago |
|
wangchuxiao
|
82777d641c
|
fix log
|
2 years ago |
|
wangchuxiao
|
5b248c82f5
|
fix log
|
2 years ago |
|
Gordon
|
9c7ae3b0ef
|
mark message
|
2 years ago |
|
wangchuxiao
|
9b130ae56c
|
fix log
|
2 years ago |
|
wangchuxiao
|
a48b2e9edb
|
cms
|
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 |
|
Gordon
|
54cdb24cec
|
user add delete cache
|
2 years ago |
|
wangchuxiao
|
c2bd1d0d83
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
aa7ba6d659
|
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 |
|
skiffer-git
|
c9d7b63ef7
|
Multiple gateways
|
2 years ago |
|
wangchuxiao
|
06729c4e84
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
5c5f80691a
|
fix delete
|
2 years ago |
|
skiffer-git
|
079fe089de
|
Multiple gateways
|
2 years ago |
|
skiffer-git
|
5f83acf3ad
|
Multiple gateways
|
2 years ago |
|
skiffer-git
|
0d16fbe4ab
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
c1184fd7d2
|
Multiple gateways
|
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
|
911614673b
|
fix delete
|
2 years ago |
|
wangchuxiao
|
e80d3e7dac
|
fix delete
|
2 years ago |
|
wangchuxiao
|
7b820ebb94
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
6bfa8643d6
|
fix delete
|
2 years ago |
|
Gordon
|
25de6b58c3
|
conversation update
|
2 years ago |
|
wangchuxiao
|
cdc60ef5f0
|
fix delete
|
2 years ago |
|
wangchuxiao
|
edeb228315
|
fix delete
|
2 years ago |
|
wangchuxiao
|
f6c6d58045
|
fix delete
|
2 years ago |
|
wangchuxiao
|
b1d0ca76c9
|
fix delete
|
2 years ago |
|
wangchuxiao
|
5a058d9b97
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
2892add766
|
fix delete
|
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
|
2ee0943115
|
fix delete
|
2 years ago |
|
wangchuxiao
|
cfe218b8a4
|
fix delete
|
2 years ago |
|
wangchuxiao
|
a74168d1e1
|
fix delete
|
2 years ago |
|
wangchuxiao
|
f279b9173e
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
706f6c6747
|
getui debug
|
2 years ago |
|
Gordon
|
dd6c2df5d2
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
bcc0c7c2df
|
delete conversation update
|
2 years ago |
|
wangchuxiao
|
2c0a2d7877
|
getui debug
|
2 years ago |
|
Gordon
|
7bd7edfec9
|
send options bug fix
|
2 years ago |
|
Gordon
|
db8c4f369c
|
send options bug fix
|
2 years ago |
|
Gordon
|
569d5d2d89
|
super group add after callback
|
2 years ago |
|
skiffer-git
|
5cbea2cab5
|
Set token kicked status first in forceKickOff
|
2 years ago |
|
skiffer-git
|
57a21ab8e6
|
forceKickOff work
|
2 years ago |
|
skiffer-git
|
c52bdce621
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
# internal/api/user/user.go
|
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 |
|
Gordon
|
c304de9288
|
userinfo get
|
2 years ago |
|
skiffer-git
|
52e57cf547
|
fix bug
|
2 years ago |
|
Gordon
|
e33af2a316
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
ffc4da1589
|
callback add seq
|
2 years ago |
|
wangchuxiao
|
cd65d42004
|
getui debug
|
2 years ago |
|
skiffer-git
|
ae8acc6eba
|
GetGroupAbstractInfoResp
|
2 years ago |
|
skiffer-git
|
1e1381df8e
|
log
|
2 years ago |
|
wangchuxiao
|
2ba7fcd628
|
group hash
|
2 years ago |
|
wangchuxiao
|
1f8e161001
|
group hash
|
2 years ago |
|
wangchuxiao
|
b4b215a3f8
|
group hash
|
2 years ago |
|
wangchuxiao
|
e2ff7ef113
|
group hash
|
2 years ago |
|
wangchuxiao
|
73c998f510
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
11f29280b1
|
group hash
|
2 years ago |
|
Gordon
|
2cf10fce38
|
del conversation bug fix
|
2 years ago |
|
Gordon
|
2436ea6ff9
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
403489865c
|
del conversation bug fix
|
2 years ago |
|
wangchuxiao
|
c8590b9e9c
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
d1ffa9b330
|
callback fix
|
2 years ago |
|
Gordon
|
37799ca0be
|
del conversation bug fix
|
2 years ago |
|
Gordon
|
ba5edabb2c
|
del conversation bug fix
|
2 years ago |
|
Gordon
|
e77b4f334d
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
87c64bdb2b
|
del conversation bug fix
|
2 years ago |
|
skiffer-git
|
68eed69221
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
# pkg/base_info/group_api_struct.go
|
2 years ago |
|
skiffer-git
|
5db5bf17cb
|
add GetGroupAbstractInfo api
|
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
|
91a767b4fb
|
callback fix
|
2 years ago |
|
wangchuxiao
|
4e69ff196a
|
cache get group
|
2 years ago |
|
wangchuxiao
|
db547d60df
|
callback fix
|
2 years ago |
|
wangchuxiao
|
3d0827a6da
|
callback fix
|
2 years ago |
|
Gordon
|
231d4db71d
|
callback msg content
|
2 years ago |
|
Gordon
|
ca7bba33e6
|
docker-compose file update
|
2 years ago |
|
wangchuxiao
|
b294a8138c
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
a99dbf634b
|
callback fix
|
2 years ago |
|
skiffer-git
|
cda0fb6a10
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
a1392a7677
|
GetGroupAllMemberListBySplit
|
2 years ago |
|
Gordon
|
e9da7f28cc
|
Merge branch 'main' into v2.3.0release
# Conflicts:
# pkg/common/config/config.go
|
2 years ago |
|
Gordon
|
c4ee293388
|
docker-compose file update
|
2 years ago |
|
wangchuxiao
|
d99b0893df
|
fix bug
|
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
|
18891c554d
|
log add
|
2 years ago |
|
wangchuxiao
|
8e445caf26
|
fix bug
|
2 years ago |
|
wangchuxiao
|
d99375a536
|
fix bug
|
2 years ago |
|
wangchuxiao
|
4c610abd44
|
fix bug
|
2 years ago |
|
wangchuxiao
|
e1a941b998
|
fix bug
|
2 years ago |
|
wangchuxiao
|
9136838b63
|
fix bug
|
2 years ago |
|
wangchuxiao
|
ef9c291d9a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
6f968342dc
|
fix bug
|
2 years ago |
|
wangchuxiao
|
4930906b62
|
fix bug
|
2 years ago |
|
wangchuxiao
|
c39df537b4
|
minio obj locking
|
2 years ago |
|
欧阳氏
|
cfa9f2d13f
|
增加 AWS S3 存储
|
2 years ago |
|
wangchuxiao
|
146cf8750f
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
c25352b660
|
fix bug
|
2 years ago |
|
Gordon
|
7cc9d6707c
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
dca2f9323b
|
update server version
|
2 years ago |
|
wangchuxiao
|
7cf2fec3ea
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
ab6b1f0fca
|
fix bug
|
2 years ago |
|
wenxu12345
|
0b08bfdcba
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
4701300ed8
|
Adjust error code
|
2 years ago |
|
wangchuxiao
|
79a974946e
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
151fec445e
|
fix bug
|
2 years ago |
|
wenxu12345
|
d653e139d3
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
04e826ff09
|
Adjust error code
|
2 years ago |
|
wangchuxiao
|
b29f93dcd2
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
1c85424488
|
mongodb superGroup
|
2 years ago |
|
Gordon
|
490c94fa95
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
1b92774778
|
add test file
|
2 years ago |
|
wenxu12345
|
34588f9da3
|
Adjust error code
|
2 years ago |
|
wenxu12345
|
0811999081
|
Adjust error code
|
2 years ago |
|
wenxu12345
|
cf7e1c7767
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
ba4988bb9b
|
Adjust error code
|
2 years ago |
|
Gordon
|
cd3778a620
|
add test file
|
2 years ago |
|
Gordon
|
5b065ee68d
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
ee79728f9d
|
add test file
|
2 years ago |
|
wenxu12345
|
482c502356
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
92cdff3043
|
Adjust error code
|
2 years ago |
|
Gordon
|
b01474523e
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
9121063ebc
|
add test file
|
2 years ago |
|
wangchuxiao
|
2c34b11980
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
e1af587040
|
mongodb superGroup
|
2 years ago |
|
wenxu12345
|
efe727ec71
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
d278dfb996
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
9ed6afd836
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
6a19c8130c
|
Adjust error code
|
2 years ago |
|
Gordon
|
c43290338d
|
add test file
|
2 years ago |
|
wangchuxiao
|
da540522ac
|
mongodb superGroup
|
2 years ago |
|
wangchuxiao
|
73c5dc159b
|
mongodb superGroup
|
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
|
51679b47a6
|
delete super group message
|
2 years ago |
|
Gordon
|
1eda0ebea7
|
fcm push modify
|
2 years ago |
|
Gordon
|
787cef54f5
|
manger send msg modify
|
2 years ago |
|
Gordon
|
36885b4f9e
|
test
|
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
|
4c53023ebc
|
debug
|
2 years ago |
|
wenxu12345
|
17494b45bd
|
debug
|
2 years ago |
|
wenxu12345
|
90401d4d12
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
9730ada805
|
debug
|
2 years ago |
|
Gordon
|
5a626e9dab
|
add update conversation unread count
|
2 years ago |
|
Gordon
|
14d5b3b316
|
remove validation for notificationFaceURL
|
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
|
5a262880b9
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
f84cc0554f
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
2d20c4ee4c
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
041a35e3c8
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
cf205c2480
|
superGroupMaxSeq
|
2 years ago |
|
Gordon
|
09b830bcf9
|
super group add verification
|
2 years ago |
|
Gordon
|
7561831624
|
super group add verification
|
2 years ago |
|
Gordon
|
ccf6ef6140
|
super group add verification
|
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 |
|
Gordon
|
a71b42c335
|
not storage message push fix bug
|
2 years ago |
|
Gordon
|
f3ed48e0ac
|
seq add
|
2 years ago |
|
wangchuxiao
|
55cc8cead1
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
a3f62e2246
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
a5ef78fd1e
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
337d01008b
|
script
|
2 years ago |
|
skiffer-git
|
8bb82be2b9
|
fix bug : Two group owners
|
2 years ago |
|
wangchuxiao
|
eb1aeefc8c
|
Merge branch 'dtm' into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
|
2 years ago |
|
skiffer-git
|
e64cf47d31
|
rename
|
2 years ago |
|
skiffer-git
|
dd0d518ecd
|
rename
|
2 years ago |
|
skiffer-git
|
6d236a2dd6
|
rename
|
2 years ago |
|
skiffer-git
|
663db12594
|
rename
|
2 years ago |
|
skiffer-git
|
f383d6c636
|
rename
|
2 years ago |
|
skiffer-git
|
2b3bb92357
|
rename
|
2 years ago |
|
skiffer-git
|
87a2944837
|
rename
|
2 years ago |
|
skiffer-git
|
ea32c88d85
|
rename
|
2 years ago |
|
skiffer-git
|
725f8ce761
|
rename
|
2 years ago |
|
skiffer-git
|
3f42390f2f
|
rename
|
2 years ago |
|
skiffer-git
|
4d3343d0d0
|
rename
|
2 years ago |
|
skiffer-git
|
4b22eb946c
|
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
|
5afa3380a6
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
8ee4ca0357
|
docker-compose fix
|
2 years ago |
|
skiffer-git
|
5936492f76
|
Filter out disbanded groups
|
2 years ago |
|
skiffer-git
|
ad1d759840
|
Application for joining the group: JoinSource && InviterUserID
|
2 years ago |
|
skiffer-git
|
a55134ae63
|
fix bug: two group owners
|
2 years ago |
|
wangchuxiao
|
67b20d073e
|
docker-compose fix
|
2 years ago |
|
wangchuxiao
|
8a8fce927e
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model.go
|
2 years ago |
|
skiffer-git
|
2b2ecad437
|
fix bug
|
2 years ago |
|
wangchuxiao
|
89406f1c57
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model.go
|
2 years ago |
|
wangchuxiao
|
ea93e97e79
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
# pkg/common/db/mysql_model/im_mysql_model/group_model.go
|
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
|
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
|
33222d59c2
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
adb7da7aaf
|
group add field
|
2 years ago |
|
skiffer-git
|
04eb85d279
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
58847c7fb6
|
Update group member nickname when personal nickname is updated
|
2 years ago |
|
Gordon
|
504e4cc6a3
|
add super delete
|
2 years ago |
|
Gordon
|
f737d2e8ce
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
3157f97ae6
|
push fix bug
|
2 years ago |
|
wangchuxiao
|
278329b73c
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
033ec6bc76
|
fix bug
|
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
|
3ad3b30d97
|
demo
|
2 years ago |
|
wangchuxiao
|
d0e7147911
|
demo
|
2 years ago |
|
skiffer-git
|
d7ce455f2f
|
Super code can be disabled
|
2 years ago |
|
wangchuxiao
|
7ffe857f52
|
fix bug
|
2 years ago |
|
Gordon
|
f2b0f54c0b
|
test
|
2 years ago |
|
Gordon
|
a1025d8eee
|
test
|
2 years ago |
|
Gordon
|
b8cd9484dc
|
test
|
2 years ago |
|
skiffer-git
|
e23d5926dd
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
5c4982a3f1
|
fix bug
|
2 years ago |
|
wangchuxiao
|
36667b8649
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
088f9dae9b
|
demo
|
2 years ago |
|
skiffer-git
|
ed52ecb259
|
fix bug
|
2 years ago |
|
skiffer-git
|
54566997b2
|
fix bug
|
2 years ago |
|
skiffer-git
|
4783e3d061
|
log
|
2 years ago |
|
skiffer-git
|
658d97ff4e
|
log
|
2 years ago |
|
skiffer-git
|
3373925acf
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9d84bf8f4c
|
log
|
2 years ago |
|
Gordon
|
1650165f4b
|
group add verify
|
2 years ago |
|
wangchuxiao
|
8849cd46c9
|
callback
|
2 years ago |
|
Gordon
|
1fa38a24b6
|
compose file update
|
2 years ago |
|
Gordon
|
1d105dd345
|
compose file update
|
2 years ago |
|
wangchuxiao
|
7823306045
|
demo
|
2 years ago |
|
wangchuxiao
|
53b0d13342
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
f51fbecfee
|
callback
|
2 years ago |
|
Gordon
|
1f968a606b
|
compose file update
|
2 years ago |
|
Gordon
|
a13397bc17
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
323e8e72cc
|
compose file update
|
2 years ago |
|
wangchuxiao
|
80a67d0970
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
4e22970784
|
minio
|
2 years ago |
|
Gordon
|
013828eb03
|
sms test
|
2 years ago |
|
Gordon
|
10132879f2
|
sms test
|
2 years ago |
|
Gordon
|
832871d49d
|
sms test
|
2 years ago |
|
wangchuxiao
|
e5ccc1dd36
|
minio
|
2 years ago |
|
wangchuxiao
|
61951863ad
|
minio
|
2 years ago |
|
wangchuxiao
|
64c6a68d34
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
0054c4cc58
|
minio
|
2 years ago |
|
Gordon
|
5bf494ca7d
|
code update
|
2 years ago |
|
Gordon
|
da81f70161
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
f3e21ac814
|
code update
|
2 years ago |
|
wangchuxiao
|
2907cac50f
|
swagger
|
2 years ago |
|
wangchuxiao
|
4eeef63724
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
# Conflicts:
# internal/api/group/group.go
|
2 years ago |
|
wangchuxiao
|
0c7f57d55d
|
swagger docs
|
2 years ago |
|
skiffer-git
|
3da6597643
|
fix bug
|
2 years ago |
|
skiffer-git
|
26bd3bf76d
|
fix bug
|
2 years ago |
|
skiffer-git
|
d17d7a792a
|
fix bug
|
2 years ago |
|
skiffer-git
|
dc9f7dc294
|
fix bug
|
2 years ago |
|
skiffer-git
|
92b219769d
|
fix bug
|
2 years ago |
|
skiffer-git
|
3e630a3882
|
fix bug
|
2 years ago |
|
skiffer-git
|
de32c46ea4
|
debug
|
2 years ago |
|
skiffer-git
|
722b5d0726
|
debug
|
2 years ago |
|
skiffer-git
|
d51af59f85
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
5102f83290
|
debug
|
2 years ago |
|
wangchuxiao
|
5207e268de
|
swagger doc
|
2 years ago |
|
wangchuxiao
|
14b53276b9
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
a6c63e7968
|
swagger init
|
2 years ago |
|
Gordon
|
d8717bd0b4
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
cfcc5c1095
|
test
|
2 years ago |
|
wangchuxiao
|
79b1a801b5
|
demo
|
2 years ago |
|
wangchuxiao
|
79907b374a
|
alter demo
|
2 years ago |
|
wangchuxiao
|
99062805ec
|
add swagger demo
|
2 years ago |
|
wenxu12345
|
5b8ef3a17c
|
verification gor joining group chat
|
2 years ago |
|
wenxu12345
|
2f5d8dfb80
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
wenxu12345
|
218340e138
|
Rpc Register IP
|
2 years ago |
|
wangchuxiao
|
c4ea10d0af
|
fix bug
|
2 years ago |
|
wangchuxiao
|
bb8dcd8b61
|
fix bug
|
2 years ago |
|
wangchuxiao
|
2372340e0d
|
fix bug
|
2 years ago |
|
wangchuxiao
|
f78f7e97ee
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
6b78b75638
|
fix bug
|
2 years ago |
|
wenxu12345
|
1a3b5d018a
|
Handling token exceptions
|
2 years ago |
|
wenxu12345
|
68e611794b
|
debug
|
2 years ago |
|
wenxu12345
|
9b76eb6b55
|
debug
|
2 years ago |
|
wenxu12345
|
08d9551230
|
debug
|
2 years ago |
|
wenxu12345
|
c3bdd2f288
|
debug
|
2 years ago |
|
wenxu12345
|
49797ce6ab
|
super group notification
|
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
|
b80f510de5
|
quit superGroup add notification
|
2 years ago |
|
wangchuxiao
|
f82f9567c2
|
merge super 2 tuoyun
|
2 years ago |
|
wangchuxiao
|
0a2951c2eb
|
Merge branch 'superGroup' into tuoyun
# Conflicts:
# internal/push/logic/push_to_client.go
|
2 years ago |
|
wangchuxiao
|
3451d22460
|
signal
|
2 years ago |
|
wangchuxiao
|
0d5dc6bdd8
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
Gordon
|
87e6aedb74
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
9b5bd47760
|
config file update
|
2 years ago |
|
wangchuxiao
|
007065b40e
|
入职流程
|
2 years ago |
|
wangchuxiao
|
c5eb8a3f9b
|
入职流程
|
2 years ago |
|
wangchuxiao
|
7fbdff391c
|
fix bug
|
2 years ago |
|
skiffer-git
|
f1b5f56294
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
ed3b62480c
|
log for etcd
|
2 years ago |
|
Gordon
|
573937e1e5
|
msg transfer handle change
|
2 years ago |
|
Gordon
|
8e3f090ffe
|
msg transfer handle change
|
2 years ago |
|
Gordon
|
903c39206f
|
msg transfer handle change
|
2 years ago |
|
Gordon
|
29dbb36961
|
user proto modify
|
2 years ago |
|
wangchuxiao
|
20851f2a96
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7ea7dffd4a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
5ea620a4cd
|
fix bug
|
2 years ago |
|
wangchuxiao
|
4e11c7a9e2
|
fix bug
|
2 years ago |
|
wangchuxiao
|
9503766a68
|
fix bug
|
2 years ago |
|
skiffer-git
|
19bbd9b528
|
fix bug
|
2 years ago |
|
skiffer-git
|
3f455199eb
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
24f2ffe82d
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
wangchuxiao
|
86c5d694e5
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
8c963c669b
|
redis interface
|
2 years ago |
|
skiffer-git
|
d058cacb38
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
abb9ebaf76
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
167ebd6975
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
98821c95b6
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
89aef130a5
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
8d3d41831d
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
066a7041d8
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
50df9bdf4e
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
eab9e4ab92
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
56cf46a3a4
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
90442e3e39
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
02c594d4ec
|
Handling exception: getcdv3.GetConn == nil
|
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 |
|
Gordon
|
071a7fa629
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
0a44a8e78a
|
add global recv opt
|
2 years ago |
|
wangchuxiao
|
59743ef071
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
077482d759
|
Merge branch 'tuoyun' into superGroup
# Conflicts:
# internal/push/logic/push_to_client.go
|
2 years ago |
|
Gordon
|
7e6e214f08
|
add global recv opt
|
2 years ago |
|
wangchuxiao
|
b6634d26d1
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
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
|
0d2c0e91c8
|
use sarama v1.29.0
|
2 years ago |
|
skiffer-git
|
7cbd840060
|
Optimization for log
|
2 years ago |
|
skiffer-git
|
04ee5269fe
|
Optimization for log
|
2 years ago |
|
skiffer-git
|
1af78c9bcb
|
Optimization for log
|
2 years ago |
|
skiffer-git
|
9f7cc1ae69
|
Optimization for log
|
2 years ago |
|
skiffer-git
|
f4f6ea681e
|
Optimization for log
|
2 years ago |
|
wangchuxiao
|
21051900f9
|
hash userID
|
2 years ago |
|
Gordon
|
f96e12a8b3
|
redis replace to go_redis
|
2 years ago |
|
wangchuxiao
|
7dbc8a4253
|
go-redis
|
2 years ago |
|
wangchuxiao
|
8a0c112072
|
alter rtc timeout
|
2 years ago |
|
wangchuxiao
|
16641f0494
|
alter rtc timeout
|
2 years ago |
|
wangchuxiao
|
5965dcd029
|
alter rtc timeout
|
2 years ago |
|
wangchuxiao
|
e45ef5c49a
|
alter rtc timeout
|
2 years ago |
|
wangchuxiao
|
9eed6ce197
|
alter rtc timeout
|
2 years ago |
|
Gordon
|
1e62ddce73
|
super update
|
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
|
926de3fa94
|
log
|
2 years ago |
|
Gordon
|
38ded2c43d
|
send message remove online status split
|
2 years ago |
|
wangchuxiao
|
f324bb603d
|
rtc
|
2 years ago |
|
wangchuxiao
|
d7884f89f5
|
rtc
|
2 years ago |
|
wangchuxiao
|
9c1ca78fed
|
rtc
|
2 years ago |
|
wangchuxiao
|
31c123a09b
|
rtc
|
2 years ago |
|
wangchuxiao
|
0e93295cdf
|
rtc
|
2 years ago |
|
wangchuxiao
|
5e7eda6781
|
rtc
|
2 years ago |
|
wangchuxiao
|
f31179bb9a
|
rtc
|
2 years ago |
|
skiffer-git
|
7308d0f9c6
|
config
|
2 years ago |
|
skiffer-git
|
5be23220e4
|
super group
|
2 years ago |
|
skiffer-git
|
25310d5e88
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
2 years ago |
|
skiffer-git
|
4bc9da3910
|
set groupID
|
2 years ago |
|
wangchuxiao
|
6dfba3c7b8
|
group
|
2 years ago |
|
wangchuxiao
|
94ec584dc3
|
signal
|
2 years ago |
|
Gordon
|
043188ab5e
|
push update
|
2 years ago |
|
Gordon
|
50f7057f68
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
f3b083cafd
|
push update
|
2 years ago |
|
wangchuxiao
|
d881ab5fea
|
signal
|
2 years ago |
|
skiffer-git
|
464200e693
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9ae84a69be
|
SuperGroupOnlineBatchPushOneMsg
|
2 years ago |
|
wangchuxiao
|
47184ca01e
|
org
|
2 years ago |
|
wangchuxiao
|
39d4d01814
|
org
|
2 years ago |
|
wangchuxiao
|
5419478c48
|
org
|
2 years ago |
|
wangchuxiao
|
7d6701780c
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
dbc055efb4
|
org
|
2 years ago |
|
skiffer-git
|
f9c2b4c28e
|
SuperGroupOnlineBatchPushOneMsg
|
2 years ago |
|
Gordon
|
7c90baf7bf
|
remove online offline split
|
2 years ago |
|
skiffer-git
|
67807a3aa7
|
remove kick
|
2 years ago |
|
skiffer-git
|
dca39d6eae
|
set time out
|
2 years ago |
|
skiffer-git
|
768d139789
|
set time out
|
2 years ago |
|
skiffer-git
|
af612e4b92
|
log
|
2 years ago |
|
skiffer-git
|
ef23fba147
|
log
|
2 years ago |
|
skiffer-git
|
5f813c6f70
|
fix bug
|
2 years ago |
|
skiffer-git
|
c171728749
|
fix bug
|
2 years ago |
|
skiffer-git
|
85c0e1f330
|
debug log
|
2 years ago |
|
skiffer-git
|
8269e61163
|
debug log
|
2 years ago |
|
skiffer-git
|
ae6c09aae2
|
debug log
|
2 years ago |
|
skiffer-git
|
9619584de5
|
debug
|
2 years ago |
|
skiffer-git
|
dad40d60b3
|
debug
|
2 years ago |
|
skiffer-git
|
9216a085cf
|
log
|
2 years ago |
|
skiffer-git
|
952033f409
|
compile
|
2 years ago |
|
skiffer-git
|
dc10c7e3e7
|
batch push
|
2 years ago |
|
skiffer-git
|
a84c8bd273
|
SetWriteTimeoutWriteMsg
|
2 years ago |
|
skiffer-git
|
2d3d351e26
|
log
|
2 years ago |
|
skiffer-git
|
e375188889
|
log
|
2 years ago |
|
skiffer-git
|
5860f1fa7a
|
add send msg timeout
|
2 years ago |
|
skiffer-git
|
6a149c74d1
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
2 years ago |
|
skiffer-git
|
6ae71dba4f
|
add send msg timeout
|
2 years ago |
|
wangchuxiao
|
8a471a5455
|
base64 userID
|
2 years ago |
|
wangchuxiao
|
fdaf4380fa
|
base64 userID
|
2 years ago |
|
wangchuxiao
|
e95f09191a
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
fa02c20e1c
|
fix signal
|
2 years ago |
|
wangchuxiao
|
1687b70bde
|
fix signal
|
2 years ago |
|
skiffer-git
|
d49ceef637
|
log
|
2 years ago |
|
skiffer-git
|
da573ac573
|
log
|
2 years ago |
|
skiffer-git
|
743eaab9f6
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
202811f3c6
|
groupID digitization
|
2 years ago |
|
wangchuxiao
|
6250603440
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
650c7a3ae0
|
fix json word
|
2 years ago |
|
Gordon
|
42d75decb0
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
55f6aa9ff8
|
add batch push
|
2 years ago |
|
skiffer-git
|
0e77caa329
|
batch push
|
2 years ago |
|
wangchuxiao
|
da0e73fe11
|
fix json word
|
2 years ago |
|
wangchuxiao
|
fc5ab3572e
|
fix word
|
2 years ago |
|
wangchuxiao
|
1c52e731e1
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
ee615fbadf
|
fix word
|
2 years ago |
|
Gordon
|
2ede9ef8ed
|
add batch push
|
2 years ago |
|
Gordon
|
7d63c82ddd
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
1d4dc81e55
|
add batch push
|
2 years ago |
|
wangchuxiao
|
793996e047
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
ab76d46007
|
demo
|
2 years ago |
|
skiffer-git
|
ed1e22bac5
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
e57ce28d2b
|
batch push
|
2 years ago |
|
wangchuxiao
|
2b596e226a
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
2 years ago |
|
wangchuxiao
|
c46f574aa8
|
fix bug
|
2 years ago |
|
wangchuxiao
|
3f129513bb
|
fix bug
|
2 years ago |
|
skiffer-git
|
60f8f93a02
|
batch push
|
2 years ago |
|
skiffer-git
|
11e619d1b3
|
log
|
2 years ago |
|
skiffer-git
|
4f184a6723
|
batch push
|
2 years ago |
|
skiffer-git
|
5fd91e808a
|
batch push
|
2 years ago |
|
skiffer-git
|
32565dd188
|
config for msg read receipt
|
2 years ago |
|
skiffer-git
|
96f09c45f5
|
batch push
|
2 years ago |
|
skiffer-git
|
d2474c8a72
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9eb0dd5e70
|
batch push
|
2 years ago |
|
wangchuxiao
|
bbdcb34ab6
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
6525d63459
|
fix bug
|
2 years ago |
|
skiffer-git
|
0babf89aa5
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
317e6f81bb
|
batch push
|
2 years ago |
|
wangchuxiao
|
d9710ac244
|
fix bug
|
2 years ago |
|
wangchuxiao
|
da18950b3d
|
fix bug
|
2 years ago |
|
wangchuxiao
|
6055ce9b6b
|
fix bug
|
2 years ago |
|
wangchuxiao
|
bd14739a9e
|
fix bug
|
2 years ago |
|
wangchuxiao
|
843cbe4f80
|
organization
|
2 years ago |
|
wangchuxiao
|
f650e73d5c
|
fix bug
|
2 years ago |
|
Gordon
|
d1293dd047
|
log
|
2 years ago |
|
skiffer-git
|
553b56d094
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
2 years ago |
|
skiffer-git
|
fec57c4ed7
|
log
|
2 years ago |
|
Gordon
|
b46f106a91
|
log
|
2 years ago |
|
Gordon
|
d587d14f86
|
log
|
2 years ago |
|
wangchuxiao
|
a115151616
|
fix bug
|
2 years ago |
|
wangchuxiao
|
26771ee7d0
|
organization
|
2 years ago |
|
Gordon
|
731263638b
|
log
|
2 years ago |
|
wangchuxiao
|
a4f69351ce
|
fix bug
|
2 years ago |
|
wangchuxiao
|
fa5f234a38
|
fix bug
|
2 years ago |
|
wangchuxiao
|
5d2c981368
|
fix bug
|
2 years ago |
|
wangchuxiao
|
4a55842724
|
fix bug
|
2 years ago |
|
wangchuxiao
|
e9655ed05e
|
fix bug
|
2 years ago |
|
wangchuxiao
|
ed7d2bbdd7
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
276328e0fd
|
fix bug
|
2 years ago |
|
Gordon
|
7d0c8b0c5f
|
super group add notification
|
2 years ago |
|
Gordon
|
88c4cff50c
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
cfe01bb820
|
super group push
|
2 years ago |
|
wangchuxiao
|
4f1bd4e509
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
Gordon
|
88544a89b7
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
a87e41eecd
|
super group push
|
2 years ago |
|
wangchuxiao
|
e52639d1d4
|
fix bug
|
2 years ago |
|
skiffer-git
|
0463f5e83d
|
fix bug
|
2 years ago |
|
skiffer-git
|
eb90314b38
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
6ce1d60ebb
|
log
|
2 years ago |
|
wangchuxiao
|
5fa62c9fbd
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
Gordon
|
ef93a1f42e
|
add conversation sync
|
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 |
|
wangchuxiao
|
269df23851
|
set group memberInfo
|
2 years ago |
|
wangchuxiao
|
c40dc64bd0
|
set group memberInfo
|
2 years ago |
|
skiffer-git
|
2b150e3c1c
|
KickUserOffline
|
2 years ago |
|
skiffer-git
|
3f2638efaf
|
KickUserOffline
|
2 years ago |
|
skiffer-git
|
afe8dcc1ff
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
wangchuxiao
|
8f1e439381
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
2 years ago |
|
skiffer-git
|
4418d031e1
|
log
|
2 years ago |
|
wangchuxiao
|
f3fc452904
|
group set memberInfo
|
2 years ago |
|
Gordon
|
89f40fe3de
|
kick
|
2 years ago |
|
Gordon
|
f8962beca6
|
kick
|
2 years ago |
|
skiffer-git
|
dae1569f0e
|
debug userid == ""
|
2 years ago |
|
skiffer-git
|
dd76c268c5
|
debug userid == ""
|
2 years ago |
|
skiffer-git
|
52c52f23d3
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# internal/msg_transfer/logic/online_history_msg_handler.go
|
2 years ago |
|
skiffer-git
|
3adcb9f164
|
debug userid == ""
|
2 years ago |
|
Gordon
|
0f1a061afe
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
2 years ago |
|
Gordon
|
95705cc95a
|
log
|
2 years ago |
|
wangchuxiao
|
07b652c1d4
|
singal offline push
|
2 years ago |
|
skiffer-git
|
eac137a9a9
|
ForceLogout
|
2 years ago |
|
Gordon
|
6ec65965a4
|
log
|
2 years ago |
|
skiffer-git
|
290ae774e0
|
ForceLogout
|
2 years ago |
|
Gordon
|
ae52f85502
|
log
|
2 years ago |
|
skiffer-git
|
fcda79eb3c
|
fix bug: v.MsgData == nil
|
2 years ago |
|
skiffer-git
|
385f371c06
|
fix bug: v.MsgData == nil
|
2 years ago |
|
skiffer-git
|
6efb1a6705
|
fix bug: v.MsgData == nil
|
2 years ago |
|
Gordon
|
4695ef3208
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
34e8b79e7e
|
pb file
|
2 years ago |
|
skiffer-git
|
3639f943bf
|
group administrator access
|
2 years ago |
|
skiffer-git
|
d373369649
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9106e70b37
|
group administrator access
|
2 years ago |
|
Gordon
|
4678189ed4
|
pb file
|
2 years ago |
|
skiffer-git
|
064b650fac
|
group administrator access
|
2 years ago |
|
wangchuxiao
|
f8b4cbcc13
|
singal offline push
|
2 years ago |
|
Gordon
|
2f9c8dbb33
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
Gordon
|
8bd5db431b
|
add function
|
2 years ago |
|
skiffer-git
|
5754510d7a
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
797e2fea1e
|
group info set
|
2 years ago |
|
wangchuxiao
|
538656fcc7
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
0f66fa528d
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
e428e186f0
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
d3abc44976
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
a647007a0f
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
cfe0272022
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
2e3b55d9e8
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
6b8ebe11de
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
1fffd36054
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
2b25fea86c
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
409a8311b1
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
6996c008d0
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
16d33b1c1f
|
singal offline push
|
3 years ago |
|
Gordon
|
0a260a67d5
|
ws and push update
|
3 years ago |
|
Gordon
|
1aacd3cb23
|
ws and push update
|
3 years ago |
|
Gordon
|
5af3ba9db6
|
ws and push update
|
3 years ago |
|
Gordon
|
febc672e6e
|
ws and push update
|
3 years ago |
|
Gordon
|
a18dcfce9e
|
ws and push update
|
3 years ago |
|
wenxu12345
|
da1df91f49
|
Clear msg
|
3 years ago |
|
wenxu12345
|
b2df6e6d41
|
Clear msg
|
3 years ago |
|
wenxu12345
|
2b4df5be16
|
Clear personal chat history
|
3 years ago |
|
wangchuxiao
|
f98da25fda
|
organization
|
3 years ago |
|
Gordon
|
0aefab34f1
|
log
|
3 years ago |
|
Gordon
|
5392c9fd38
|
log
|
3 years ago |
|
Gordon
|
1db3ecca22
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
3 years ago |
|
Gordon
|
25450a4182
|
message update
|
3 years ago |
|
wangchuxiao
|
cf094a2048
|
superGroup
|
3 years ago |
|
wangchuxiao
|
10881c8f5b
|
superGroup
|
3 years ago |
|
wangchuxiao
|
653c0faa18
|
superGroup
|
3 years ago |
|
wangchuxiao
|
3b81108738
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
3 years ago |
|
wangchuxiao
|
110f5e02f4
|
superGroup
|
3 years ago |
|
Gordon
|
a4a7ce51ad
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
3 years ago |
|
Gordon
|
08a7dbe319
|
message update
|
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 |
|
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 |
|
wangchuxiao
|
c0a3bdcf99
|
k8s
|
3 years ago |
|
Gordon
|
7285e2b2c9
|
add super group
|
3 years ago |
|
wangchuxiao
|
8967343079
|
superGroup
|
3 years ago |
|
wangchuxiao
|
8cdcd7105a
|
superGroup
|
3 years ago |
|
wangchuxiao
|
cc6d8d28b5
|
superGroup
|
3 years ago |
|
wangchuxiao
|
b55e13dbeb
|
superGroup
|
3 years ago |
|
wangchuxiao
|
bbe8c46df9
|
callback
|
3 years ago |
|
wangchuxiao
|
16a56457ed
|
callback
|
3 years ago |
|
wangchuxiao
|
d6907f3f3a
|
callback
|
3 years ago |
|
wangchuxiao
|
cbf0b3c05e
|
callback
|
3 years ago |
|
wangchuxiao
|
0f0470b93c
|
callback
|
3 years ago |
|
wangchuxiao
|
f54ba4b018
|
callback
|
3 years ago |
|
wangchuxiao
|
884b410dce
|
callback
|
3 years ago |
|
wangchuxiao
|
e5945fa720
|
callback
|
3 years ago |
|
wangchuxiao
|
b155a9908b
|
callback
|
3 years ago |
|
wangchuxiao
|
d67e4a3491
|
callback
|
3 years ago |
|
wangchuxiao
|
f5befcc95f
|
callback
|
3 years ago |
|
wangchuxiao
|
098f8a52f7
|
callback
|
3 years ago |
|
wangchuxiao
|
1eeb7f8303
|
callback
|
3 years ago |
|
wangchuxiao
|
b4da35a0ab
|
ingress
|
3 years ago |
|
wangchuxiao
|
9beff11125
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
d8c0a82411
|
ingress
|
3 years ago |
|
Gordon
|
2add9a02f9
|
channelNum
|
3 years ago |
|
Gordon
|
2910a6effd
|
channelNum
|
3 years ago |
|
Gordon
|
5621a651a1
|
channelNum
|
3 years ago |
|
Gordon
|
c83e816bda
|
channelNum
|
3 years ago |
|
Gordon
|
948e5a2dde
|
channelNum
|
3 years ago |
|
Gordon
|
94cd17909d
|
channelNum
|
3 years ago |
|
Gordon
|
bcfa3efef7
|
channelNum
|
3 years ago |
|
Gordon
|
bf87eb68e2
|
channelNum
|
3 years ago |
|
Gordon
|
ee47c6d727
|
channelNum
|
3 years ago |
|
Gordon
|
c997fbafb0
|
channelNum
|
3 years ago |
|
Gordon
|
17b7ef80ba
|
channelNum
|
3 years ago |
|
Gordon
|
dc2bc7fbf7
|
channelNum
|
3 years ago |
|
Gordon
|
7267fd080e
|
channelNum
|
3 years ago |
|
Gordon
|
2d8e03cc69
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
b797492dbd
|
channelNum
|
3 years ago |
|
Gordon
|
eb41d8b16d
|
channelNum
|
3 years ago |
|
Gordon
|
84e7935971
|
channelNum
|
3 years ago |
|
wenxu12345
|
e8fe7cc853
|
debug
|
3 years ago |
|
Gordon
|
746b01f8ca
|
push update
|
3 years ago |
|
wangchuxiao
|
9895806d23
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
5957e4b264
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
3 years ago |
|
Gordon
|
c544c4d6b5
|
push update
|
3 years ago |
|
wangchuxiao
|
4d8708a5ee
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
3 years ago |
|
wangchuxiao
|
9eb1870196
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/msg/rpcChat.go
|
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
|
841566a5d1
|
del msg
|
3 years ago |
|
Gordon
|
4a822c5920
|
push update
|
3 years ago |
|
Gordon
|
ce554fc442
|
push update
|
3 years ago |
|
Gordon
|
b14b53329c
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
b8641258d6
|
message update
|
3 years ago |
|
wangchuxiao
|
6022aff965
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
18eaae80ec
|
del msg
|
3 years ago |
|
Gordon
|
a4e41462c7
|
message update
|
3 years ago |
|
Gordon
|
77c7efbe89
|
redis add get message
|
3 years ago |
|
Gordon
|
8d78ef5946
|
redis add get message
|
3 years ago |
|
Gordon
|
4571a3b50b
|
redis add get message
|
3 years ago |
|
Gordon
|
b48197c8aa
|
redis add get message
|
3 years ago |
|
Gordon
|
bb45c0c34b
|
redis add get message
|
3 years ago |
|
Gordon
|
25c316165e
|
redis add get message
|
3 years ago |
|
wenxu12345
|
1246f3aa21
|
msg cache
|
3 years ago |
|
Gordon
|
94e6380485
|
redis add get message
|
3 years ago |
|
Gordon
|
36b5315075
|
redis add get message
|
3 years ago |
|
Gordon
|
c66ccfeda2
|
redis add get message
|
3 years ago |
|
wenxu12345
|
db9913c725
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
c3e3f4e947
|
msg cache
|
3 years ago |
|
wangchuxiao
|
f33937bc5d
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
c176a5b80a
|
msg cache
|
3 years ago |
|
Gordon
|
d58f7fd089
|
redis add get message
|
3 years ago |
|
Gordon
|
ffae976e11
|
compose file update
|
3 years ago |
|
Gordon
|
a4d2740f24
|
consumer update test
|
3 years ago |
|
Gordon
|
df7266cc75
|
consumer update test
|
3 years ago |
|
Gordon
|
3255b73a44
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
305e81bef1
|
consumer update test
|
3 years ago |
|
wangchuxiao
|
84cc6e9140
|
k8s deploy
|
3 years ago |
|
Gordon
|
7fc6b61f21
|
consumer update
|
3 years ago |
|
Gordon
|
ed3a1296d8
|
consumer update
|
3 years ago |
|
wangchuxiao
|
ce15c26b59
|
k8s deploy
|
3 years ago |
|
wangchuxiao
|
8c64538207
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
0460033281
|
k8s deploy
|
3 years ago |
|
Gordon
|
e385f054df
|
message handle
|
3 years ago |
|
Gordon
|
50bb13b7cd
|
message handle
|
3 years ago |
|
wangchuxiao
|
d1cb176b31
|
del msg sync
|
3 years ago |
|
Gordon
|
767131a117
|
message handle
|
3 years ago |
|
Gordon
|
f0dadcef70
|
message handle
|
3 years ago |
|
skiffer-git
|
1f20024b91
|
log
|
3 years ago |
|
skiffer-git
|
f5c7197dda
|
log
|
3 years ago |
|
skiffer-git
|
bef0e40db8
|
log
|
3 years ago |
|
skiffer-git
|
24073b20ab
|
log
|
3 years ago |
|
skiffer-git
|
64d83d9048
|
log
|
3 years ago |
|
skiffer-git
|
5c0b06f27d
|
log
|
3 years ago |
|
skiffer-git
|
b09e2c11eb
|
sess == nil
|
3 years ago |
|
skiffer-git
|
8c119a76d1
|
sess == nil
|
3 years ago |
|
skiffer-git
|
04a9788bc0
|
log
|
3 years ago |
|
skiffer-git
|
883e7f96ee
|
log
|
3 years ago |
|
skiffer-git
|
d276be9594
|
Reduce memory copies
|
3 years ago |
|
skiffer-git
|
2fc6b0a8cb
|
log
|
3 years ago |
|
skiffer-git
|
9f295d8399
|
log
|
3 years ago |
|
skiffer-git
|
024f454702
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
821ad4de2e
|
log
|
3 years ago |
|
Gordon
|
b864f9c6a9
|
message
|
3 years ago |
|
Gordon
|
31e0a8a88b
|
log change
|
3 years ago |
|
Gordon
|
be3d2b6552
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# internal/msg_transfer/logic/online_history_msg_handler.go
|
3 years ago |
|
Gordon
|
e2eb546069
|
log change
|
3 years ago |
|
skiffer-git
|
b2ae3b4fee
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
5b9e5f904b
|
log
|
3 years ago |
|
Gordon
|
7d1843f485
|
log change
|
3 years ago |
|
skiffer-git
|
f1e2704407
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
17b4a0525d
|
log
|
3 years ago |
|
Gordon
|
5cdba3c00a
|
log change
|
3 years ago |
|
Gordon
|
79b5551ec1
|
log change
|
3 years ago |
|
Gordon
|
01b065b3c2
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
55907a9a05
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
757829d286
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
c5f055718a
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
a12c8f4dbc
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
686d77dcc1
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
aa144b0439
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
15329a97fe
|
concurrent consumption of messages
|
3 years ago |
|
skiffer-git
|
223b2678b4
|
fix bug
|
3 years ago |
|
Gordon
|
930923e330
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
8fe929d8ab
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
e12207fc73
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
a2f7edcbcd
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
aa733542e3
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
2b142baf19
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
7ea1309146
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
06726758d2
|
concurrent consumption of messages
|
3 years ago |
|
skiffer-git
|
00a2a23190
|
batch to mongo
|
3 years ago |
|
skiffer-git
|
5f25e605d3
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
d4f81f086c
|
batch to mongo
|
3 years ago |
|
Gordon
|
d086de8103
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
a2888b009d
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
143e2908ad
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
ee0a71de1b
|
concurrent consumption of messages
|
3 years ago |
|
Gordon
|
d92d6e84d0
|
push message
|
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 |
|
wangchuxiao
|
18a61061e1
|
office tag async send
|
3 years ago |
|
wangchuxiao
|
b0e349212d
|
office tag async send
|
3 years ago |
|
wangchuxiao
|
9913e67928
|
office tag async send
|
3 years ago |
|
wangchuxiao
|
888c837cdd
|
office tag async send
|
3 years ago |
|
wangchuxiao
|
0e03fb6393
|
organization
|
3 years ago |
|
wangchuxiao
|
317fed304c
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
681cf349e6
|
organization
|
3 years ago |
|
skiffer-git
|
313cf858f0
|
Statistics
|
3 years ago |
|
Gordon
|
fa94fd075f
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
3433d211a5
|
options add value
|
3 years ago |
|
skiffer-git
|
3046d63ad4
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
de9c2d3d85
|
mutex
|
3 years ago |
|
wangchuxiao
|
2454c50380
|
organization
|
3 years ago |
|
wangchuxiao
|
e2f8156a4d
|
organization
|
3 years ago |
