wangchuxiao
|
650141a498
|
fix org
|
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 |
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 |
wangchuxiao
|
276328e0fd
|
fix bug
|
2 years ago |
Gordon
|
7d0c8b0c5f
|
super group add notification
|
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 |
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 |
skiffer-git
|
dae1569f0e
|
debug userid == ""
|
2 years ago |
skiffer-git
|
dd76c268c5
|
debug userid == ""
|
2 years ago |
skiffer-git
|
3adcb9f164
|
debug userid == ""
|
2 years ago |
skiffer-git
|
eac137a9a9
|
ForceLogout
|
2 years ago |
skiffer-git
|
290ae774e0
|
ForceLogout
|
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 |
skiffer-git
|
797e2fea1e
|
group info set
|
2 years ago |
wangchuxiao
|
16d33b1c1f
|
singal offline push
|
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 |
wangchuxiao
|
cf094a2048
|
superGroup
|
3 years ago |
wangchuxiao
|
653c0faa18
|
superGroup
|
3 years ago |
wangchuxiao
|
110f5e02f4
|
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 |
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
|
8cdcd7105a
|
superGroup
|
3 years ago |
wangchuxiao
|
cc6d8d28b5
|
superGroup
|
3 years ago |
wangchuxiao
|
b55e13dbeb
|
superGroup
|
3 years ago |
wangchuxiao
|
bbe8c46df9
|
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
|
b4da35a0ab
|
ingress
|
3 years ago |
wangchuxiao
|
d8c0a82411
|
ingress
|
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 |
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
|
841566a5d1
|
del msg
|
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 |
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 |
wangchuxiao
|
84cc6e9140
|
k8s deploy
|
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 |
wangchuxiao
|
d1cb176b31
|
del msg sync
|
3 years ago |
Gordon
|
767131a117
|
message handle
|
3 years ago |
skiffer-git
|
1f20024b91
|
log
|
3 years ago |
skiffer-git
|
f5c7197dda
|
log
|
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 |
skiffer-git
|
5b9e5f904b
|
log
|
3 years ago |
skiffer-git
|
17b4a0525d
|
log
|
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
|
2454c50380
|
organization
|
3 years ago |
wangchuxiao
|
e2f8156a4d
|
organization
|
3 years ago |
wangchuxiao
|
6ea6a61e90
|
organization
|
3 years ago |
Gordon
|
381e72f1ef
|
send message
|
3 years ago |
Gordon
|
a472da9ea6
|
msg bug fix
|
3 years ago |
Gordon
|
20c7fe81dc
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
3ef445eb2e
|
msg bug fix
|
3 years ago |
wangchuxiao
|
4afc38523d
|
organization
|
3 years ago |
wangchuxiao
|
2534921af9
|
organization
|
3 years ago |
wangchuxiao
|
098dae9640
|
organization
|
3 years ago |
wangchuxiao
|
42c38de3e2
|
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 |
wenxu12345
|
8f261970e9
|
Update group members' faceURL immediately
|
3 years ago |
wenxu12345
|
2edd3c5614
|
When you create a group chat, the group member can be empty
|
3 years ago |
Gordon
|
f8af109821
|
send group message split topic
|
3 years ago |
wenxu12345
|
38535bde84
|
add RpcRegisterIP
|
3 years ago |
wenxu12345
|
a4f5dd9d89
|
add log
|
3 years ago |
Gordon
|
c9ab2b507b
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
2b479319c1
|
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 |
Gordon
|
9303096430
|
log change
|
3 years ago |
wangchuxiao
|
97e5d9f610
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
wangchuxiao
|
305ee394b1
|
cache
|
3 years ago |
skiffer-git
|
b5065cb52f
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
skiffer-git
|
dca16e83d3
|
rpc register ip
|
3 years ago |
wangchuxiao
|
1b93ba5355
|
cache
|
3 years ago |
wangchuxiao
|
685fc1a37b
|
cache
|
3 years ago |
wangchuxiao
|
4ac863fa6a
|
cache
|
3 years ago |
wangchuxiao
|
65a4b38ee5
|
cache
|
3 years ago |
wangchuxiao
|
bbc3f5c19a
|
cache
|
3 years ago |
wangchuxiao
|
747b963bd4
|
cache
|
3 years ago |
wangchuxiao
|
2cf070a26c
|
office
|
3 years ago |
wangchuxiao
|
3c68ecb7f1
|
office
|
3 years ago |
wangchuxiao
|
243f5fcda4
|
fix bug
|
3 years ago |
wangchuxiao
|
e22b7f36ce
|
fix bug
|
3 years ago |
wangchuxiao
|
2a3265ed71
|
office
|
3 years ago |
wangchuxiao
|
d75eb456dc
|
office
|
3 years ago |
skiffer-git
|
d9e74a78f0
|
delete msg by index
|
3 years ago |
skiffer-git
|
700483dd48
|
group chat log
|
3 years ago |
skiffer-git
|
1c80b820cb
|
group chat log
|
3 years ago |
skiffer-git
|
59e5cfb04d
|
group chat log
|
3 years ago |
skiffer-git
|
b06550e2cb
|
group chat log
|
3 years ago |
skiffer-git
|
ca4bf13569
|
group chat log
|
3 years ago |
skiffer-git
|
eae3a50435
|
group chat log
|
3 years ago |
skiffer-git
|
de2956ec3c
|
group chat log
|
3 years ago |
skiffer-git
|
a2e62c9fb5
|
fix bug: group chat share pb
|
3 years ago |
wangchuxiao
|
e7fdc318f1
|
cache bug fix
|
3 years ago |
wangchuxiao
|
62dd559b7c
|
cache bug fix
|
3 years ago |
skiffer-git
|
4a631753a0
|
add msgToMQSingle && msgToMQGroup
|
3 years ago |
wangchuxiao
|
91e03f7cfd
|
cache
|
3 years ago |
Gordon
|
c0314d95c9
|
send message parallel
|
3 years ago |
wangchuxiao
|
40ae6ccf2f
|
cache & workMoments
|
3 years ago |
wangchuxiao
|
d24a7d7b22
|
cache & workMoments
|
3 years ago |
wangchuxiao
|
6260cf24cc
|
cache
|
3 years ago |
wangchuxiao
|
20f61042fc
|
cache
|
3 years ago |
wangchuxiao
|
93057870a7
|
cache
|
3 years ago |
wangchuxiao
|
0aefbc2c7d
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
# internal/rpc/friend/firend.go
|
3 years ago |
wangchuxiao
|
eb1fa90788
|
cache
|
3 years ago |
wangchuxiao
|
65f02e5139
|
cache
|
3 years ago |
Gordon
|
bbfe65a905
|
send message add cache
|
3 years ago |
wangchuxiao
|
59468eb162
|
fix work moments bug
|
3 years ago |
wangchuxiao
|
7b0eb4e79d
|
work moments
|
3 years ago |
wangchuxiao
|
37c40d7dda
|
work moments
|
3 years ago |
wangchuxiao
|
1a2aa876e3
|
work moments
|
3 years ago |
wangchuxiao
|
39822f323f
|
work moments
|
3 years ago |
wangchuxiao
|
338acfba75
|
cache rpc
|
3 years ago |
wangchuxiao
|
490f4f36f1
|
cache rpc
|
3 years ago |
wangchuxiao
|
69c46f684f
|
cache rpc
|
3 years ago |
wangchuxiao
|
1626406557
|
cache rpc
|
3 years ago |
wangchuxiao
|
8f07f8e9e1
|
cache rpc
|
3 years ago |
skiffer-git
|
b211a66e99
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
wangchuxiao
|
08f968dced
|
cache rpc
|
3 years ago |
wangchuxiao
|
a03f89fb68
|
cache rpc
|
3 years ago |
Gordon
|
9a9f26c435
|
conversation update
|
3 years ago |
wangchuxiao
|
6500ba48a7
|
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
|
545f9cad2d
|
add modify conversation api
|
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
|
7abee90992
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
159a9e00c8
|
conversation update
|
3 years ago |
wangchuxiao
|
9c62f38345
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
wangchuxiao
|
1443f5f997
|
workMoments
|
3 years ago |
Gordon
|
5cd565306e
|
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
|
e687f56c7f
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
wangchuxiao
|
ff85575e98
|
workMoments
|
3 years ago |
Gordon
|
26be25c218
|
quit group and dismiss group update
|
3 years ago |
Gordon
|
d3d5e0cbfb
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
4796bf632c
|
quit group and dismiss group update
|
3 years ago |
wangchuxiao
|
5eef365baf
|
workMoments
|
3 years ago |
wangchuxiao
|
33211bfb27
|
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
|
00664822ec
|
conversation add fields
|
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
|
31c954db0e
|
Organization
|
3 years ago |
skiffer-git
|
cb6a040c4d
|
Organization
|
3 years ago |
skiffer-git
|
51c3a753a9
|
Organization
|
3 years ago |
skiffer-git
|
c28c592c80
|
OrganizationChangedNotification
|
3 years ago |
skiffer-git
|
ab4a5e6719
|
OrganizationChangedNotification
|
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
|
3854c7bba2
|
workMoments
|
3 years ago |
wangchuxiao
|
6c4acbad68
|
workMoments
|
3 years ago |
wangchuxiao
|
b5c11ece57
|
workMoments
|
3 years ago |
wangchuxiao
|
50696d2e88
|
workMoments
|
3 years ago |
wangchuxiao
|
957e11eff0
|
workMoments
|
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
|
3a8a0a541e
|
organization
|
3 years ago |
skiffer-git
|
650495306f
|
organization
|
3 years ago |
skiffer-git
|
5664c34790
|
organization
|
3 years ago |
skiffer-git
|
b1c66997ca
|
organization
|
3 years ago |
skiffer-git
|
114ffd4667
|
organization
|
3 years ago |
skiffer-git
|
5f22402761
|
organization
|
3 years ago |
skiffer-git
|
f6b30ed0c6
|
organization
|
3 years ago |
skiffer-git
|
472c1a9e3e
|
set group member nickname
|
3 years ago |
skiffer-git
|
248de7f1f2
|
set groupmember nickname
|
3 years ago |
skiffer-git
|
3bbf84861e
|
organization
|
3 years ago |
skiffer-git
|
0dac9044a5
|
organization
|
3 years ago |
skiffer-git
|
a981d1082a
|
organization
|
3 years ago |
skiffer-git
|
ecc47dcfbb
|
organization
|
3 years ago |
skiffer-git
|
9abfe233bc
|
organization
|
3 years ago |
skiffer-git
|
af5ee45206
|
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
|
dbc5bd96f3
|
getui
|
3 years ago |
wangchuxiao
|
9489ab862b
|
getui
|
3 years ago |
wangchuxiao
|
1bb634bc6f
|
merge code
|
3 years ago |
skiffer-git
|
bc06ba54b9
|
organization && department
|
3 years ago |
wangchuxiao
|
13473eeb4d
|
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 |
Gordon
|
69aba02c9a
|
send tag modify
|
3 years ago |
Gordon
|
f64c40e91f
|
tag msg
|
3 years ago |
wenxu12345
|
b0c518a0d6
|
log
|
3 years ago |
wangchuxiao
|
2b03b57b5c
|
tag and set private tips
|
3 years ago |
wangchuxiao
|
77c6120014
|
null to empty slice
|
3 years ago |
wangchuxiao
|
a16a75230c
|
tag and set private tips
|
3 years ago |
wangchuxiao
|
bb267ccae7
|
tag and set private tips
|
3 years ago |
wangchuxiao
|
4390302384
|
tag and set private tips
|
3 years ago |
wangchuxiao
|
dab00e7fb2
|
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
|
ecd2f0e2bf
|
Merge log files
|
3 years ago |
Gordon
|
170392f0bc
|
oa notification add
|
3 years ago |
Gordon
|
6744745152
|
token add operationID
|
3 years ago |
skiffer-git
|
bf5f72c00b
|
mute group
|
3 years ago |
skiffer-git
|
6164266870
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
skiffer-git
|
cc9df9c586
|
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
|
de55c14a16
|
mute group
|
3 years ago |
skiffer-git
|
85cf7f26ce
|
mute group
|
3 years ago |
skiffer-git
|
11eaaab72d
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
skiffer-git
|
475e64fc5b
|
mute group
|
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 |
skiffer-git
|
1286f9dcb6
|
mute group
|
3 years ago |
wangchuxiao
|
a11c4fcb58
|
tag
|
3 years ago |
wangchuxiao
|
c67a937d40
|
tag
|
3 years ago |
wangchuxiao
|
03fa7137b9
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
wangchuxiao
|
e95400988e
|
tag
|
3 years ago |
Gordon
|
942c9c6a63
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
6c45665fde
|
add tag message conversation update
|
3 years ago |
wangchuxiao
|
169665da32
|
tag
|
3 years ago |
wangchuxiao
|
5e78697a69
|
tag
|
3 years ago |
wangchuxiao
|
a0e6a78496
|
tag
|
3 years ago |
wangchuxiao
|
af99a93536
|
tag
|
3 years ago |
wangchuxiao
|
c39f5a27b2
|
tag
|
3 years ago |
wangchuxiao
|
dbdb516f3c
|
tag
|
3 years ago |
wangchuxiao
|
574c7600e0
|
tag
|
3 years ago |
wangchuxiao
|
13c29d2c1e
|
tag
|
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 |
Gordon
|
25adfe5b28
|
check shell update
|
3 years ago |
Gordon
|
6b3d984ca6
|
log update
|
3 years ago |
Gordon
|
da5bfe32af
|
log update
|
3 years ago |