withchao
|
6dafbf2165
|
Merge remote-tracking branch 'origin/errcode' into errcode
|
2 years ago |
|
withchao
|
4f2d9c548e
|
1
|
2 years ago |
wangchuxiao
|
59d83dd563
|
db
|
2 years ago |
|
wangchuxiao
|
6755303f0a
|
db
|
2 years ago |
|
withchao
|
53c278234d
|
friend
|
2 years ago |
skiffer-git
|
46c3b5a6ea
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
07a6439082
|
fix Pb2String
|
2 years ago |
|
wangchuxiao
|
2c7f7f27d3
|
group rpc
|
2 years ago |
|
wangchuxiao
|
cbe7dcebea
|
errCode
|
2 years ago |
|
skiffer-git
|
89a4fe96b5
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
b2dd39887d
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
20d56aefa8
|
Error code standardization
|
2 years ago |
|
skiffer-git
|
32d7846139
|
Error code standardization
|
2 years ago |
|
wangchuxiao
|
a662414b7f
|
Merge branch 'modify' of github.com:OpenIMSDK/Open-IM-Server into modify
# Conflicts:
# pkg/proto/msg/msg.pb.go
|
2 years ago |
Gordon
|
25871aea49
|
reaction message add expiration
|
2 years ago |
|
Gordon
|
2b0a997573
|
reaction message add expiration
|
2 years ago |
|
Gordon
|
84df956293
|
reaction message add expiration
|
2 years ago |
|
wangchuxiao
|
66f49feebb
|
modify msg
|
2 years ago |
|
wangchuxiao
|
0fbf882059
|
modify
|
2 years ago |
|
wangchuxiao
|
4d56dfdfa2
|
modify
|
2 years ago |
|
wangchuxiao
|
be01c4da0c
|
dek jinzhu
|
2 years ago |
|
Gordon
|
9fddf6819b
|
user notification
|
2 years ago |
|
Gordon
|
0eeb2f6752
|
log
|
2 years ago |
|
Gordon
|
4f65882b5d
|
user update
|
2 years ago |
|
Gordon
|
4d9ed1a6cb
|
revoke message
|
2 years ago |
|
Gordon
|
78895288d0
|
del msg test
|
2 years ago |
|
Gordon
|
9d9d3db701
|
http status change
|
2 years ago |
|
Gordon
|
5b216e6a3a
|
revoke message struct update
|
2 years ago |
|
skiffer-git
|
6d82c9c3db
|
add ParseToken rpc
|
2 years ago |
|
wangchuxiao
|
3085bc1443
|
orgization
|
2 years ago |
|
wangchuxiao
|
168dd1d01f
|
orgization
|
2 years ago |
|
skiffer-git
|
6759e0c25b
|
fix bug: invited/kick failed due to json tag validation
|
2 years ago |
|
wangchuxiao
|
ef66b10501
|
prome
|
2 years ago |
|
skiffer-git
|
34eedd7955
|
Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
|
2 years ago |
|
skiffer-git
|
98d7c7bb86
|
Limit the number of group members for kick/create/invite
|
2 years ago |
|
wangchuxiao
|
5ef7123f78
|
promethues
|
2 years ago |
|
wangchuxiao
|
156e9e2fc7
|
cms
|
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
|
8d1dd92df7
|
opid add
|
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
|
a317ebd8e7
|
cms
|
2 years ago |
|
wangchuxiao
|
8d4e5ad3f1
|
cms
|
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
|
7f5b12d4d2
|
cms
|
2 years ago |
|
skiffer-git
|
96814109dc
|
fix bug: GetSelfUserInfo for no result
|
2 years ago |
|
wangchuxiao
|
3886d49b0a
|
admin cms
|
2 years ago |
|
wangchuxiao
|
d542cdd898
|
conversation
|
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
|
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
|
066eeb6ba6
|
fix bug
|
2 years ago |
|
wangchuxiao
|
402b3f5535
|
fix bug
|
2 years ago |
|
wangchuxiao
|
6553ada66f
|
add set client init
|
2 years ago |
|
wangchuxiao
|
d20c89ba21
|
merge shichuang 2 v2.3.0release
|
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 |
|
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 |
|
wangchuxiao
|
2016a1656b
|
Merge branch 'v2.3.0release' into del
|
2 years ago |
|
wangchuxiao
|
3f74022142
|
Merge branch 'main' into del
|
2 years ago |
|
Gordon
|
be69ee8b1d
|
fcm update
|
2 years ago |
欧阳氏
|
39606248a1
|
邀请码功能
1、新增邀请码功能
needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
|
2 years ago |
|
wangchuxiao
|
429bee7e6c
|
Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
|
2 years ago |
|
wangchuxiao
|
911614673b
|
fix delete
|
2 years ago |
|
wangchuxiao
|
e80d3e7dac
|
fix delete
|
2 years ago |
|
wangchuxiao
|
6bfa8643d6
|
fix delete
|
2 years ago |
|
Gordon
|
bcc0c7c2df
|
delete conversation update
|
2 years ago |
|
skiffer-git
|
5cbea2cab5
|
Set token kicked status first in forceKickOff
|
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
|
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
|
e2ff7ef113
|
group hash
|
2 years ago |
|
wangchuxiao
|
11f29280b1
|
group hash
|
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 |
|
wangchuxiao
|
91a767b4fb
|
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 |
|
wangchuxiao
|
f202d5f54a
|
fix bug
|
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
|
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 |
|
wenxu12345
|
4701300ed8
|
Adjust error code
|
2 years ago |
|
wenxu12345
|
04e826ff09
|
Adjust error code
|
2 years ago |
|
wenxu12345
|
34588f9da3
|
Adjust error code
|
2 years ago |
|
wenxu12345
|
92cdff3043
|
Adjust error code
|
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 |
|
wenxu12345
|
6a19c8130c
|
Adjust error code
|
2 years ago |
|
Gordon
|
c43290338d
|
add test file
|
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
|
51679b47a6
|
delete super group message
|
2 years ago |
|
Gordon
|
787cef54f5
|
manger send msg modify
|
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
|
14d5b3b316
|
remove validation for notificationFaceURL
|
2 years ago |
|
wangchuxiao
|
5a262880b9
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
041a35e3c8
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
cf205c2480
|
superGroupMaxSeq
|
2 years ago |
|
Gordon
|
e61434347e
|
Merge branch 'superGroup' into v2.3.0release
# Conflicts:
# go.sum
# pkg/common/db/RedisModel.go
# pkg/common/db/model.go
|
2 years ago |
|
欧阳氏
|
84c068783d
|
新增 firebase cloud message 消息推送 (#236)
* 新增 firebase cloud message 消息推送
新增 api接口 /third/fcm_update_token 用于更新客户端获取到 FCM token 同步到服务器
* mongodb授权缺少授权数据库
windows下面的编译+启动
|
2 years ago |
|
wangchuxiao
|
a5ef78fd1e
|
superGroupMaxSeq
|
2 years ago |
|
skiffer-git
|
e64cf47d31
|
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
|
7c15a53a62
|
rename
|
2 years ago |
|
skiffer-git
|
2b2ecad437
|
fix bug
|
2 years ago |
|
skiffer-git
|
58f4ebe411
|
Limit the number of members invited to join the group
|
2 years ago |
|
Gordon
|
adb7da7aaf
|
group add field
|
2 years ago |
|
Gordon
|
504e4cc6a3
|
add super delete
|
2 years ago |
|
wangchuxiao
|
088f9dae9b
|
demo
|
2 years ago |
|
wangchuxiao
|
4e22970784
|
minio
|
2 years ago |
|
wangchuxiao
|
e5ccc1dd36
|
minio
|
2 years ago |
|
wangchuxiao
|
61951863ad
|
minio
|
2 years ago |
|
wangchuxiao
|
0054c4cc58
|
minio
|
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
|
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
|
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
|
a6c63e7968
|
swagger init
|
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
|
c3bdd2f288
|
debug
|
2 years ago |
|
Gordon
|
29dbb36961
|
user proto modify
|
2 years ago |
|
wangchuxiao
|
20851f2a96
|
fix bug
|
2 years ago |
|
wangchuxiao
|
5ea620a4cd
|
fix bug
|
2 years ago |
|
wangchuxiao
|
9503766a68
|
fix bug
|
2 years ago |
|
skiffer-git
|
19bbd9b528
|
fix bug
|
2 years ago |
|
skiffer-git
|
d058cacb38
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
skiffer-git
|
167ebd6975
|
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
|
dbc2713495
|
Handling exception: getcdv3.GetConn == nil
|
2 years ago |
|
wangchuxiao
|
ea76f20825
|
GlobalRecvMsgOpt
|
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 |
|
wangchuxiao
|
9c1ca78fed
|
rtc
|
2 years ago |
|
wangchuxiao
|
31c123a09b
|
rtc
|
2 years ago |
|
wangchuxiao
|
0e93295cdf
|
rtc
|
2 years ago |
|
wangchuxiao
|
f31179bb9a
|
rtc
|
2 years ago |
|
wangchuxiao
|
6dfba3c7b8
|
group
|
2 years ago |
|
wangchuxiao
|
47184ca01e
|
org
|
2 years ago |
|
wangchuxiao
|
1687b70bde
|
fix signal
|
2 years ago |
|
wangchuxiao
|
276328e0fd
|
fix bug
|
2 years ago |
|
wangchuxiao
|
e52639d1d4
|
fix bug
|
2 years ago |
|
wangchuxiao
|
5f42748e1b
|
Merge branch 'tuoyun' into superGroup
# Conflicts:
# internal/msg_gateway/gate/callback.go
# internal/msg_transfer/logic/online_history_msg_handler.go
# internal/push/logic/callback.go
# internal/push/logic/push_to_client.go
# pkg/common/db/model.go
# pkg/common/db/newRedisModel.go
# pkg/proto/group/group.pb.go
# pkg/proto/group/group.proto
|
2 years ago |
|
skiffer-git
|
2b150e3c1c
|
KickUserOffline
|
2 years ago |
|
wangchuxiao
|
f3fc452904
|
group set memberInfo
|
2 years ago |
|
skiffer-git
|
290ae774e0
|
ForceLogout
|
2 years ago |
|
skiffer-git
|
797e2fea1e
|
group info set
|
2 years ago |
|
wangchuxiao
|
e428e186f0
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
d3abc44976
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
cfe0272022
|
singal offline push
|
3 years ago |
|
wangchuxiao
|
16d33b1c1f
|
singal offline push
|
3 years ago |
|
wenxu12345
|
2b4df5be16
|
Clear personal chat history
|
3 years ago |
|
wangchuxiao
|
10881c8f5b
|
superGroup
|
3 years ago |
|
wangchuxiao
|
653c0faa18
|
superGroup
|
3 years ago |
|
Gordon
|
08a7dbe319
|
message update
|
3 years ago |
|
wangchuxiao
|
fe9f86b432
|
superGroup
|
3 years ago |
|
wangchuxiao
|
16a56457ed
|
callback
|
3 years ago |
|
wangchuxiao
|
d6907f3f3a
|
callback
|
3 years ago |
|
wangchuxiao
|
b4da35a0ab
|
ingress
|
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 |
