diff --git a/.env b/.env index 0a9b06114..4f684ad77 100644 --- a/.env +++ b/.env @@ -30,7 +30,7 @@ MINIO_ENDPOINT=http://172.28.0.1:10005 # Base URL for the application programming interface (API). # Default: API_URL=http://172.28.0.1:10002 -API_URL=http://172.28.0.1:10002 +API_URL=http://127.0.0.1:10002 # Directory path for storing data files or related information. # Default: DATA_DIR=./ diff --git a/Makefile b/Makefile index ff7878108..1d01409a5 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,11 @@ gen: demo: @$(MAKE) go.demo +## versionchecker: Check version of openim. ✨ +.PHONY: versionchecker +versionchecker: + @$(MAKE) go.versionchecker + ## build: Build binaries by default ✨ .PHONY: build build: diff --git a/README.md b/README.md index cf75e44a7..2cab2bee7 100644 --- a/README.md +++ b/README.md @@ -211,17 +211,17 @@ Read: https://github.com/openimsdk/open-im-server/blob/main/deployments/README.m -## :link: Relationship Between APP and OpenIM +## :link: OpenIM and your application -OpenIM isn't just an open-source instant messaging component, it's an integral part of your application ecosystem. Check out this diagram to understand how AppServer, AppClient, Open-IM-Server, and Open-IM-SDK interact. +OpenIM isn't just an open-source instant messaging component, it's an integral part of your application ecosystem. Check out this diagram to understand how AppServer, AppClient, OpenIMServer, and OpenIMSDK interact. -![App-OpenIM Relationship](https://github.com/openimsdk/open-im-server/blob/main/docs/images/open-im-server.png) +![App-OpenIM Relationship](./docs/images/oepnim-design.png) -## :building_construction: Overall Architecture + ## :hammer_and_wrench: To start developing OpenIM diff --git a/config/config.yaml b/config/config.yaml index d2162d4b2..43287f45e 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -353,10 +353,6 @@ callback: enable: false timeout: 5 failedContinue: true - beforeUpdateUserInfo: - enable: false - timeout: 5 - failedContinue: true beforeCreateGroup: enable: false timeout: 5 diff --git a/docs/contrib/environment.md b/docs/contrib/environment.md index d539b961b..f94d423c6 100644 --- a/docs/contrib/environment.md +++ b/docs/contrib/environment.md @@ -199,9 +199,6 @@ It's crucial to verify the configurations by checking the connectivity between y ``` - - - ## Config options ... diff --git a/docs/images/oepnim-design.png b/docs/images/oepnim-design.png new file mode 100644 index 000000000..74cb79a31 Binary files /dev/null and b/docs/images/oepnim-design.png differ diff --git a/scripts/install/openim-tools.sh b/scripts/install/openim-tools.sh index 1dacf68a8..fd95dc00d 100755 --- a/scripts/install/openim-tools.sh +++ b/scripts/install/openim-tools.sh @@ -129,7 +129,7 @@ function openim::tools::post-start() { openim::log::info "Post-start actions for OpenIM Tools..." for tool in "${OPENIM_TOOLS_POST_START_NAME_LISTARIES[@]}"; do openim::log::info "Starting ${tool}..." - # openim::tools::start_service ${tool} + openim::tools::start_service ${tool} sleep 0.2 done } diff --git a/scripts/make-rules/golang.mk b/scripts/make-rules/golang.mk index 0614bdf6f..742016cbd 100644 --- a/scripts/make-rules/golang.mk +++ b/scripts/make-rules/golang.mk @@ -17,7 +17,7 @@ # GO := go -GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20|1.21 +GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20|1.21|1.22 GO_LDFLAGS += -X $(VERSION_PACKAGE).gitVersion=$(GIT_TAG) \ -X $(VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) \ @@ -125,6 +125,10 @@ go.check-component: @echo "===========> Checking openim component" @$(ROOT_DIR)/scripts/install/openim-tools.sh openim::tools::pre-start +## go.versionchecker: Design, detect some environment variables and versions +go.versionchecker: + @$(ROOT_DIR)/scripts/install/openim-tools.sh openim::tools::post-start + ## go.build.verify: Verify that a suitable version of Go exists .PHONY: go.build.verify go.build.verify: