Commit Graph

434 Commits

Author SHA1 Message Date
honlyc 58fc7c0a80 fix: Fix the callback after reading the group message 2024-03-19 17:35:52 +08:00
withchao 27e62c9cd0 fix: getConversationInfo 2024-03-13 16:28:18 +08:00
Gordon ae3dcacd79 optimization: message remove options. 2024-03-13 12:12:08 +08:00
withchao 87d8a1dbb7 Merge remote-tracking branch 'origin/main' into localcache 2024-03-08 15:06:50 +08:00
OpenIM Bot a84162815a
cicd: bump League Patch (#2012) 2024-03-07 11:38:20 +00:00
withchao d4ed448d7d merge the latest main 2024-03-07 18:00:58 +08:00
withchao 76d8253aeb Merge branch 'main' into localcache
# Conflicts:
#	go.mod
#	go.sum
#	internal/msggateway/hub_server.go
#	internal/push/consumer_init.go
#	internal/push/offlinepush/fcm/push.go
#	internal/push/offlinepush/getui/push.go
#	internal/push/offlinepush/jpush/push.go
#	internal/push/push_handler.go
#	internal/push/push_rpc_server.go
#	internal/push/push_to_client.go
#	internal/rpc/friend/friend.go
#	internal/rpc/msg/server.go
#	internal/rpc/msg/verify.go
#	pkg/common/config/config.go
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/cache/meta_cache.go
#	pkg/common/db/cache/msg.go
#	pkg/common/db/localcache/conversation.go
#	pkg/common/db/localcache/group.go
#	pkg/rpcclient/conversation.go
#	pkg/rpcclient/group.go
2024-03-07 11:59:53 +08:00
OpenIM-Gordon 13d0883507
fix: remove unnecessary error handling to avoid sending nil resp. (#2010)
* fix: remove unnecessary error handling to avoid sending failed notifications.

* fix: remove unnecessary error handling to avoid sending nil resp.
2024-03-06 20:53:36 +08:00
Brabem 52b8efba73
fix: wrap the error of group user and thrid (#2005)
* fix: wrap the error of group user and thrid

* fix: del the chinese comment

* fix: fix the make_lint error

* fix: fix the ApiTest error
2024-03-06 16:20:07 +08:00
OpenIM Bot c7dad1a5c1
cicd: bump League Patch (#2004) 2024-03-06 07:58:05 +00:00
OpenIM-Gordon 383758782e
optimization: change the configuration file from being read globally … (#1935)
* optimization: change the configuration file from being read globally to being read independently.

* optimization: change the configuration file from being read globally to being read independently.

* optimization: change the configuration file from being read globally to being read independently.

* optimization: config file changed to dependency injection.

* fix: replace global config with dependency injection

* fix: replace global config with dependency injection

* fix: import the enough param

* fix: import the enough param

* fix: import the enough param

* fix: fix the component check of path

* fix: fix the kafka of tls is nil problem

* fix: fix the TLS.CACrt is nil error

* fix: fix the valiable shadows problem

* fix: fix the comflect

* optimization: message remove options.

* fix: fix the param pass error

* fix: find error

* fix: find error

* fix: find eror

* fix: find error

* fix: find error

* fix: del the undifined func

* fix: find error

* fix: fix the error

* fix: pass config

* fix: find error

* fix: find error

* fix: find error

* fix: find error

* fix: find error

* fix: fix the config

* fix: fix the error

* fix: fix the config pass error

* fix: fix the eror

* fix: fix the error

* fix: fix the error

* fix: fix the error

* fix: find error

* fix: fix the error

* fix: fix the config

* fix: add return err

* fix: fix the err2

* fix: err

* fix: fix the func

* fix: del the chinese comment

* fix: fix the func

* fix: fix the gateway_test logic

* fix: s3

* test

* test

* fix: not found

---------

Co-authored-by: luhaoling <2198702716@qq.com>
Co-authored-by: withchao <993506633@qq.com>
2024-03-05 17:53:22 +08:00
OpenIM Bot e8377d9c2c
cicd: bump League Patch (#1998) 2024-03-05 02:51:55 +00:00
Xinwei Xiong 33a61f29f2
feat: format openim make lint code (#1997) 2024-03-04 13:32:07 +00:00
longyuqing112 88bcabee1c
feat: optimize openim make lint style format (#1995)
* feat: add openim make lint

* feat: add openim make lint

* feat: add openim make lint

* feat: add openim make lint

* feat: add openim make lint
2024-03-04 10:20:25 +00:00
Xinwei Xiong 02a3cfb021
feat: Introduce Language-Specific Comment Detection Tool and Standardize Log Filename Convention (#1992)
* feat: optimize openim reset code

* feat: optimize openim reset code

* feat: optimize openim reset code

* feat: optimize openim reset code

* feat: optimize openim reset code

* feat: optimize openim reset code

* feat: optimize openim reset code

* feat: optimize openim reset code
2024-03-04 09:30:17 +00:00
Xinwei Xiong 853ac47e42
feat: Integrate Comprehensive E2E Testing for GoChat (#1906)
* feat: create e2e test readme

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* feat: fix markdown file

* feat: add openim make lint

* feat: add git chglog pull request

* feat: add git chglog pull request

* fix: fix openim api err code

* fix: fix openim api err code

* fix: fix openim api err code

* feat: Improve CICD

* feat: Combining GitHub and Google Workspace for Effective Project Management'

* feat: fix openim tools error code

* feat: fix openim tools error code

* feat: add openim error handle

* feat: add openim error handle

* feat: optimize tim white prom code return err

* feat: fix openim tools error code

* style: format openim server code style

* feat: add openim optimize commit code

* feat: add openim optimize commit code

* feat: add openim auto format code

* feat: add openim auto format code

* feat: add openim auto format code

* feat: add openim auto format code

* feat: add openim auto format code

* feat: format openim code

* feat: Some of the notes were translated

* feat: Some of the notes were translated

* feat: update openim server code

* feat: optimize openim reset code

* feat: optimize openim reset code

---------

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
2024-03-04 04:12:14 +00:00
xuan 1ef26b29a7
back err_name (#1976)
Signed-off-by: xuan <146319162+wxuanF@users.noreply.github.com>
2024-03-04 03:18:38 +00:00
OpenIM Bot 1e7a301d09
cicd: bump League Patch (#1969) 2024-03-02 02:41:20 +00:00
xuan bcc6a95633
Fix lint errors in modified code (#1966)
* makelint /internal 0228

Signed-off-by: xuan <146319162+wxuanF@users.noreply.github.com>

* Update server.go

---------

Signed-off-by: xuan <146319162+wxuanF@users.noreply.github.com>
2024-02-29 03:52:41 +00:00
OpenIM Bot 613bacb789
cicd: bump League Patch (#1963) 2024-02-28 03:01:30 +00:00
Brabem ac8775827d
fix: reconstruct the script of 'make start' 'make stop' and 'make check' (#1953)
* fix: del the error world

* fix: refactoring scripts

* fix: del nounset

* rm set error

* rm set error

* replace openim::log::info

* replace openim::log::info

* replace openim::log::info

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* fix: fix the error output format

* log

* fix: fix the error

* log

* log

* fix: fi the code error

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* log

* fix: use printf replace the echo

---------

Co-authored-by: skiffer-git <44203734@qq.com>
2024-02-27 09:58:54 +00:00
OpenIM-Gordon 8e6c1d74c7
fix: change consumer group receive messages avoid kafka consumer group always rebalanced. (#1942) 2024-02-27 08:44:51 +00:00
xuan b13f2614b8
makelint internal/ (#1951)
Signed-off-by: xuan <146319162+wxuanF@users.noreply.github.com>
2024-02-25 14:23:29 +00:00
OpenIM Bot 3c738c3b28
cicd: bump League Patch (#1937) 2024-02-21 03:30:48 +00:00
chao d5d2803e76
feat: optimize server code (#1931)
* fix: GroupApplicationAcceptedNotification

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* utils.Wrap -> errs.Wrap

* utils.Wrap -> errs.Wrap

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>
2024-02-20 12:56:29 +00:00
OpenIM Bot 35ad4a9510
cicd: bump League Patch (#1921) 2024-02-19 02:19:32 +00:00
Brabem c754ec6e97
fix: refactoring code of graceful exits (#1885)
* fix: plant a layer

* fix: print chanal

* fix: print sigs

* fix: print the sigs

* fix: reconstruct exit gracefully

* fix: fix the timeout

* fix: fix the netDone

* fix: fix the process exit

* fix: refactor the elegant startup code

* fix: fix the Signal.Notify

* fix: fix the code

* fix: remove not used header import.

* Update init.go

* fix: fix the InitConfig error

* fix: fix branch name

* fix: fix the signal value

* fix: replace the signal with SIGTERM

* fix: fix the script

* fix: fix the unsolve error

* fix: return the SIGTERM received,shutting down

* fix: fix the tranfer exit error

* fix: fix the error

* fix: replace the SIGnal

* fix: del the error return in tranfer

* fix: fix SIGTERM error

* fix: del the unreachalbe code

* fix: fix the make stop print  error

---------

Co-authored-by: OpenIM-Gordon <46924906+FGadvancer@users.noreply.github.com>
Co-authored-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
2024-02-18 12:16:47 +00:00
Brabem 6186d657e2
feat: add docker-compse-1.yml and cancel the openim-admin annotate in docker-compose.yml (#1881)
* fix: del the manager config and manger init statement

* fix: fix the Manger judge condition

* fix: fix revokeMsg error

* fix: find erors

* fix: find error

* fix: fix the AdminAccount error

* fix: del the debug statement

* fix: fix the component check func

* fix: fix the get zkAddress error

* fix: fix the kafka client close error

* fix: add env in minio connected

* fix: del the minio env

* fix: fix the go.mod tools version

* fix: del get env in minio  conneted

* feat: add GetUserToken api and add ex field in GetSortedConversationList resp

* fix: fix the go.mod version

* fix: add lack method

* fix: add a method

* fix: add lack implement

* fix: fix the tools pkg version

* fix: del the unuser pkg

* fix: add Limiting judgement of get admin token

* feat: add a yml of docker-compose-1.yml

* fix: add the lack content in docker-compose-1.yml

* fix: add the tips in docker-compose.yml

---------

Co-authored-by: OpenIM-Gordon <46924906+FGadvancer@users.noreply.github.com>
2024-02-18 10:42:56 +00:00
OpenIM Bot 5cb69b8742
cicd: bump League Patch (#1892) 2024-02-06 07:51:25 +00:00
OpenIM Bot 6c7b94f03f
[Auto PR 🤖] Bump League Patch auto PR (#1884)
* cicd: bump League Patch

* Update project-progress.yml

---------

Co-authored-by: Xinwei Xiong <3293172751NSS@gmail.com>
2024-02-05 09:45:45 +00:00
fengyun.rui 31381935f1
fix: graceful exit for kafka consumer of msgtransfer (#1483)
* fix: graceful exit for kafka consumer of msgtransfer

Signed-off-by: rfyiamcool <rfyiamcool@163.com>

* Update init.go

* Update init.go

---------

Signed-off-by: rfyiamcool <rfyiamcool@163.com>
Co-authored-by: OpenIM-Gordon <46924906+FGadvancer@users.noreply.github.com>
2024-02-05 02:37:53 +00:00
Brabem ee24515761
feat: add getUserToken api and add ex field in getSortedConversationListResp (#1880)
* fix: del the manager config and manger init statement

* fix: fix the Manger judge condition

* fix: fix revokeMsg error

* fix: find erors

* fix: find error

* fix: fix the AdminAccount error

* fix: del the debug statement

* fix: fix the component check func

* fix: fix the get zkAddress error

* fix: fix the kafka client close error

* fix: add env in minio connected

* fix: del the minio env

* fix: fix the go.mod tools version

* fix: del get env in minio  conneted

* feat: add GetUserToken api and add ex field in GetSortedConversationList resp

* fix: fix the go.mod version

* fix: add lack method

* fix: add a method

* fix: add lack implement

* fix: fix the tools pkg version

* fix: del the unuser pkg

* fix: add Limiting judgement of get admin token
2024-02-04 12:13:17 +00:00
OpenIM Bot 8729f90d02
cicd: bump League Patch (#1874) 2024-02-04 02:40:26 +00:00
OpenIM-Gordon c55e03dc70
fix: process add errors wrap. (#1862)
* fix: process add errors wrap.

* fix: process add errors wrap.
2024-02-02 02:11:13 +00:00
withchao 90370557e3 merge 2024-01-31 16:43:41 +08:00
withchao d89c17bcf0 Merge branch 'main' into localcache
# Conflicts:
#	internal/push/push_to_client.go
2024-01-31 16:43:15 +08:00
Brabem 32cd79044b
feat: del the manager configure and it's initializestatement (#1830)
* fix: del the manager config and manger init statement

* fix: fix the Manger judge condition

* fix: fix revokeMsg error

* fix: find erors

* fix: find error

* fix: fix the AdminAccount error

* fix: del the debug statement
2024-01-29 11:57:37 +00:00
withchao 31f28a54ab feat: conversation FindRecvMsgNotNotifyUserIDs 2024-01-28 17:29:46 +08:00
withchao 86737c9004 Merge branch 'main' into localcache
# Conflicts:
#	go.mod
#	go.sum
#	internal/push/push_to_client.go
2024-01-28 16:43:09 +08:00
a3d21 b14c0475d2
fix duplicated offline push (#1816) 2024-01-27 02:52:13 +00:00
OpenIM Bot 19ffde3196
cicd: bump League Patch (#1825) 2024-01-26 16:49:37 +00:00
withchao 24a0479761 merge 2024-01-26 15:21:28 +08:00
withchao b2ca1366f8 Merge branch 'main' into localcache
# Conflicts:
#	go.mod
#	go.sum
#	internal/push/push_to_client.go
2024-01-26 15:21:06 +08:00
AndrewZuo01 05e66e9f8d
Feature: add direct connect mode with zookeeper, etcd, and k8s (#1775)
* fix: fix the bug

* fix: fix the imAdmin permission and searchNoficitaion resp

* 2023 Annual Summary Reflections and Aspirations

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* fix: dissmissGroup and lack of keyword bug (#1678)

* Update docker-start-all.sh

* Update env-template.yaml

* Update docker-start-all.sh

* fix openim config mongo passwd env

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* fix: fix some bug

* fix: group messages sync failed.

* fix: fix the valiable name

* fix: fix the getSortedConversation api

* fix: fix the mongo search error

* fix: GroupApplicationAcceptedNotification

(cherry picked from commit 4c3c4555a3)

* fix: GroupApplicationAcceptedNotification

* fix update friends

* fix pageFindUser

* Delete .devcontainer directory

* fix find user

* Your commit message here

* feat: direct conn

* fix: direct conn message gateway array exceed length

* fix: direct conn message gateway array exceed length

* fix: direct conn cannot find name

* fix: direct conn cannot find name

* fix: direct conn cannot find name

* fix: direct conn cannot find name

* fix: direct conn cannot find name

* fix: direct conn cannot find name

* fix: direct conn cannot find name

* fix: direct conn cannot find name

* fix: direct conn cannot find name

* fix: operation id invalid

* feat: multiple address

* feat: multiple address

* feat: multiple address

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: multiple addresses

* feat: direct conn with multiple ports

* Update user.go

* feat: direct conn with multiple ports

* feat: remove checkServiceHealth

* feat: update fmt error

* feat: update .devcontainer

* feat: update .devcontainer

* feat: update fmt.Errorf(

---------

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
Co-authored-by: luhaoling <2198702716@qq.com>
Co-authored-by: Xinwei Xiong <3293172751@qq.com>
Co-authored-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
Co-authored-by: Brabem <69128477+luhaoling@users.noreply.github.com>
Co-authored-by: OpenIM Bot <124379614+kubbot@users.noreply.github.com>
Co-authored-by: OpenIM Robot <139873238+openimbot@users.noreply.github.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
Co-authored-by: withchao <993506633@qq.com>
2024-01-26 06:39:53 +00:00
Xinwei Xiong d356f7a035
feat(main): 🚀 Database Name Correction and S3 Module Int32 Overflow Fix with Go Routine Integration for Automated Checks and Script Optimization (#1799)
* feat: replace mongo database openIM_v3 to openim_v3

* openim-building-an-efficient-version-control-and-testing-workflow

* feat: complete openim source deployment rpc start timeout

* feat: optimize config

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* feat: add scripts format

* feat: use scripts format code

* fix cos and minio etc to typecheck

* feat: scripts make verify check ci

* fix: make file verify spelling

* fix: make file verify spelling

* Concurrent Type Checking and Cross-Platform Development in Go

* feat: add copyright make lint and format

* feat: add config examples file

Signed-off-by: Xinwei Xiong <3293172751@qq.com>

* feat: add config examples file

Signed-off-by: Xinwei Xiong <3293172751@qq.com>

---------

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
Signed-off-by: Xinwei Xiong <3293172751@qq.com>
2024-01-26 02:02:53 +00:00
Gordon 9d313cb308 Merge remote-tracking branch 'origin/localcache' into localcache 2024-01-23 16:18:27 +08:00
Gordon 38e11dc678 fix: refactor project dir avoid import cycle. 2024-01-23 16:18:00 +08:00
withchao b940bcaafe merge 2024-01-23 16:03:22 +08:00
withchao efa74a95a7 Merge branch 'main' into localcache
# Conflicts:
#	go.mod
#	go.sum
#	internal/push/push_rpc_server.go
#	internal/push/push_to_client.go
2024-01-23 16:02:53 +08:00
withchao 4266fed44f cicd: robot automated Change 2024-01-22 03:13:27 +00:00