wangchuxiao
|
b705ac24fa
|
fix code
|
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
|
8b857f9980
|
Restrict user login with IP
|
2 years ago |
|
wangchuxiao
|
7d1707ca7c
|
fix log
|
2 years ago |
|
skiffer-git
|
4e5c1606f3
|
log
|
2 years ago |
|
wangchuxiao
|
a48b2e9edb
|
cms
|
2 years ago |
|
wangchuxiao
|
9e190cb5aa
|
fix delete
|
2 years ago |
|
wangchuxiao
|
5d57e93ee1
|
fix delete
|
2 years ago |
|
wangchuxiao
|
cdc60ef5f0
|
fix delete
|
2 years ago |
|
wangchuxiao
|
4c10164970
|
fix delete
|
2 years ago |
|
wangchuxiao
|
2c0a2d7877
|
getui debug
|
2 years ago |
|
wangchuxiao
|
11f29280b1
|
group hash
|
2 years ago |
|
wangchuxiao
|
4ba248a101
|
fix bug
|
2 years ago |
Gordon
|
1dfe8f866a
|
del conversation bug fix
|
2 years ago |
|
skiffer-git
|
a1392a7677
|
GetGroupAllMemberListBySplit
|
2 years ago |
欧阳氏
|
cfa9f2d13f
|
增加 AWS S3 存储
|
2 years ago |
|
Gordon
|
641ac7c503
|
sdk update
|
2 years ago |
|
wangchuxiao
|
041a35e3c8
|
superGroupMaxSeq
|
2 years ago |
|
wangchuxiao
|
cf205c2480
|
superGroupMaxSeq
|
2 years ago |
|
Gordon
|
bb9f7bb27b
|
super group add verification
|
2 years ago |
|
Gordon
|
a3530be7b4
|
firebase update
|
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
|
eb1aeefc8c
|
Merge branch 'dtm' into v2.3.0release
# Conflicts:
# internal/rpc/group/group.go
|
2 years ago |
|
skiffer-git
|
663db12594
|
rename
|
2 years ago |
|
skiffer-git
|
f383d6c636
|
rename
|
2 years ago |
|
skiffer-git
|
7c15a53a62
|
rename
|
2 years ago |
|
skiffer-git
|
5936492f76
|
Filter out disbanded groups
|
2 years ago |
|
Gordon
|
ac536c48cd
|
sub moudule update
|
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
|
2d110deb09
|
Show group notification editor
|
2 years ago |
|
Gordon
|
504e4cc6a3
|
add super delete
|
2 years ago |
|
skiffer-git
|
ec5177342e
|
Set friend remark to empty
|
2 years ago |
|
Gordon
|
ca72d4840a
|
config update
|
2 years ago |
|
wangchuxiao
|
088f9dae9b
|
demo
|
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
|
d51af59f85
|
Merge remote-tracking branch 'origin/superGroup' into superGroup
|
2 years ago |
|
skiffer-git
|
9da4da5fd6
|
debug
|
2 years ago |
|
wangchuxiao
|
5207e268de
|
swagger doc
|
2 years ago |
|
wangchuxiao
|
226108f558
|
docker-compose
|
2 years ago |
|
skiffer-git
|
cf15bd3697
|
Adjust api router
|
2 years ago |
|
wangchuxiao
|
a6c63e7968
|
swagger init
|
2 years ago |
|
wangchuxiao
|
189a7d09a1
|
Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
|
2 years ago |
|
wangchuxiao
|
99062805ec
|
add swagger demo
|
2 years ago |
|
wenxu12345
|
87dbdc07d1
|
verification joining group chat
|
2 years ago |
|
Gordon
|
29dbb36961
|
user proto modify
|
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
|
9106e70b37
|
group administrator access
|
2 years ago |
|
wangchuxiao
|
d3abc44976
|
singal offline push
|
2 years ago |
|
wangchuxiao
|
16d33b1c1f
|
singal offline push
|
3 years ago |
|
wenxu12345
|
1ff7ebb04a
|
tools
|
3 years ago |
|
wenxu12345
|
2b4df5be16
|
Clear personal chat history
|
3 years ago |
|
wangchuxiao
|
10881c8f5b
|
superGroup
|
3 years ago |
|
wangchuxiao
|
653c0faa18
|
superGroup
|
3 years ago |
|
wangchuxiao
|
fe9f86b432
|
superGroup
|
3 years ago |
|
wangchuxiao
|
d104c6dbf4
|
callback
|
3 years ago |
|
wangchuxiao
|
23b03919e6
|
office tag async send
|
3 years ago |
|
wangchuxiao
|
7a78e5d869
|
update app
|
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 |
|
wenxu12345
|
0dafb50223
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
ac9620c253
|
add ParseToken
|
3 years ago |
|
Gordon
|
6e226b165c
|
sdk version
|
3 years ago |
|
wenxu12345
|
7de29c29e9
|
add ParseToken
|
3 years ago |
|
Gordon
|
9303096430
|
log change
|
3 years ago |
|
skiffer-git
|
a251d521a1
|
set api ip in config
|
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 |
|
FG
|
32b9820725
|
remove timer and database init
|
3 years ago |
|
skiffer-git
|
a9ce8a3b2e
|
upgrade etcd & grpc
|
3 years ago |
|
wangchuxiao
|
d75eb456dc
|
office
|
3 years ago |
|
skiffer-git
|
4a631753a0
|
add msgToMQSingle && msgToMQGroup
|
3 years ago |
|
wangchuxiao
|
91e03f7cfd
|
cache
|
3 years ago |
|
wangchuxiao
|
485241d080
|
cache & workMoments
|
3 years ago |
|
Gordon
|
58a6f9cae3
|
test
|
3 years ago |
|
wangchuxiao
|
65f02e5139
|
cache
|
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 |
|
skiffer-git
|
0bdb066820
|
add cache
|
3 years ago |
|
wenxu12345
|
ab706f4076
|
fix bug
|
3 years ago |
|
wangchuxiao
|
a03f89fb68
|
cache rpc
|
3 years ago |
|
Gordon
|
51ee2df755
|
flag parse update
|
3 years ago |
|
wenxu12345
|
a426c8bb26
|
Adjust port
|
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
|
e73f0a916a
|
add modify conversation api
|
3 years ago |
|
wangchuxiao
|
86e17d38d4
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
1809c59f25
|
config
|
3 years ago |
|
wangchuxiao
|
4eb9661730
|
fix docker-compose
|
3 years ago |
|
Gordon
|
df17dd749f
|
add rpc conversation
|
3 years ago |
|
skiffer-git
|
0a0c206998
|
add cache
|
3 years ago |
|
skiffer-git
|
2bdaaa5a33
|
log
|
3 years ago |
|
wangchuxiao
|
2e6c42c8ac
|
workMoments
|
3 years ago |
|
skiffer-git
|
ab4a5e6719
|
OrganizationChangedNotification
|
3 years ago |
|
skiffer-git
|
f53f34559a
|
organization
|
3 years ago |
|
skiffer-git
|
97fd107f47
|
add operationID when ws connecting
|
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
|
42242daf9b
|
organization
|
3 years ago |
|
skiffer-git
|
c59dc129a8
|
/user/get_users_online_status
|
3 years ago |
|
skiffer-git
|
248de7f1f2
|
set groupmember nickname
|
3 years ago |
|
skiffer-git
|
3bbf84861e
|
organization
|
3 years ago |
|
skiffer-git
|
7c64239b36
|
organization
|
3 years ago |
|
skiffer-git
|
6d55f35404
|
organization
|
3 years ago |
|
skiffer-git
|
9abfe233bc
|
organization
|
3 years ago |
|
skiffer-git
|
cad147faf8
|
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
|
1bb634bc6f
|
merge code
|
3 years ago |
|
skiffer-git
|
f5684f2c45
|
add department db
|
3 years ago |
|
skiffer-git
|
bc06ba54b9
|
organization && department
|
3 years ago |
|
Gordon
|
46aa26a444
|
version code
|
3 years ago |
|
Gordon
|
2a0f8f5ce3
|
note
|
3 years ago |
|
wenxu12345
|
ef4d0c3c42
|
log
|
3 years ago |
|
wenxu12345
|
aa673a3a5c
|
log
|
3 years ago |
|
wenxu12345
|
7604b24ffc
|
log
|
3 years ago |
|
wenxu12345
|
0232f52281
|
log
|
3 years ago |
|
wenxu12345
|
6efe13d142
|
log
|
3 years ago |
|
wenxu12345
|
0a8fdc6cc8
|
set gin log
|
3 years ago |
|
wenxu12345
|
f87038622b
|
set gin log
|
3 years ago |
|
wenxu12345
|
5a9b5db99b
|
Check environment before deployment
|
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 |
|
wenxu12345
|
ecd2f0e2bf
|
Merge log files
|
3 years ago |
|
skiffer-git
|
84aca5b9e1
|
mute group
|
3 years ago |
|
skiffer-git
|
de55c14a16
|
mute group
|
3 years ago |
|
skiffer-git
|
85cf7f26ce
|
mute group
|
3 years ago |
|
skiffer-git
|
fe4b534b78
|
mute group
|
3 years ago |
|
skiffer-git
|
1aeff25316
|
mute group
|
3 years ago |
|
Gordon
|
c5828aba91
|
Merge branch 'tuoyun'
# Conflicts:
# cmd/open_im_api/main.go
# config/config.yaml
# go.sum
# pkg/common/config/config.go
# pkg/common/db/model.go
|
3 years ago |
|
skiffer-git
|
1286f9dcb6
|
mute group
|
3 years ago |
|
skiffer-git
|
afc32b1cfa
|
mute group
|
3 years ago |
|
wangchuxiao
|
e252a00d55
|
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 |
|
wangchuxiao
|
e6c36411cb
|
mongo
|
3 years ago |
马守越
|
1ab3e04cba
|
新增mongo.dbUrl配置 (#174)
* 当dbUri值不为空则直接使用该值
* 新增支持ali oss
Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn>
|
3 years ago |
|
wenxu12345
|
91b9e50fd0
|
2.0.4
|
3 years ago |
|
wangchuxiao
|
366f7621fa
|
rtc add
|
3 years ago |
|
wangchuxiao
|
58cea3e947
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f02fb7ba15
|
rtc add
|
3 years ago |
|
wenxu12345
|
7bdf6717e1
|
add log
|
3 years ago |
|
wangchuxiao
|
8fef1f975a
|
rtc add
|
3 years ago |
|
wangchuxiao
|
b0aa168c9a
|
rtc add
|
3 years ago |
|
wenxu12345
|
204b27ca5d
|
pb platformID
|
3 years ago |
|
wangchuxiao
|
1d3f05c22b
|
rtc
|
3 years ago |
|
wangchuxiao
|
51c2f845d8
|
opt
|
3 years ago |
|
wangchuxiao
|
bcae7720e1
|
add callback
|
3 years ago |
|
wenxu12345
|
e1f58f07fe
|
2.0.1
|
3 years ago |
|
wenxu12345
|
0fca91ca37
|
config description
|
3 years ago |
|
wenxu12345
|
8f5b5ab0f9
|
openIM_v2
|
3 years ago |
|
wangchuxiao
|
079efe5de6
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
4d28ccebad
|
add reset pwd
|
3 years ago |
|
wenxu12345
|
bf948789ea
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
571c83314a
|
Refactoring code
|
3 years ago |
|
wangchuxiao
|
6e9b9341d4
|
mini cr
|
3 years ago |
|
wangchuxiao
|
65be1263b9
|
make file
|
3 years ago |
|
wangchuxiao
|
445100f32d
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
648a852ba7
|
conversation opt
|
3 years ago |
|
skiffer-git
|
6f1a5eb79c
|
log
|
3 years ago |
|
wangchuxiao
|
22bfb6be4b
|
merge code
|
3 years ago |
|
wangchuxiao
|
52579c5fab
|
add
|
3 years ago |
|
wangchuxiao
|
b80c8013c0
|
add user req group reqlist api
|
3 years ago |
|
wangchuxiao
|
6de61cb214
|
cms dev
|
3 years ago |
|
wangchuxiao
|
43a9bba96f
|
msg cms
|
3 years ago |
|
wangchuxiao
|
a7f9faf868
|
statistics
|
3 years ago |
|
wangchuxiao
|
fb396d9cf0
|
add
|
3 years ago |
|
skiffer-git
|
fca092d392
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# config/config.yaml
# internal/rpc/chat/send_msg.go
# internal/rpc/group/create_group.go
# pkg/common/config/config.go
# pkg/proto/sdk_ws/ws.pb.go
# pkg/proto/sdk_ws/ws.proto
|
3 years ago |
|
wangchuxiao
|
1607853393
|
cms
|
3 years ago |
|
skiffer-git
|
27d402104e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# cmd/Open-IM-SDK-Core
# pkg/common/config/config.go
|
3 years ago |
|
wangchuxiao
|
d58bcd136a
|
pb api
|
3 years ago |
|
Gordon
|
e4f87b53b4
|
protocol modify
|
3 years ago |
|
wenxu12345
|
14ccbf335d
|
Refactor code
|
3 years ago |
|
wenxu12345
|
a2440a2e80
|
Refactor code
|
3 years ago |
|
wenxu12345
|
17b96dd7c1
|
Refactor code
|
3 years ago |
|
Gordon
|
6bc69d5a75
|
proto json tag modify
|
3 years ago |
|
Gordon
|
0db2c271a0
|
proto json tag modify
|
3 years ago |
|
wenxu12345
|
89eb39ca3e
|
Refactor code
|
3 years ago |
|
wenxu12345
|
eb417c7e22
|
Refactor code
|
3 years ago |
|
Gordon
|
627419aa5f
|
add null value handle
|
3 years ago |
|
Gordon
|
aa99e710d1
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# cmd/open_im_api/main.go
# internal/api/group/group.go
|
3 years ago |
|
Gordon
|
fdf1c0448b
|
add null value handle
|
3 years ago |
|
wenxu12345
|
0c02afa54e
|
Refactor code
|
3 years ago |
|
wenxu12345
|
1e9ef321f0
|
Refactor code
|
3 years ago |
|
Gordon
|
7301bc30b1
|
add null value handle
|
3 years ago |
|
wenxu12345
|
93e669d7d3
|
Refactor code
|
3 years ago |
|
wenxu12345
|
bd14e5019f
|
Refactor code
|
3 years ago |
|
wenxu12345
|
6d0f454e6a
|
Refactor code
|
3 years ago |
|
wenxu12345
|
a031311ab5
|
Refactor code
|
3 years ago |
|
wenxu12345
|
2f62339f0c
|
Refactor code
|
3 years ago |
|
wenxu12345
|
cc5125d51d
|
Refactor code
|
3 years ago |
|
wenxu12345
|
2936f886a9
|
Refactor code
|
3 years ago |
|
wenxu12345
|
5ae6e98572
|
Refactor code
|
3 years ago |
