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 |
|
Gordon
|
24137bffdd
|
conversation update
|
2 years ago |
|
Gordon
|
621051cfb9
|
pb update
|
2 years ago |
|
Gordon
|
c1a2dee0e9
|
pb update
|
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
|
d20c89ba21
|
merge shichuang 2 v2.3.0release
|
2 years ago |
|
wangchuxiao
|
ee577cae4c
|
add conversationCache
|
2 years ago |
|
skiffer-git
|
5d661f2fc6
|
add user register IP
|
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 |
|
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
|
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 |
欧阳氏
|
7b9d0b4f1f
|
封禁用户列表
|
2 years ago |
|
wangchuxiao
|
7d1707ca7c
|
fix log
|
2 years ago |
|
欧阳氏
|
ac7f905248
|
完善 用户注册 用户更新
|
2 years ago |
|
欧阳氏
|
39606248a1
|
邀请码功能
1、新增邀请码功能
needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
|
2 years ago |
|
wangchuxiao
|
5b248c82f5
|
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
|
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 |
|
Gordon
|
25de6b58c3
|
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 |
|
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
|
b4b215a3f8
|
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
|
403489865c
|
del conversation bug fix
|
2 years ago |
|
Gordon
|
37799ca0be
|
del conversation bug 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
|
4e69ff196a
|
cache get group
|
2 years ago |
|
wangchuxiao
|
db547d60df
|
callback fix
|
2 years ago |
|
wangchuxiao
|
3d0827a6da
|
callback fix
|
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 |
|
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
|
f202d5f54a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
ef9c291d9a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
c25352b660
|
fix bug
|
2 years ago |
|
wangchuxiao
|
151fec445e
|
fix bug
|
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
|
787cef54f5
|
manger send msg modify
|
2 years ago |
|
Gordon
|
5a626e9dab
|
add update conversation unread count
|
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
|
ccf6ef6140
|
super group add verification
|
2 years ago |
|
Gordon
|
f3ed48e0ac
|
seq add
|
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
|
f383d6c636
|
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
|
58847c7fb6
|
Update group member nickname when personal nickname is updated
|
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
|
7ffe857f52
|
fix bug
|
2 years ago |
|
Gordon
|
f2b0f54c0b
|
test
|
2 years ago |
|
Gordon
|
a1025d8eee
|
test
|
2 years ago |
|
Gordon
|
b8cd9484dc
|
test
|
2 years ago |
|
Gordon
|
1650165f4b
|
group add verify
|
2 years ago |
|
wangchuxiao
|
f51fbecfee
|
callback
|
2 years ago |
|
skiffer-git
|
26bd3bf76d
|
fix bug
|
2 years ago |
|
skiffer-git
|
d17d7a792a
|
fix bug
|
2 years ago |
|
skiffer-git
|
722b5d0726
|
debug
|
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
|
6b78b75638
|
fix bug
|
2 years ago |
|
wenxu12345
|
49797ce6ab
|
super group notification
|
2 years ago |
|
wangchuxiao
|
b80f510de5
|
quit superGroup add notification
|
2 years ago |
|
wangchuxiao
|
007065b40e
|
入职流程
|
2 years ago |
|
wangchuxiao
|
c5eb8a3f9b
|
入职流程
|
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
|
29dbb36961
|
user proto modify
|
2 years ago |
|
wangchuxiao
|
20851f2a96
|
fix bug
|
2 years ago |
|
wangchuxiao
|
7ea7dffd4a
|
fix bug
|
2 years ago |
|
wangchuxiao
|
4e11c7a9e2
|
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
|
98821c95b6
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
89aef130a5
|
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
|
0a44a8e78a
|
add global recv opt
|
2 years ago |
|
Gordon
|
7e6e214f08
|
add global recv opt
|
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
|
f4f6ea681e
|
Optimization for log
|
2 years ago |
|
Gordon
|
f96e12a8b3
|
redis replace to go_redis
|
2 years ago |
|
wangchuxiao
|
7dbc8a4253
|
go-redis
|
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
|
38ded2c43d
|
send message remove online status split
|
2 years ago |
|
skiffer-git
|
4bc9da3910
|
set groupID
|
2 years ago |
|
Gordon
|
7c90baf7bf
|
remove online offline split
|
2 years ago |
|
skiffer-git
|
202811f3c6
|
groupID digitization
|
2 years ago |
|
wangchuxiao
|
2b596e226a
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
2 years ago |
|
skiffer-git
|
11e619d1b3
|
log
|
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
|
6525d63459
|
fix bug
|
2 years ago |
|
wangchuxiao
|
bd14739a9e
|
fix bug
|
2 years ago |
|
wangchuxiao
|
a115151616
|
fix bug
|
2 years ago |
|
wangchuxiao
|
26771ee7d0
|
organization
|
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 |
