25eabde3f6
fix conflict
...
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com ’>
2023-07-13 18:20:11 +08:00
02e6b7ec18
fix conflict
...
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com ’>
2023-07-13 18:20:03 +08:00
be7d785f1d
fix conflict
...
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com ’>
2023-07-13 18:17:27 +08:00
ccf2cdaab2
Merge pull request #540 from cubxxw/fix/copy
...
feat: add test file
2023-07-13 10:09:16 +00:00
99dc701ff6
feat: script and make build
...
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
2023-07-13 17:37:51 +08:00
8fbc7e8116
Merge pull request #539 from plutoyty/main
...
url to uri
2023-07-13 09:33:37 +00:00
4066726221
Merge branch 'OpenIMSDK:main' into main
2023-07-13 17:22:39 +08:00
53048951ec
Merge pull request #538 from withchao/main
...
fix: minio auto make bucket
2023-07-13 09:19:30 +00:00
772cb859fa
url to uri
2023-07-13 17:18:14 +08:00
81bcd86304
fix: minio auto make bucket
2023-07-13 17:10:48 +08:00
b0b7d6fe7f
Merge branch 'OpenIMSDK:main' into main
2023-07-13 17:08:00 +08:00
6ecf253ef6
feat: add copy
...
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
2023-07-13 17:07:45 +08:00
fd3c19d6a5
feat: add test file
...
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
2023-07-13 17:07:45 +08:00
ce33b79915
fix: conflict resolve main ( #537 )
...
* statistics user register
* refactor: router change
* minio init
* UserRegisterCount
* push use local conn
* refactor: user pb update
* remove online push close grpc conn
* refactor: user pb update
* refactor:pb file
* msgs statistics
* msgs statistics
* revoke userID
* refactor: errcode update
* active user
* active user
* active user
* refactor: errcode update
* feat: conn update token
* active user
* active user
* feat: conn update token
* active user
* feat: conn update token
* feat: conn update token
* feat: conn update token
* add tx_oss cos
* active user
* active user
* group create
* group create
* feat: group notification show to conversation
* feat: group notification show to conversation
* group active
* user active
* sendNotificationWithName
* withname
* privateChat
* a2r call option
* grpc with detail return error
* change log error
* chain unary interceptor
* api nil slice map
* fix sync has read
* fix: text update
* fix: update add model
* set conversations update
* set privateChat
* fix: content update
* remove unuse rpc
* msgDestruct
* cron use rpc mw
* set IsMsgDestruct
* msg destruct
* msgDestruct
* s3 minio, cos, oss support
* feat: add implement of GetUsersOnlineStatus, #472 (#477 )
* s3 minio, cos, oss support
* s3 route
* remove extendMsg code
* s3 route
* remove unuse code
* s3 pb
* s3 pb
* s3 pb
* s3 presigned put
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* Update .gitignore (#482 )
* s3 debug log
* s3 debug log
* cron add log and fix cron
* add log
* cron
* s3 config
* fix kick user bug
* s3 cos
* add kick log
* s3 cos test
* s3 cos test
* s3 cos test
* kick user log
* kickuserlog
* s3 cos copy
* s3 cos copy
* s3 url
* s3 url
* s3 AccessURL
* log
* s3 InitiateMultipartUpload add ExpireTime
* feat: regenerate pb file
* feat: regenerate pb file
* Revert "feat: regenerate pb file"
This reverts commit 434f22564a993506633@qq.com >
Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com >
Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com >
Co-authored-by: withchao <48119764+withchao@users.noreply.github.com >
Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com >
2023-07-13 16:51:52 +08:00
2388f93cfb
Merge branch 'OpenIMSDK:main' into main
2023-07-13 15:46:37 +08:00
4cacc3f621
fix bug: friend, args error ( #534 )
...
* fix bug: args error
* fix bug: args error
* fix bug: add friend need update both request
* fix bug: add friend need update both request
2023-07-13 15:26:25 +08:00
e5ab278be5
fix: get user online status #472 ( #527 )
...
* statistics user register
* refactor: router change
* minio init
* UserRegisterCount
* push use local conn
* refactor: user pb update
* remove online push close grpc conn
* refactor: user pb update
* refactor:pb file
* msgs statistics
* msgs statistics
* revoke userID
* refactor: errcode update
* active user
* active user
* active user
* refactor: errcode update
* feat: conn update token
* active user
* active user
* feat: conn update token
* active user
* feat: conn update token
* feat: conn update token
* feat: conn update token
* add tx_oss cos
* active user
* active user
* group create
* group create
* feat: group notification show to conversation
* feat: group notification show to conversation
* group active
* user active
* sendNotificationWithName
* withname
* privateChat
* a2r call option
* grpc with detail return error
* change log error
* chain unary interceptor
* api nil slice map
* fix sync has read
* fix: text update
* fix: update add model
* set conversations update
* set privateChat
* fix: content update
* remove unuse rpc
* msgDestruct
* cron use rpc mw
* set IsMsgDestruct
* msg destruct
* msgDestruct
* s3 minio, cos, oss support
* feat: add implement of GetUsersOnlineStatus, #472 (#477 )
* s3 minio, cos, oss support
* s3 route
* remove extendMsg code
* s3 route
* remove unuse code
* s3 pb
* s3 pb
* s3 pb
* s3 presigned put
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* Update .gitignore (#482 )
* s3 debug log
* s3 debug log
* cron add log and fix cron
* add log
* cron
* s3 config
* fix kick user bug
* s3 cos
* add kick log
* s3 cos test
* s3 cos test
* s3 cos test
* kick user log
* kickuserlog
* s3 cos copy
* s3 cos copy
* s3 url
* s3 url
* s3 AccessURL
* log
* s3 InitiateMultipartUpload add ExpireTime
* feat: regenerate pb file
* feat: regenerate pb file
* Revert "feat: regenerate pb file"
This reverts commit 434f22564a993506633@qq.com >
Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com >
Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com >
Co-authored-by: withchao <48119764+withchao@users.noreply.github.com >
Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com >
2023-07-13 15:17:05 +08:00
0b306d996d
all back-office api ( #533 )
...
* fix conflict
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com ’>
* all Back-office management api
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com ’>
---------
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com ’>
Co-authored-by: ‘hanzhixiao’ <‘709674996@qq.com ’>
2023-07-13 15:11:33 +08:00
5e92c76136
Merge branch 'OpenIMSDK:main' into main
2023-07-13 12:27:20 +08:00
058e2eee32
add MongoDB,Redis,Kafka retry mechanism ( #518 )
2023-07-13 12:26:09 +08:00
7bf8a898e2
feat: add scripts ( #525 )
2023-07-13 11:37:23 +08:00
eb7953cacb
cicd: update openim-ci.yml ( #528 )
2023-07-13 10:30:25 +08:00
59f948bde2
Merge branch 'OpenIMSDK:main' into main
2023-07-13 10:14:40 +08:00
b46f3410ad
Add feature: Replace apiURL (in config.yaml) with an external IP address
2023-07-12 22:07:25 +08:00
62cd1dace0
Merge remote-tracking branch 'origin/main'
2023-07-12 21:33:25 +08:00
95ec99daf0
fix bug ContentType is wrong range for Check
2023-07-12 21:33:11 +08:00
df38875d88
Merge branch 'OpenIMSDK:main' into main
2023-07-12 20:58:37 +08:00
135dc7b359
feat: add scripts ( #515 )
...
* feat: add scripts
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* build: Infrastructure, openimv3.0.0
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: add code (#519 )
---------
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
2023-07-12 20:46:34 +08:00
d41f2a7aef
Add retry mechanism to mongoDB, Redis, Kafka
2023-07-12 20:21:52 +08:00
40b26f9a2f
Merge remote-tracking branch 'origin/main' into add-new-feature-#484
2023-07-12 19:29:12 +08:00
2cca8b8927
Merge branch 'OpenIMSDK:main' into main
2023-07-12 19:27:50 +08:00
1b5eb4a5c0
feat: add scripts ( #514 )
2023-07-12 19:21:55 +08:00
9ac47e3423
Merge remote-tracking branch 'origin/main' into add-new-feature-#484
...
# Conflicts:
# pkg/common/db/unrelation/extend_msg.go
2023-07-12 19:16:48 +08:00
568e6a8e86
Merge branch 'OpenIMSDK:main' into main
2023-07-12 19:16:04 +08:00
35b1f75036
Add retry mechanism to mongoDB, Redis, Kafka
2023-07-12 19:15:39 +08:00
de1b970046
fix: add msg transfer file ( #512 )
...
* statistics user register
* refactor: router change
* minio init
* UserRegisterCount
* push use local conn
* refactor: user pb update
* remove online push close grpc conn
* refactor: user pb update
* refactor:pb file
* msgs statistics
* msgs statistics
* revoke userID
* refactor: errcode update
* active user
* active user
* active user
* refactor: errcode update
* feat: conn update token
* active user
* active user
* feat: conn update token
* active user
* feat: conn update token
* feat: conn update token
* feat: conn update token
* add tx_oss cos
* active user
* active user
* group create
* group create
* feat: group notification show to conversation
* feat: group notification show to conversation
* group active
* user active
* sendNotificationWithName
* withname
* privateChat
* a2r call option
* grpc with detail return error
* change log error
* chain unary interceptor
* api nil slice map
* fix sync has read
* fix: text update
* fix: update add model
* set conversations update
* set privateChat
* fix: content update
* remove unuse rpc
* msgDestruct
* cron use rpc mw
* set IsMsgDestruct
* msg destruct
* msgDestruct
* s3 minio, cos, oss support
* feat: add implement of GetUsersOnlineStatus, #472 (#477 )
* s3 minio, cos, oss support
* s3 route
* remove extendMsg code
* s3 route
* remove unuse code
* s3 pb
* s3 pb
* s3 pb
* s3 presigned put
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* Update .gitignore (#482 )
* s3 debug log
* s3 debug log
* cron add log and fix cron
* add log
* cron
* s3 config
* fix kick user bug
* s3 cos
* add kick log
* s3 cos test
* s3 cos test
* s3 cos test
* kick user log
* kickuserlog
* s3 cos copy
* s3 cos copy
* s3 url
* s3 url
* s3 AccessURL
* log
* s3 InitiateMultipartUpload add ExpireTime
* feat: regenerate pb file
* feat: regenerate pb file
* Revert "feat: regenerate pb file"
This reverts commit 434f22564a993506633@qq.com >
Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com >
Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com >
Co-authored-by: withchao <48119764+withchao@users.noreply.github.com >
Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com >
2023-07-12 18:18:08 +08:00
fc71af8ce2
fix: remove import C ( #511 )
...
* statistics user register
* refactor: router change
* minio init
* UserRegisterCount
* push use local conn
* refactor: user pb update
* remove online push close grpc conn
* refactor: user pb update
* refactor:pb file
* msgs statistics
* msgs statistics
* revoke userID
* refactor: errcode update
* active user
* active user
* active user
* refactor: errcode update
* feat: conn update token
* active user
* active user
* feat: conn update token
* active user
* feat: conn update token
* feat: conn update token
* feat: conn update token
* add tx_oss cos
* active user
* active user
* group create
* group create
* feat: group notification show to conversation
* feat: group notification show to conversation
* group active
* user active
* sendNotificationWithName
* withname
* privateChat
* a2r call option
* grpc with detail return error
* change log error
* chain unary interceptor
* api nil slice map
* fix sync has read
* fix: text update
* fix: update add model
* set conversations update
* set privateChat
* fix: content update
* remove unuse rpc
* msgDestruct
* cron use rpc mw
* set IsMsgDestruct
* msg destruct
* msgDestruct
* s3 minio, cos, oss support
* feat: add implement of GetUsersOnlineStatus, #472 (#477 )
* s3 minio, cos, oss support
* s3 route
* remove extendMsg code
* s3 route
* remove unuse code
* s3 pb
* s3 pb
* s3 pb
* s3 presigned put
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* Update .gitignore (#482 )
* s3 debug log
* s3 debug log
* cron add log and fix cron
* add log
* cron
* s3 config
* fix kick user bug
* s3 cos
* add kick log
* s3 cos test
* s3 cos test
* s3 cos test
* kick user log
* kickuserlog
* s3 cos copy
* s3 cos copy
* s3 url
* s3 url
* s3 AccessURL
* log
* s3 InitiateMultipartUpload add ExpireTime
* feat: regenerate pb file
* feat: regenerate pb file
* Revert "feat: regenerate pb file"
This reverts commit 434f22564a993506633@qq.com >
Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com >
Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com >
Co-authored-by: withchao <48119764+withchao@users.noreply.github.com >
Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com >
2023-07-12 18:11:10 +08:00
c7c9f170ad
fix: remove some structs ( #509 )
...
* statistics user register
* refactor: router change
* minio init
* UserRegisterCount
* push use local conn
* refactor: user pb update
* remove online push close grpc conn
* refactor: user pb update
* refactor:pb file
* msgs statistics
* msgs statistics
* revoke userID
* refactor: errcode update
* active user
* active user
* active user
* refactor: errcode update
* feat: conn update token
* active user
* active user
* feat: conn update token
* active user
* feat: conn update token
* feat: conn update token
* feat: conn update token
* add tx_oss cos
* active user
* active user
* group create
* group create
* feat: group notification show to conversation
* feat: group notification show to conversation
* group active
* user active
* sendNotificationWithName
* withname
* privateChat
* a2r call option
* grpc with detail return error
* change log error
* chain unary interceptor
* api nil slice map
* fix sync has read
* fix: text update
* fix: update add model
* set conversations update
* set privateChat
* fix: content update
* remove unuse rpc
* msgDestruct
* cron use rpc mw
* set IsMsgDestruct
* msg destruct
* msgDestruct
* s3 minio, cos, oss support
* feat: add implement of GetUsersOnlineStatus, #472 (#477 )
* s3 minio, cos, oss support
* s3 route
* remove extendMsg code
* s3 route
* remove unuse code
* s3 pb
* s3 pb
* s3 pb
* s3 presigned put
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* Update .gitignore (#482 )
* s3 debug log
* s3 debug log
* cron add log and fix cron
* add log
* cron
* s3 config
* fix kick user bug
* s3 cos
* add kick log
* s3 cos test
* s3 cos test
* s3 cos test
* kick user log
* kickuserlog
* s3 cos copy
* s3 cos copy
* s3 url
* s3 url
* s3 AccessURL
* log
* s3 InitiateMultipartUpload add ExpireTime
* feat: regenerate pb file
* feat: regenerate pb file
* Revert "feat: regenerate pb file"
This reverts commit 434f22564a993506633@qq.com >
Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com >
Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com >
Co-authored-by: withchao <48119764+withchao@users.noreply.github.com >
Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com >
2023-07-12 17:48:06 +08:00
4d05ea1de6
Delete .idea directory ( #507 )
2023-07-12 15:55:24 +08:00
b865fb1264
fix: fix start scripts ( #501 )
...
* fix: fix start scripts
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: add openim ci
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: add bash scripts
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
---------
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
2023-07-12 15:44:06 +08:00
496d178313
Merge branch 'OpenIMSDK:main' into main
2023-07-12 15:34:47 +08:00
454bf97e3f
merge v3dev into main ( #504 )
...
* statistics user register
* refactor: router change
* minio init
* UserRegisterCount
* push use local conn
* refactor: user pb update
* remove online push close grpc conn
* refactor: user pb update
* refactor:pb file
* msgs statistics
* msgs statistics
* revoke userID
* refactor: errcode update
* active user
* active user
* active user
* refactor: errcode update
* feat: conn update token
* active user
* active user
* feat: conn update token
* active user
* feat: conn update token
* feat: conn update token
* feat: conn update token
* add tx_oss cos
* active user
* active user
* group create
* group create
* feat: group notification show to conversation
* feat: group notification show to conversation
* group active
* user active
* sendNotificationWithName
* withname
* privateChat
* a2r call option
* grpc with detail return error
* change log error
* chain unary interceptor
* api nil slice map
* fix sync has read
* fix: text update
* fix: update add model
* set conversations update
* set privateChat
* fix: content update
* remove unuse rpc
* msgDestruct
* cron use rpc mw
* set IsMsgDestruct
* msg destruct
* msgDestruct
* s3 minio, cos, oss support
* feat: add implement of GetUsersOnlineStatus, #472 (#477 )
* s3 minio, cos, oss support
* s3 route
* remove extendMsg code
* s3 route
* remove unuse code
* s3 pb
* s3 pb
* s3 pb
* s3 presigned put
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* s3 presigned test
* Update .gitignore (#482 )
* s3 debug log
* s3 debug log
* cron add log and fix cron
* add log
* cron
* s3 config
* fix kick user bug
* s3 cos
* add kick log
* s3 cos test
* s3 cos test
* s3 cos test
* kick user log
* kickuserlog
* s3 cos copy
* s3 cos copy
* s3 url
* s3 url
* s3 AccessURL
* log
* s3 InitiateMultipartUpload add ExpireTime
---------
Co-authored-by: withchao <993506633@qq.com >
Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com >
Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com >
Co-authored-by: withchao <48119764+withchao@users.noreply.github.com >
Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com >
2023-07-12 15:31:24 +08:00
1fe6423593
Merge branch 'OpenIMSDK:main' into main
2023-07-12 15:28:38 +08:00
5467887e1c
For "add database retry" add test ( #500 )
...
* Add database retry
* For "add database retry" add test
* For "add database retry" add test
* For 'add database retry' add test
Signed-off-by: plutoyty <2631223275@qq.com >
* Remove .idea directory and add it to .gitignore
---------
Signed-off-by: plutoyty <2631223275@qq.com >
2023-07-12 15:23:25 +08:00
e000236eca
chore: use fmt.Errorf Sprint ( #469 )
2023-07-12 13:19:44 +08:00
3ff4103711
fix: scripts start
...
Signed-off-by: kubbot <3293172751ysy@gmail.com >
2023-07-12 13:11:31 +08:00
e649943649
fix: scripts start
...
Signed-off-by: kubbot <3293172751ysy@gmail.com >
2023-07-12 13:01:20 +08:00
3ae5375d1a
fix: scripts start
...
Signed-off-by: kubbot <3293172751ysy@gmail.com >
2023-07-12 12:58:24 +08:00
5755a43f1c
fix: scripts start
...
Signed-off-by: kubbot <3293172751ysy@gmail.com >
2023-07-12 12:45:23 +08:00
dd7e2be74a
feat: add logic to deploy images ( #497 )
...
* feat: add logic to deploy images
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: add logic to deploy images
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* fix: add ubuntu
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* fix: sync quest
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: add copyright information
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: add more cicd design
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* fix: fix sync
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: test file
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: test file
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: build multiarch
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: build multiarch
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
* feat: add start scripts
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
---------
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com >
2023-07-12 12:28:18 +08:00
‘hanzhixiao’