wangchuxiao
|
30fc4c28b7
|
cache
|
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 |
wenxu12345
|
7de29c29e9
|
add ParseToken
|
3 years ago |
Gordon
|
9303096430
|
log change
|
3 years ago |
skiffer-git
|
f2c91d015e
|
add err log
|
3 years ago |
skiffer-git
|
bb07c3ab45
|
add err log
|
3 years ago |
wangchuxiao
|
2cf070a26c
|
office
|
3 years ago |
wangchuxiao
|
3c68ecb7f1
|
office
|
3 years ago |
wangchuxiao
|
d75eb456dc
|
office
|
3 years ago |
wangchuxiao
|
91e03f7cfd
|
cache
|
3 years ago |
wangchuxiao
|
65f02e5139
|
cache
|
3 years ago |
wangchuxiao
|
59468eb162
|
fix work moments bug
|
3 years ago |
wangchuxiao
|
1889a283ee
|
fix work moments bug
|
3 years ago |
wangchuxiao
|
a1b8c9b6fd
|
fix work moments bug
|
3 years ago |
wangchuxiao
|
f8c3e4d66f
|
Merge branch 'tuoyun'
# Conflicts:
# cmd/open_im_cms_api/main.go
# config/config.yaml
|
3 years ago |
wangchuxiao
|
17f6b8eb2a
|
work moments
|
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 |
wenxu12345
|
4ee84e10fd
|
fix bug
|
3 years ago |
wenxu12345
|
ab706f4076
|
fix bug
|
3 years ago |
wangchuxiao
|
a03f89fb68
|
cache rpc
|
3 years ago |
wangchuxiao
|
ac31c612b3
|
work_moments
|
3 years ago |
wangchuxiao
|
03c3eea54e
|
work_moments
|
3 years ago |
wangchuxiao
|
bccaf16343
|
work_moments
|
3 years ago |
wangchuxiao
|
1b968903e2
|
work_moments
|
3 years ago |
Gordon
|
e73f0a916a
|
add modify conversation api
|
3 years ago |
skiffer-git
|
0a0c206998
|
add cache
|
3 years ago |
wangchuxiao
|
937ff63af9
|
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
|
b865f5d6e7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
00664822ec
|
conversation add fields
|
3 years ago |
skiffer-git
|
4594c15de7
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
skiffer-git
|
2b6ec1672c
|
Organization
|
3 years ago |
wangchuxiao
|
5757b86d39
|
workMoments
|
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
|
c56fd399c1
|
Organization
|
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
|
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
|
5664c34790
|
organization
|
3 years ago |
skiffer-git
|
b1c66997ca
|
organization
|
3 years ago |
skiffer-git
|
6873bf384e
|
organization
|
3 years ago |
skiffer-git
|
42242daf9b
|
organization
|
3 years ago |
skiffer-git
|
1f96b960ab
|
organization
|
3 years ago |
skiffer-git
|
f6b30ed0c6
|
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
|
803d0c2ae2
|
organization
|
3 years ago |
skiffer-git
|
fd01e5c263
|
organization
|
3 years ago |
skiffer-git
|
b6e06dfdc2
|
organization
|
3 years ago |
skiffer-git
|
eb630b23ae
|
organization
|
3 years ago |
skiffer-git
|
eae7a48991
|
organization
|
3 years ago |
skiffer-git
|
9436c836e6
|
organization
|
3 years ago |
skiffer-git
|
7c64239b36
|
organization
|
3 years ago |
skiffer-git
|
9def85f9ba
|
organization
|
3 years ago |
skiffer-git
|
1902c37924
|
organization
|
3 years ago |
skiffer-git
|
02b5ff38a4
|
organization
|
3 years ago |
skiffer-git
|
f076a927c9
|
organization
|
3 years ago |
skiffer-git
|
6184eaa30e
|
organization
|
3 years ago |
skiffer-git
|
a42b72e9ce
|
organization
|
3 years ago |
skiffer-git
|
f4dcae722c
|
organization
|
3 years ago |
skiffer-git
|
bbcb3e9403
|
organization
|
3 years ago |
skiffer-git
|
b4ab2c69ae
|
organization
|
3 years ago |
skiffer-git
|
4a7f406edb
|
organization
|
3 years ago |
skiffer-git
|
3267958541
|
organization
|
3 years ago |
skiffer-git
|
300b72b9b8
|
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
|
9976b8132f
|
getui
|
3 years ago |
wangchuxiao
|
1bb634bc6f
|
merge code
|
3 years ago |
wangchuxiao
|
caf4ab60cd
|
minio add inner ip
|
3 years ago |
wangchuxiao
|
4a8d37bde1
|
getui
|
3 years ago |
wenxu12345
|
aa673a3a5c
|
log
|
3 years ago |
wenxu12345
|
40d58f6bc2
|
log
|
3 years ago |
wenxu12345
|
7604b24ffc
|
log
|
3 years ago |
wenxu12345
|
0232f52281
|
log
|
3 years ago |
Gordon
|
7f1a74b576
|
panic fix
|
3 years ago |
wangchuxiao
|
2b03b57b5c
|
tag and set private tips
|
3 years ago |
Gordon
|
efe24658a4
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
5cdf9e7551
|
OA tag fields modify
|
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
|
5639c985df
|
OA tag fields modify
|
3 years ago |
Gordon
|
6744745152
|
token add operationID
|
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 |
Gordon
|
679c913f3a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
03fb7947c3
|
add oa notification
|
3 years ago |
wangchuxiao
|
574c7600e0
|
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
|
e6c36411cb
|
mongo
|
3 years ago |
wangchuxiao
|
8034ddc413
|
mongo
|
3 years ago |
wangchuxiao
|
e75adb165a
|
mongo
|
3 years ago |
wangchuxiao
|
09ce0d5285
|
mongo
|
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 |
Gordon
|
ea6d472002
|
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 |
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 |
wangchuxiao
|
3693d2e93d
|
conversation table
|
3 years ago |
wangchuxiao
|
51c2f845d8
|
opt
|
3 years ago |
wenxu12345
|
0e575a9366
|
keepalive ttl * 3
add user.ex
|
3 years ago |
wangchuxiao
|
bcae7720e1
|
add callback
|
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
|
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
|
0410003ceb
|
api update
|
3 years ago |
wangchuxiao
|
a3fb32dfc6
|
fix bug and add reset pwd api
|
3 years ago |
wangchuxiao
|
a2cd7c8007
|
add minio
|
3 years ago |
wangchuxiao
|
6e9b9341d4
|
mini cr
|
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 |
wenxu12345
|
17954dfdc9
|
Refactoring code
|
3 years ago |
wenxu12345
|
8c357ec213
|
Refactoring code
|
3 years ago |
wangchuxiao
|
648a852ba7
|
conversation opt
|
3 years ago |
wangchuxiao
|
22bfb6be4b
|
merge code
|
3 years ago |
wenxu12345
|
3103c33dda
|
Refactor code
|
3 years ago |
wenxu12345
|
f67f2a31ee
|
Refactor code
|
3 years ago |
wangchuxiao
|
192ac0e013
|
api
|
3 years ago |
wangchuxiao
|
e94dbe4965
|
cms dev
|
3 years ago |
Gordon
|
e4f87b53b4
|
protocol modify
|
3 years ago |
Gordon
|
da24249850
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
04e509fc49
|
update user
|
3 years ago |
wenxu12345
|
4c3474a9f7
|
Refactor code
|
3 years ago |
wenxu12345
|
14ccbf335d
|
Refactor code
|
3 years ago |
Gordon
|
c23426425e
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
wenxu12345
|
83e842d121
|
Refactor code
|
3 years ago |
wenxu12345
|
0dc5c9dbac
|
Refactor code
|
3 years ago |
wenxu12345
|
28d9304ec6
|
Refactor code
|
3 years ago |
wenxu12345
|
d132e53c06
|
Refactor code
|
3 years ago |
wenxu12345
|
e28a8db3b4
|
Refactor code
|
3 years ago |
Gordon
|
b6380a17ce
|
ws send msg modify
|
3 years ago |
wenxu12345
|
f3507569b5
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
wenxu12345
|
da5e60a009
|
Refactor code
|
3 years ago |
Gordon
|
0ed5f8081a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
7416fa3a4c
|
ws send msg modify
|
3 years ago |
wenxu12345
|
d12d571c2b
|
Refactor code
|
3 years ago |
wenxu12345
|
a456936853
|
Refactor code
|
3 years ago |
wenxu12345
|
655f7ff7d0
|
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 |
wenxu12345
|
1f493c427a
|
Refactor code
|
3 years ago |
wenxu12345
|
89eb39ca3e
|
Refactor code
|
3 years ago |
wenxu12345
|
edfb89a8d9
|
Refactor code
|
3 years ago |
wenxu12345
|
5fef41e132
|
Refactor code
|
3 years ago |
wenxu12345
|
a677d4da5f
|
Refactor code
|
3 years ago |
wenxu12345
|
9bee5c79c8
|
Refactor code
|
3 years ago |
wenxu12345
|
aab6ad96eb
|
Refactor code
|
3 years ago |
wenxu12345
|
c8d803b559
|
Refactor code
|
3 years ago |
wenxu12345
|
ab5faec68c
|
Refactor code
|
3 years ago |
wenxu12345
|
dcba4fef48
|
Refactor code
|
3 years ago |
wenxu12345
|
0fce4c6177
|
Refactor code
|
3 years ago |
wenxu12345
|
e964ff0b70
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
wenxu12345
|
a5765fc25a
|
Refactor code
|
3 years ago |
wenxu12345
|
18600bcd11
|
Refactor code
|
3 years ago |
Gordon
|
7a3bb59d3e
|
add null value handle
|
3 years ago |
Gordon
|
29e1535c64
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# cmd/open_im_api/main.go
|
3 years ago |
wenxu12345
|
7b41ce1f24
|
Refactor code
|
3 years ago |
wenxu12345
|
1e6a170c3c
|
Refactor code
|
3 years ago |
wenxu12345
|
324152e363
|
Refactor code
|
3 years ago |
wenxu12345
|
1b11cd571e
|
Refactor code
|
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 |
wenxu12345
|
f3a9857747
|
Refactor code
|
3 years ago |
Gordon
|
e4989d8b9f
|
add null value handle
|
3 years ago |
wenxu12345
|
b135de80c0
|
Refactor code
|
3 years ago |
wenxu12345
|
79a39b39d9
|
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
|
a031311ab5
|
Refactor code
|
3 years ago |
wenxu12345
|
2f62339f0c
|
Refactor code
|
3 years ago |
wenxu12345
|
1eee8f439b
|
Refactor code
|
3 years ago |
wenxu12345
|
89d69a8fb6
|
Refactor code
|
3 years ago |
wenxu12345
|
81aaa95170
|
Refactor code
|
3 years ago |
wenxu12345
|
9f5897e06c
|
Refactor code
|
3 years ago |
wenxu12345
|
2936f886a9
|
Refactor code
|
3 years ago |
wenxu12345
|
ac3159193f
|
Refactor code
|
3 years ago |
wenxu12345
|
f2c0a3994a
|
Refactor code
|
3 years ago |
wenxu12345
|
be4ba6cc69
|
Refactor code
|
3 years ago |
wenxu12345
|
51126ca941
|
Refactor code
|
3 years ago |
wenxu12345
|
ca92bc899b
|
Refactor code
|
3 years ago |
wenxu12345
|
9f55418bfb
|
Refactor code
|
3 years ago |
wenxu12345
|
6e14375b86
|
Refactor code
|
3 years ago |
wenxu12345
|
7138d7ac59
|
Refactor code
|
3 years ago |
wenxu12345
|
6c137d9098
|
Refactor code
|
3 years ago |
wenxu12345
|
69b1ee2ec7
|
Refactor code
|
3 years ago |
wenxu12345
|
95a771c2fb
|
Refactor code
|
3 years ago |
wenxu12345
|
cf59f57ab8
|
Refactor code
|
3 years ago |
wenxu12345
|
8cd38693dd
|
Refactor code
|
3 years ago |
wenxu12345
|
ef67aa9e48
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
wenxu12345
|
4623b5d5db
|
Refactor code
|
3 years ago |
Gordon
|
0b0173f155
|
nil return modify
|
3 years ago |
Gordon
|
cd6bb1b98f
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
Gordon
|
03f491ab5a
|
nil return modify
|
3 years ago |
wenxu12345
|
fb7c4114c1
|
Refactor code
|
3 years ago |
wenxu12345
|
669ea69357
|
Refactor code
|
3 years ago |
wenxu12345
|
20aa2bdc6e
|
Refactor code
|
3 years ago |
wenxu12345
|
c049cde8cf
|
Refactor code
|
3 years ago |
wenxu12345
|
e75e36e999
|
Refactor code
|
3 years ago |
Gordon
|
c4fca3b23d
|
nil return modify
|
3 years ago |
wenxu12345
|
447ccdf042
|
Refactor code
|
3 years ago |
wenxu12345
|
db37d0197a
|
Refactor code
|
3 years ago |
wenxu12345
|
e6f21d166a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
wenxu12345
|
2e0923a26a
|
Refactor code
|
3 years ago |
Gordon
|
bd1af2223d
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
wenxu12345
|
ec395acae0
|
Refactor code
|
3 years ago |
wenxu12345
|
5ff69b86db
|
Refactor code
|
3 years ago |
wenxu12345
|
ddf985b445
|
Refactor code
|
3 years ago |
Gordon
|
6a37072b9a
|
conversation update
|
3 years ago |
wenxu12345
|
0891e2d432
|
Refactor code
|
3 years ago |
wenxu12345
|
740dd0e0a6
|
Refactor code
|
3 years ago |
wenxu12345
|
348ce56776
|
Refactor code
|
3 years ago |
wenxu12345
|
376f61e213
|
Refactor code
|
3 years ago |
wenxu12345
|
b30cb5254e
|
Refactor code
|
3 years ago |
Gordon
|
e80c5c89e0
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |