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 |
Gordon
|
fef33795d0
|
group add
|
3 years ago |
|
Gordon
|
d2c04b761d
|
ali cloud oss
|
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 |
|
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 |
|
Gordon
|
679c913f3a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
03fb7947c3
|
add oa notification
|
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
|
dc1a0f050e
|
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
|
e7b95892ff
|
minio upload api
|
3 years ago |
|
wangchuxiao
|
df4a75f4b0
|
mongo
|
3 years ago |
|
wangchuxiao
|
4bdb4cbbb5
|
mongo
|
3 years ago |
|
wangchuxiao
|
4cdcdee8e4
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
e6c36411cb
|
mongo
|
3 years ago |
|
Gordon
|
b5de638c0b
|
ws remove log
|
3 years ago |
|
Gordon
|
1d09ffa529
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
eef9d15aaa
|
ws remove log
|
3 years ago |
|
wangchuxiao
|
8034ddc413
|
mongo
|
3 years ago |
|
wangchuxiao
|
e75adb165a
|
mongo
|
3 years ago |
|
wangchuxiao
|
09ce0d5285
|
mongo
|
3 years ago |
|
wangchuxiao
|
cc1ad41e94
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
8a38646bc5
|
mongo
|
3 years ago |
|
Gordon
|
a2b65f52f6
|
fix group create bug
|
3 years ago |
jaonzyx
|
c16d8da784
|
管理员创建群组bug fix (#168)
|
3 years ago |
goubo
|
a55582a018
|
方便测试导入数据 (#148)
|
3 years ago |
|
Gordon
|
ea6d472002
|
pr modify and update
|
3 years ago |
|
Gordon
|
3dc4290f2a
|
pr modify and update
|
3 years ago |
hxnets
|
6c43f75f9f
|
新增阿里云OSS文件上传参数获取接口 (#115)
* configure update
* mongo:4.0
* open-im-server -> open_im_server
* sleep 15
* 0.0.0.0
* sleep 10 15
* Update config.yaml
* config
* Update docker-compose.yaml
* Update config.yaml
* Create ISSUE_TEMPLATE.md
* Update ISSUE_TEMPLATE.md
* Create ISSUE_TEMPLATE
* add issue template
* add issue template
* add issue template
* add issue template
* Update README.md
* script
* script
* script
* config
* script
* config update
* script update
* image: openim/open_im_server:v1.0.6
* script
* script
* script
* version update
* sender message sync
* version update
* 阿里云oss sts上传参数
* 阿里云oss sts上传参数
Co-authored-by: wenxu12345 <44203734@qq.com>
Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>
Co-authored-by: Gordon <1432970085@qq.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
|
3 years ago |
马守越
|
1ab3e04cba
|
新增mongo.dbUrl配置 (#174)
* 当dbUri值不为空则直接使用该值
* 新增支持ali oss
Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn>
|
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 |
|
wenxu12345
|
1b457b0be6
|
fix bug : etcd Put failed etcdserver: requested lease not found
|
3 years ago |
|
wangchuxiao
|
366f7621fa
|
rtc add
|
3 years ago |
|
wangchuxiao
|
984bc37e29
|
middleware
|
3 years ago |
|
wangchuxiao
|
604de144b9
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
7790686a84
|
ws add token platform verify
|
3 years ago |
|
wangchuxiao
|
ef07634e09
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f70a20f740
|
rtc add
|
3 years ago |
|
wenxu12345
|
c1cda2d536
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
2b03e7aea8
|
add log
|
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
|
f63aa33082
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
7bdf6717e1
|
add log
|
3 years ago |
|
Gordon
|
2bb6061a44
|
pb 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 |
|
Gordon
|
367888968b
|
log add
|
3 years ago |
|
Gordon
|
b7ff0cf2a2
|
meta data add
|
3 years ago |
|
wangchuxiao
|
fa21ae6161
|
rtc add
|
3 years ago |
|
Gordon
|
852d3b9f48
|
add friend and blacklist judge
|
3 years ago |
|
Gordon
|
10884b8175
|
add friend and blacklist judge
|
3 years ago |
|
Gordon
|
ab9f3a1635
|
add friend and blacklist judge
|
3 years ago |
|
Gordon
|
011960b159
|
send msg add protect
|
3 years ago |
|
Gordon
|
45777e6047
|
pb modify
|
3 years ago |
|
Gordon
|
1db0966675
|
pb modify
|
3 years ago |
|
Gordon
|
0c50815944
|
server modify
|
3 years ago |
|
Gordon
|
38e5b1f853
|
server modify
|
3 years ago |
|
Gordon
|
470bdb6efb
|
ws modify
|
3 years ago |
|
Gordon
|
ca9ac35eb5
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
cb68f83451
|
signal update
|
3 years ago |
|
wangchuxiao
|
972675d4da
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
347b1dd31c
|
livekit
|
3 years ago |
|
Gordon
|
d34e729e32
|
signal update
|
3 years ago |
|
Gordon
|
4954dcead8
|
grpc version
|
3 years ago |
|
Gordon
|
a2f3677784
|
grpc version
|
3 years ago |
|
Gordon
|
fb22b8bba5
|
grpc version
|
3 years ago |
|
Gordon
|
bae5042eea
|
grpc version
|
3 years ago |
|
wangchuxiao
|
8d08bc7fd1
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
cf6379283b
|
add Signal message
|
3 years ago |
|
Gordon
|
9659638f0c
|
add Signal message
|
3 years ago |
|
Gordon
|
433fef9992
|
add Signal message
|
3 years ago |
|
Gordon
|
d60039454a
|
add Signal message
|
3 years ago |
|
wangchuxiao
|
d90b31c5df
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
Gordon
|
0ce164079e
|
ws modify
|
3 years ago |
|
wangchuxiao
|
3693d2e93d
|
conversation table
|
3 years ago |
|
Gordon
|
9d132d7f92
|
int32 modify
|
3 years ago |
|
Gordon
|
0315abc0df
|
utils modify
|
3 years ago |
|
wangchuxiao
|
51c2f845d8
|
opt
|
3 years ago |
|
Gordon
|
edc81534c4
|
ws modify
|
3 years ago |
|
wenxu12345
|
12d10ce8b5
|
fix bug: group member jointime
|
3 years ago |
|
wenxu12345
|
c4554cb4e9
|
1.statistics log
2. Handle exception : etcd keepalive failed
|
3 years ago |
|
wenxu12345
|
0e575a9366
|
keepalive ttl * 3
add user.ex
|
3 years ago |
|
wangchuxiao
|
fafad9217d
|
cb
|
3 years ago |
|
wangchuxiao
|
1572d9df89
|
cb
|
3 years ago |
|
wangchuxiao
|
4c297164a5
|
cb
|
3 years ago |
|
Gordon
|
eb1e596cde
|
log
|
3 years ago |
|
Gordon
|
9bbcf0c5d7
|
log
|
3 years ago |
|
wangchuxiao
|
2e1459e29c
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
95f6035aa8
|
add cb
|
3 years ago |
|
Gordon
|
8dc04667b0
|
test recover
|
3 years ago |
|
wangchuxiao
|
c108115c83
|
add callback
|
3 years ago |
|
wangchuxiao
|
bcae7720e1
|
add callback
|
3 years ago |
|
wangchuxiao
|
3805db1263
|
msg callback
|
3 years ago |
|
wangchuxiao
|
4d4520226d
|
msg callback
|
3 years ago |
|
wangchuxiao
|
9f80e0a0e6
|
alter callback fg
|
3 years ago |
|
wangchuxiao
|
2ed3fd3cba
|
alter callback fg
|
3 years ago |
|
wangchuxiao
|
3698f1dab8
|
alter callback fg
|
3 years ago |
|
wangchuxiao
|
fb4c02ca9b
|
alter callback fg
|
3 years ago |
|
wangchuxiao
|
9cec4b0c8e
|
alter callback fg
|
3 years ago |
|
wangchuxiao
|
6cef26f893
|
alter callback fg
|
3 years ago |
|
wangchuxiao
|
e2b5b7016c
|
add debug log
|
3 years ago |
|
wangchuxiao
|
d13a6b0c36
|
add callback
|
3 years ago |
|
wangchuxiao
|
48f03f306a
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f1c11ac114
|
add callback
|
3 years ago |
|
Gordon
|
97ec9602f7
|
callback note
|
3 years ago |
|
skiffer-git
|
c0c08fe373
|
adjust log
|
3 years ago |
|
wangchuxiao
|
60e29cc894
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
dcfd802757
|
callback add
|
3 years ago |
|
Gordon
|
72ed38156a
|
test code
|
3 years ago |
|
Gordon
|
0e9e02de0b
|
statistics code
|
3 years ago |
|
wangchuxiao
|
0bed7ee669
|
merge code
|
3 years ago |
|
wangchuxiao
|
7d8d314962
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f01a6e82dc
|
fix minio bug
|
3 years ago |
|
wangchuxiao
|
67d7ee2751
|
fix bug
|
3 years ago |
|
Gordon
|
b30da3eea4
|
database judge modify
|
3 years ago |
|
wenxu12345
|
00a52475de
|
statistics
|
3 years ago |
|
wenxu12345
|
9d28736849
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
739096a9c0
|
statistics performance
|
3 years ago |
|
Gordon
|
2775d9b78a
|
test
|
3 years ago |
|
Gordon
|
4f01b0b2ad
|
remove mysql for test
|
3 years ago |
|
Gordon
|
55c8399084
|
remove mysql for test
|
3 years ago |
|
Gordon
|
a1067492b7
|
server msg id update
|
3 years ago |
|
Gordon
|
2585014ace
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# config/config.yaml
|
3 years ago |
|
Gordon
|
0410003ceb
|
api update
|
3 years ago |
|
wangchuxiao
|
e1a0c2fc48
|
fix bug
|
3 years ago |
|
wangchuxiao
|
188ca8fc58
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
3b80b74730
|
test mongo driver
|
3 years ago |
|
Gordon
|
d9f5f960a5
|
test
|
3 years ago |
|
wangchuxiao
|
566c05bcef
|
mongodriver test
|
3 years ago |
|
wangchuxiao
|
d22935703d
|
forget pwd
|
3 years ago |
|
Gordon
|
eddcac2343
|
send msg time modify
|
3 years ago |
|
Gordon
|
861dfc43a8
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
a1cbf8724f
|
log
|
3 years ago |
|
wangchuxiao
|
952ad0e162
|
fix deploy
|
3 years ago |
|
wangchuxiao
|
aad27f40cf
|
verrify
|
3 years ago |
|
wangchuxiao
|
55d7c6e672
|
add log
|
3 years ago |
|
wenxu12345
|
75590eb765
|
VerificationCodeForRegisterSuffix
|
3 years ago |
|
wangchuxiao
|
dfdb952e2b
|
fix reset password api
|
3 years ago |
|
wangchuxiao
|
c09ebc146b
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
139ef08af3
|
fix bug
|
3 years ago |
|
Gordon
|
2d13a5fd35
|
msg judge
|
3 years ago |
|
wangchuxiao
|
a3fb32dfc6
|
fix bug and add reset pwd api
|
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
|
9a35af9fb2
|
replace mongo driver
|
3 years ago |
|
wenxu12345
|
db116f39fd
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
c962a19eb7
|
replace mongo driver
|
3 years ago |
|
Gordon
|
344bafff45
|
push modify
|
3 years ago |
|
Gordon
|
3ee12221a4
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
8915848a52
|
login modify
|
3 years ago |
|
wangchuxiao
|
a2cd7c8007
|
add minio
|
3 years ago |
|
wangchuxiao
|
6e9b9341d4
|
mini cr
|
3 years ago |
|
wangchuxiao
|
737ce2c2e7
|
fix bug
|
3 years ago |
|
wangchuxiao
|
8a7442648c
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
f1616461f7
|
add log
|
3 years ago |
|
Gordon
|
ed2a5af5ed
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# internal/api/third/tencent_cloud_storage_credential.go
|
3 years ago |
|
Gordon
|
3b73a4c69a
|
send msg modify
|
3 years ago |
|
wenxu12345
|
17954dfdc9
|
Refactoring code
|
3 years ago |
|
wenxu12345
|
5e65e394a6
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
8c357ec213
|
Refactoring code
|
3 years ago |
|
wangchuxiao
|
caa915b31d
|
Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
|
3 years ago |
|
wangchuxiao
|
65be1263b9
|
make file
|
3 years ago |
|
wenxu12345
|
d81ae835aa
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
wenxu12345
|
c405cedc41
|
Refactoring code
|
3 years ago |
|
Gordon
|
2a7f366cbf
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
ea580e4c64
|
send message
|
3 years ago |
