skiffer-git
|
029c020fe0
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
a9b60b8052
|
encryption
|
2 years ago |
wangchuxiao
|
2433e27eb5
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
2610a27894
|
add birthStr field
|
2 years ago |
Gordon
|
eba25f1bb8
|
ws add logout remove push token
|
2 years ago |
|
wangchuxiao
|
55a873d0ef
|
singal
|
2 years ago |
|
wangchuxiao
|
0561f3e398
|
singal
|
2 years ago |
|
wangchuxiao
|
68d587e484
|
singal
|
2 years ago |
|
wangchuxiao
|
c026754a68
|
singal
|
2 years ago |
|
wangchuxiao
|
a705f6a8b7
|
proto
|
2 years ago |
|
wangchuxiao
|
5758f1701d
|
proto
|
2 years ago |
|
Gordon
|
ed63b9f3cc
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
Gordon
|
ef3f41bb69
|
revoke message
|
2 years ago |
|
Gordon
|
4d9ed1a6cb
|
revoke message
|
2 years ago |
|
wangchuxiao
|
4b8f6f1f66
|
fix bug
|
2 years ago |
|
wangchuxiao
|
fd9630ea84
|
fix bug
|
2 years ago |
|
wangchuxiao
|
249d5e2788
|
signal
|
2 years ago |
|
wangchuxiao
|
cadecdb3b8
|
signal
|
2 years ago |
|
wangchuxiao
|
c03e26ee5e
|
signal
|
2 years ago |
|
wangchuxiao
|
bcc2f05aa5
|
workmoment
|
2 years ago |
|
wangchuxiao
|
79999edcea
|
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
|
2 years ago |
|
wangchuxiao
|
764b34d947
|
workmoment
|
2 years ago |
|
skiffer-git
|
c1811463cb
|
add ParseToken rpc
|
2 years ago |
|
skiffer-git
|
6d82c9c3db
|
add ParseToken rpc
|
2 years ago |
|
skiffer-git
|
2bf50bb8c2
|
update proto
|
2 years ago |
|
skiffer-git
|
1c5aae2301
|
update proto
|
2 years ago |
|
skiffer-git
|
aed95ed4fc
|
update proto
|
2 years ago |
|
skiffer-git
|
2a97801aae
|
update proto
|
2 years ago |
|
skiffer-git
|
c6aefa984d
|
update proto
|
2 years ago |
|
skiffer-git
|
5e9f1ac00f
|
update proto
|
2 years ago |
|
skiffer-git
|
0a83470019
|
update proto
|
2 years ago |
|
skiffer-git
|
0ed1f6c341
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
e85463c4a1
|
update proto
|
2 years ago |
|
wangchuxiao
|
168dd1d01f
|
orgization
|
2 years ago |
|
wangchuxiao
|
376c9bbdc7
|
cms add api
|
2 years ago |
|
wangchuxiao
|
4682abf4c1
|
cms
|
2 years ago |
|
wangchuxiao
|
099461dbbf
|
cms
|
2 years ago |
|
wangchuxiao
|
7208dd6b2a
|
cms
|
2 years ago |
|
Gordon
|
82c79bd91c
|
conversation unread modify
|
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
|
72aff32024
|
fcm ios push badge
|
2 years ago |
|
wangchuxiao
|
6774a8594f
|
cms
|
2 years ago |
|
Gordon
|
714dd597f1
|
fcm ios push badge
|
2 years ago |
|
Gordon
|
67e5e3b56b
|
fcm ios push badge
|
2 years ago |
|
wangchuxiao
|
8d4e5ad3f1
|
cms
|
2 years ago |
|
wangchuxiao
|
7f5b12d4d2
|
cms
|
2 years ago |
|
wangchuxiao
|
3886d49b0a
|
admin cms
|
2 years ago |
|
wangchuxiao
|
d542cdd898
|
conversation
|
2 years ago |
|
Gordon
|
c1a2dee0e9
|
pb update
|
2 years ago |
|
skiffer-git
|
5d661f2fc6
|
add user register IP
|
2 years ago |
|
wangchuxiao
|
5a995a8624
|
rtc pb
|
2 years ago |
|
wangchuxiao
|
b5166acada
|
update orgnization after update user
|
2 years ago |
欧阳氏
|
ac7f905248
|
完善 用户注册 用户更新
|
2 years ago |
|
欧阳氏
|
39606248a1
|
邀请码功能
1、新增邀请码功能
needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
|
2 years ago |
|
wangchuxiao
|
a48b2e9edb
|
cms
|
2 years ago |
|
wangchuxiao
|
c2bd1d0d83
|
callback kickoff
|
2 years ago |
|
wangchuxiao
|
aa7ba6d659
|
callback kickoff
|
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
|
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
|
0489c35417
|
unread bug fix
|
2 years ago |
|
Gordon
|
10c0f3075a
|
unread bug 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
|
7057d7fffb
|
pb add fields
|
2 years ago |
|
wenxu12345
|
d278dfb996
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
wenxu12345
|
6a19c8130c
|
Adjust error code
|
2 years ago |
|
Gordon
|
6d15e5b5a1
|
msg
|
2 years ago |
|
Gordon
|
51679b47a6
|
delete super group message
|
2 years ago |
|
wangchuxiao
|
cf205c2480
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
eb1aeefc8c
|
Merge branch 'dtm' into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
|
2 years ago |
|
skiffer-git
|
7c15a53a62
|
rename
|
2 years ago |
|
skiffer-git
|
ad1d759840
|
Application for joining the group: JoinSource && InviterUserID
|
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 |
|
wangchuxiao
|
b064244907
|
rocks cache
|
2 years ago |
|
skiffer-git
|
0234795200
|
fix bug
|
2 years ago |
|
skiffer-git
|
2d110deb09
|
Show group notification editor
|
2 years ago |
|
skiffer-git
|
fb4cef7ccb
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
3b6b88fd62
|
Source of joining the group
|
2 years ago |
|
Gordon
|
adb7da7aaf
|
group add field
|
2 years ago |
|
skiffer-git
|
d17d7a792a
|
fix bug
|
2 years ago |
|
wenxu12345
|
5b8ef3a17c
|
verification gor joining group chat
|
2 years ago |
|
wangchuxiao
|
7bbf2b200b
|
fix bug
|
2 years ago |
|
Gordon
|
e9ac9faa49
|
user proto modify
|
2 years ago |
|
wangchuxiao
|
a15e644a51
|
fix bug
|
2 years ago |
|
Gordon
|
479679a1c6
|
user proto modify
|
2 years ago |
|
Gordon
|
a50001364f
|
user proto modify
|
2 years ago |
|
skiffer-git
|
310997f978
|
update chat.pb
|
2 years ago |
|
wangchuxiao
|
1b1f4464ee
|
GlobalRecvMsgOpt
|
2 years ago |
|
wangchuxiao
|
ea76f20825
|
GlobalRecvMsgOpt
|
2 years ago |
|
wangchuxiao
|
956d745034
|
alter rtc timeout
|
2 years ago |
|
Gordon
|
ccc69ac2d0
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
wangchuxiao
|
a0581618a4
|
Merge branch 'tuoyun' into superGroup
# Conflicts:
# config/config.yaml
# internal/msg_gateway/gate/logic.go
# internal/msg_gateway/gate/ws_server.go
# internal/push/logic/push_to_client.go
# internal/rpc/group/group.go
# internal/rpc/msg/send_msg.go
# pkg/common/config/config.go
# pkg/proto/sdk_ws/ws.pb.go
|
2 years ago |
|
Gordon
|
cfcccd0240
|
user add global set message recv opt
|
2 years ago |
|
wangchuxiao
|
805b7705b2
|
rtc
|
2 years ago |
|
wangchuxiao
|
d797d7b47a
|
rtc
|
2 years ago |
|
Gordon
|
2cbffb96fd
|
push update
|
2 years ago |
|
Gordon
|
f3b083cafd
|
push update
|
2 years ago |
|
wangchuxiao
|
52d8ab5389
|
singal
|
2 years ago |
|
Gordon
|
2ede9ef8ed
|
add batch push
|
2 years ago |
|
wangchuxiao
|
26771ee7d0
|
organization
|
2 years ago |
|
Gordon
|
536d7e2957
|
ws pb
|
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
|
f3fc452904
|
group set memberInfo
|
2 years ago |
|
Gordon
|
78298e1284
|
pb file
|
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
|
16d33b1c1f
|
singal offline push
|
2 years ago |
|
Gordon
|
0a260a67d5
|
ws and push update
|
2 years ago |
|
Gordon
|
14bfd78f63
|
ws and push update
|
2 years ago |
|
Gordon
|
a18dcfce9e
|
ws and push update
|
2 years ago |
|
wenxu12345
|
2b4df5be16
|
Clear personal chat history
|
3 years ago |
|
wangchuxiao
|
653c0faa18
|
superGroup
|
3 years ago |
|
wangchuxiao
|
a85f6b8287
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
3 years ago |
|
wangchuxiao
|
fe9f86b432
|
superGroup
|
3 years ago |
|
Gordon
|
e9bf26e0ca
|
pb file
|
3 years ago |
|
wenxu12345
|
1bfefbd083
|
super group
|
3 years ago |
|
Gordon
|
e9a515ac34
|
message update
|
3 years ago |
|
Gordon
|
f8bed154ce
|
pb file
|
3 years ago |
|
Gordon
|
8ee3f7ab66
|
pb file
|
3 years ago |
|
wangchuxiao
|
be10e6a9de
|
organization
|
3 years ago |
|
wangchuxiao
|
bb5991b111
|
organization
|
3 years ago |
|
wangchuxiao
|
3a06617a7d
|
office
|
3 years ago |
|
wangchuxiao
|
d75eb456dc
|
office
|
3 years ago |
|
wangchuxiao
|
91e03f7cfd
|
cache
|
3 years ago |
|
wangchuxiao
|
59468eb162
|
fix work moments bug
|
3 years ago |
|
wangchuxiao
|
f662defcf9
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
8f07f8e9e1
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
7e44f7f110
|
cache rpc
|
3 years ago |
|
skiffer-git
|
b211a66e99
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wangchuxiao
|
9f9ebd838a
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
a03f89fb68
|
cache rpc
|
3 years ago |
|
wangchuxiao
|
03b35721a2
|
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
|
150af5ff8b
|
@ people update
|
3 years ago |
|
Gordon
|
df17dd749f
|
add rpc conversation
|
3 years ago |
|
Gordon
|
91303acdbe
|
conversation update
|
3 years ago |
|
Gordon
|
e682b408f3
|
conversation update
|
3 years ago |
|
skiffer-git
|
0a0c206998
|
add cache
|
3 years ago |
|
Gordon
|
159a9e00c8
|
conversation update
|
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 |
|
Gordon
|
d44d5711cb
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
54cb13ba62
|
pb file
|
3 years ago |
|
Gordon
|
c32f5dd951
|
pb file
|
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
|
88e9dd54b2
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
f53f34559a
|
organization
|
3 years ago |
|
wangchuxiao
|
3f287eb148
|
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
|
b1c66997ca
|
organization
|
3 years ago |
|
skiffer-git
|
f6b30ed0c6
|
organization
|
3 years ago |
|
skiffer-git
|
248de7f1f2
|
set groupmember nickname
|
3 years ago |
|
skiffer-git
|
0d5132f710
|
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
|
1bb634bc6f
|
merge code
|
3 years ago |
|
skiffer-git
|
bc06ba54b9
|
organization && department
|
3 years ago |
|
wangchuxiao
|
26f8172b1a
|
tag and set private tips
|
3 years ago |
|
wangchuxiao
|
f4921d1317
|
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
|
d600042110
|
tag and set private tips
|
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 |
|
wenxu12345
|
d3c8215e15
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
30bc6c274e
|
mute group
|
3 years ago |
|
skiffer-git
|
ecb1068f0b
|
mute group
|
3 years ago |
|
wenxu12345
|
f6eef21b45
|
mute group
|
3 years ago |
|
skiffer-git
|
764bc3fead
|
mute group
|
3 years ago |
|
skiffer-git
|
391e525fc5
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
skiffer-git
|
afc32b1cfa
|
mute group
|
3 years ago |
|
wangchuxiao
|
e95400988e
|
tag
|
3 years ago |
|
wangchuxiao
|
169665da32
|
tag
|
3 years ago |
|
wangchuxiao
|
8197ae6aa7
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
6d20eddd43
|
mongo
|
3 years ago |
|
skiffer-git
|
9d29d49ada
|
group dismissed
|
3 years ago |
|
wangchuxiao
|
e6c36411cb
|
mongo
|
3 years ago |
|
wangchuxiao
|
f02fb7ba15
|
rtc add
|
3 years ago |
|
wangchuxiao
|
a0e3488af0
|
rtc proto modify
|
3 years ago |
|
wangchuxiao
|
8fef1f975a
|
rtc add
|
3 years ago |
|
wangchuxiao
|
17fad47ca1
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
b0aa168c9a
|
rtc add
|
3 years ago |
|
wenxu12345
|
11c65e6b90
|
signaling add participant
|
3 years ago |
|
wenxu12345
|
e9699ed8cc
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
812362338e
|
signaling add participant
|
3 years ago |
|
wangchuxiao
|
fa21ae6161
|
rtc add
|
3 years ago |
|
wenxu12345
|
27c6a187a2
|
signaling
|
3 years ago |
