418 Commits

Author SHA1 Message Date
luhaoling
9ee003c98e fix: wrap the error 2024-03-01 18:20:40 +08:00
luhaoling
ddac6fe7c7 fix: fix the conflect 2024-03-01 14:39:49 +08:00
luhaoling
62134aa6fc fix: fix the config 2024-03-01 14:14:37 +08:00
luhaoling
5c93cb7aa3 fix: fix the eror 2024-02-29 19:31:01 +08:00
luhaoling
6c6eef8b0e fix: fix the config pass error 2024-02-29 19:24:55 +08:00
luhaoling
f182d3e98f fix: fix the error 2024-02-29 19:19:03 +08:00
luhaoling
8e1cbbd019 fix: fix the config 2024-02-29 19:15:59 +08:00
luhaoling
6d6d850822 fix: find error 2024-02-29 19:10:38 +08:00
luhaoling
7d8afb3703 fix: find error 2024-02-29 19:09:16 +08: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
luhaoling
5a1c0aca3c fix: del the undifined func 2024-02-29 10:08:28 +08:00
luhaoling
43602c53cc fix: fix the comflect 2024-02-29 10:02:16 +08:00
luhaoling
9af8546ac7 fix: find error 2024-02-29 09:56:28 +08:00
OpenIM Bot
613bacb789
cicd: bump League Patch (#1963) 2024-02-28 03:01:30 +00:00
luhaoling
8e9350cac4 fix: find error 2024-02-27 18:27:28 +08:00
luhaoling
a0b86768f4 fix: find eror 2024-02-27 18:20:39 +08:00
luhaoling
c962a501b0 fix: find error 2024-02-27 18:03:53 +08: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
luhaoling
eec66dabb7 fix: find error 2024-02-27 17:55:21 +08:00
luhaoling
d63da9b7fd fix: fix the param pass error 2024-02-27 16:57:19 +08:00
luhaoling
70c9653642 Merge branch 'code-conventions' of github.com:FGadvancer/Open-IM-Server into code-conventions 2024-02-27 16:52:25 +08:00
luhaoling
a5d7bb3ea2 fix: solve the conflect 2024-02-27 16:52:04 +08: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
Gordon
226f60de12 optimization: message remove options. 2024-02-27 15:37:52 +08:00
luhaoling
c348661764 fix: fix the comflect 2024-02-27 15:21:08 +08:00
luhaoling
bd194bf09d fix: fix the valiable shadows problem 2024-02-27 15:13:47 +08:00
luhaoling
41eceaaf7a fix: fix the comflect 2024-02-27 14:51:19 +08:00
luhaoling
459ea01200 fix: fix the TLS.CACrt is nil error 2024-02-26 18:03:25 +08:00
luhaoling
d72a8b76b6 fix: import the enough param 2024-02-26 16:52:28 +08:00
luhaoling
a70467dd96 fix: import the enough param 2024-02-26 16:51:07 +08:00
luhaoling
cd3a564477 fix: replace global config with dependency injection 2024-02-26 16:35:14 +08:00
xuan
b13f2614b8
makelint internal/ (#1951)
Signed-off-by: xuan <146319162+wxuanF@users.noreply.github.com>
2024-02-25 14:23:29 +00:00
luhaoling
c4cdf4de10 fix: replace global config with dependency injection 2024-02-23 18:30:10 +08:00
Gordon
79ee07a13f optimization: config file changed to dependency injection. 2024-02-22 21:36:43 +08:00
OpenIM Bot
3c738c3b28
cicd: bump League Patch (#1937) 2024-02-21 03:30:48 +00:00
Gordon
27e472bf89 optimization: change the configuration file from being read globally to being read independently. 2024-02-20 20:56:40 +08: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
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
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
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 4c3c4555a35ec8e31ffbf3e96a5dba3bceec09ee)

* 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