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 |
|
Gordon
|
8cfc5925da
|
management modify
|
3 years ago |
|
wenxu12345
|
f4c3c86dd1
|
tidy code
|
3 years ago |
|
wenxu12345
|
5c509ee85a
|
tidy code
|
3 years ago |
|
wenxu12345
|
12ebf232d5
|
tidy code
|
3 years ago |
|
wenxu12345
|
05ee76b0a9
|
tidy code
|
3 years ago |
|
wenxu12345
|
6d589a1204
|
tidy code
|
3 years ago |
|
wenxu12345
|
141936e609
|
tidy code
|
3 years ago |
|
wenxu12345
|
188a90f97d
|
tidy code
|
3 years ago |
|
wenxu12345
|
ec95f0a7af
|
tidy code
|
3 years ago |
|
wenxu12345
|
848510d4ca
|
tidy code
|
3 years ago |
|
wenxu12345
|
16e276d08e
|
tidy code
|
3 years ago |
|
wenxu12345
|
62d0a7e6ff
|
tidy code
|
3 years ago |
|
wenxu12345
|
eeee9a54d7
|
tidy code
|
3 years ago |
|
wenxu12345
|
dbd3ed49ed
|
tidy code
|
3 years ago |
|
wenxu12345
|
eb640157f2
|
tidy code
|
3 years ago |
|
wenxu12345
|
166ec71a28
|
tidy code
|
3 years ago |
|
wenxu12345
|
8e4f3b4f06
|
tidy code
|
3 years ago |
|
wenxu12345
|
f43e1a1018
|
tidy code
|
3 years ago |
|
wenxu12345
|
6f92fa0069
|
tidy code
|
3 years ago |
|
wenxu12345
|
12c2d18325
|
tidy code
|
3 years ago |
|
wenxu12345
|
28cfc2a9c1
|
tidy code
|
3 years ago |
|
wenxu12345
|
b6944c4308
|
tidy code
|
3 years ago |
|
Gordon
|
6e8080b87d
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
|
3 years ago |
|
Gordon
|
292a8620e0
|
remove invalid token
|
3 years ago |
|
wenxu12345
|
f0f1c54244
|
tidy code
|
3 years ago |
|
wenxu12345
|
30024c9814
|
tidy code
|
3 years ago |
|
wenxu12345
|
e439ef4ddd
|
tidy code
|
3 years ago |
|
wenxu12345
|
3d4e0a0479
|
tidy code
|
3 years ago |
|
Gordon
|
ba249d294e
|
send msg file modify
|
3 years ago |
|
Gordon
|
b76aa03d3a
|
Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
# pkg/proto/sdk_ws/ws.pb.go
|
3 years ago |
|
Gordon
|
5f09d6a26f
|
send msg file modify
|
3 years ago |
|
wenxu12345
|
27fd4f444b
|
notification
|
3 years ago |
|
wenxu12345
|
75e1e2e678
|
notification
|
3 years ago |
|
Gordon
|
8987005e60
|
add management interface
|
3 years ago |
|
Gordon
|
f933abe48e
|
add check user is registered
|
3 years ago |
|
Gordon
|
7403619cbc
|
err handle
|
3 years ago |
|
Gordon
|
d6ec8f4930
|
pb change
|
3 years ago |
|
Gordon
|
c6ade8d9bc
|
rpc protocol update
|
3 years ago |
|
Gordon
|
ebd867a6d5
|
conversation update
|
3 years ago |
|
Gordon
|
a090e602b3
|
conversation update
|
3 years ago |
|
Gordon
|
c9a48081fd
|
conversation update
|
3 years ago |
|
Gordon
|
5b026e13f6
|
conversation update
|
3 years ago |
|
wenxu12345
|
d7028f22e2
|
fix bug
|
3 years ago |
|
wenxu12345
|
053792e89d
|
ReceiveMessageOpt debug log
|
3 years ago |
|
wenxu12345
|
31212d4f4b
|
ReceiveMessageOpt debug log
|
3 years ago |
|
wenxu12345
|
19489afefc
|
ReceiveMessageOpt debug log
|
3 years ago |
|
wenxu12345
|
5dd494d9a2
|
ReceiveMessageOpt debug log
|
3 years ago |
|
wenxu12345
|
2adbf9f686
|
ReceiveMessageOpt debug log
|
3 years ago |
|
wenxu12345
|
9dbad9ce53
|
ReceiveMessageOpt
|
3 years ago |
|
wenxu12345
|
52498bf05e
|
ReceiveMessageOpt
|
3 years ago |
|
wenxu12345
|
d629874468
|
ReceiveMessageOpt
|
3 years ago |
|
wenxu12345
|
6d1c70b8d3
|
get online state by secret
|
3 years ago |
|
Gordon
|
c2a45cdbeb
|
get all node online user status
|
3 years ago |
|
Gordon
|
e7e3b6dd15
|
multi terminal kick eachOther
|
3 years ago |
|
Gordon
|
09fd45346e
|
add management interface and callback args optimization
|
3 years ago |
|
Gordon
|
aae6874928
|
null pointer fix
|
3 years ago |
|
Gordon
|
bcc0cd33f1
|
log change
|
3 years ago |
|
Gordon
|
0daa840eaa
|
log change
|
3 years ago |
|
Gordon
|
46deb5a099
|
merge newest branch
|
3 years ago |
|
Gordon
|
6158ea436d
|
merge newest branch
|
3 years ago |
|
Gordon
|
8a92326241
|
merge all branch and change project structure
|
3 years ago |
xmcy0011
|
a2e204667f
|
Merge branch 'main' into v0926_project_layout
# Conflicts:
# cmd/open_im_api/main.go
# internal/rpc/auth/rpcAuth.go
# internal/rpc/chat/rpcChat.go
# src/common/log/logrus.go
|
3 years ago |
|
xmcy0011
|
1ec9486452
|
fixed build error
|
3 years ago |
|
xmcy0011
|
737edb985b
|
mv src/common src/utils src/grpc-etcdv3 to pkg
|
3 years ago |
|
xmcy0011
|
bc94d4e0b3
|
mv src/proto to pkg/proto
|
3 years ago |
|
xmcy0011
|
9367ad901d
|
add cmd/open_im_api
|
3 years ago |
