From 049ae6eb803e1d61a488845b6b2f92380fc00b31 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Fri, 7 Jul 2023 21:27:07 +0800 Subject: [PATCH] feat: add chmod Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .gitignore | 4 +- cmd/openim-crontask/Makefile | 2 +- cmd/openim-crontask/deploy.Dockerfile | 4 +- cmd/openim-msggateway/Makefile | 2 +- cmd/openim-msggateway/deploy.Dockerfile | 4 +- cmd/openim-msgtransfer/Makefile | 2 +- cmd/openim-msgtransfer/deploy.Dockerfile | 4 +- cmd/openim-rpc/openim-rpc-auth/Makefile | 2 +- .../openim-rpc-auth/deploy.Dockerfile | 4 +- .../openim-rpc-conversation/Makefile | 2 +- .../openim-rpc-conversation/deploy.Dockerfile | 4 +- cmd/openim-rpc/openim-rpc-friend/Makefile | 2 +- .../openim-rpc-friend/deploy.Dockerfile | 4 +- cmd/openim-rpc/openim-rpc-group/Makefile | 2 +- .../openim-rpc-group/deploy.Dockerfile | 4 +- cmd/openim-rpc/openim-rpc-msg/Makefile | 2 +- .../openim-rpc-msg/deploy.Dockerfile | 4 +- cmd/openim-rpc/openim-rpc-third/Makefile | 2 +- .../openim-rpc-third/deploy.Dockerfile | 4 +- cmd/openim-rpc/openim-rpc-user/Makefile | 2 +- .../openim-rpc-user/deploy.Dockerfile | 4 +- docs/.generated_docs | 14 +++--- scripts/batch_build_all_service.sh | 18 ++++--- scripts/batch_start_all.sh | 33 ++++++++----- scripts/build_images.sh | 25 ---------- scripts/check_all.sh | 2 +- scripts/make-rules/golang.mk | 12 ++--- scripts/msg_gateway_start.sh | 14 +++--- scripts/msg_transfer_start.sh | 30 +++++++----- scripts/path_info.cfg | 47 ++++++++++--------- scripts/start_all.sh | 7 ++- scripts/start_cron.sh | 8 ++-- scripts/start_rpc_service.sh | 26 ++++++---- scripts/style_info.cfg | 0 34 files changed, 156 insertions(+), 144 deletions(-) delete mode 100755 scripts/build_images.sh mode change 100644 => 100755 scripts/path_info.cfg mode change 100644 => 100755 scripts/style_info.cfg diff --git a/.gitignore b/.gitignore index 7ca2fe3fd..a547540a7 100644 --- a/.gitignore +++ b/.gitignore @@ -32,8 +32,8 @@ _output/ ### OpenIM deploy ### deploy/openim_demo deploy/openim-api -deploy/openim_msg_gateway -deploy/openim_msg_transfer +deploy/openim-rpc-msg_gateway +deploy/openim-rpc-msg_transfer deploy/openim-push deploy/openim_timer_task deploy/openim-rpc-user diff --git a/cmd/openim-crontask/Makefile b/cmd/openim-crontask/Makefile index 1f09bf396..58528ccb5 100644 --- a/cmd/openim-crontask/Makefile +++ b/cmd/openim-crontask/Makefile @@ -1,6 +1,6 @@ .PHONY: all build run gotool install clean help -NAME=openim_cron_task +NAME=openim-crontask BIN_DIR=../../bin/ OS:= $(or $(os),linux) diff --git a/cmd/openim-crontask/deploy.Dockerfile b/cmd/openim-crontask/deploy.Dockerfile index 07d328474..ba5230c42 100644 --- a/cmd/openim-crontask/deploy.Dockerfile +++ b/cmd/openim-crontask/deploy.Dockerfile @@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -COPY ./openim_cron_task ./ +COPY ./openim-crontask ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["./openim_cron_task"] +CMD ["./openim-crontask"] diff --git a/cmd/openim-msggateway/Makefile b/cmd/openim-msggateway/Makefile index 07cad40a9..d5238beae 100644 --- a/cmd/openim-msggateway/Makefile +++ b/cmd/openim-msggateway/Makefile @@ -1,6 +1,6 @@ .PHONY: all build run gotool install clean help -NAME=openim_msg_gateway +NAME=openim-rpc-msg_gateway BIN_DIR=../../bin/ OS:= $(or $(os),linux) diff --git a/cmd/openim-msggateway/deploy.Dockerfile b/cmd/openim-msggateway/deploy.Dockerfile index eab3d16db..7ba0d2235 100644 --- a/cmd/openim-msggateway/deploy.Dockerfile +++ b/cmd/openim-msggateway/deploy.Dockerfile @@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -COPY ./openim_msg_gateway ./ +COPY ./openim-rpc-msg_gateway ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["./openim_msg_gateway","--port", "10140" "--ws_port", "10001", "--prometheus_port", "20240"] +CMD ["./openim-rpc-msg_gateway","--port", "10140" "--ws_port", "10001", "--prometheus_port", "20240"] diff --git a/cmd/openim-msgtransfer/Makefile b/cmd/openim-msgtransfer/Makefile index dc22834de..9d4aa7dec 100644 --- a/cmd/openim-msgtransfer/Makefile +++ b/cmd/openim-msgtransfer/Makefile @@ -1,6 +1,6 @@ .PHONY: all build run gotool install clean help -NAME=openim_msg_transfer +NAME=openim-rpc-msg_transfer BIN_DIR=../../bin/ OS:= $(or $(os),linux) diff --git a/cmd/openim-msgtransfer/deploy.Dockerfile b/cmd/openim-msgtransfer/deploy.Dockerfile index 91767adf4..747b7f422 100644 --- a/cmd/openim-msgtransfer/deploy.Dockerfile +++ b/cmd/openim-msgtransfer/deploy.Dockerfile @@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -COPY ./openim_msg_transfer ./ +COPY ./openim-rpc-msg_transfer ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["./openim_msg_transfer","--prometheus_port", "21400"] +CMD ["./openim-rpc-msg_transfer","--prometheus_port", "21400"] diff --git a/cmd/openim-rpc/openim-rpc-auth/Makefile b/cmd/openim-rpc/openim-rpc-auth/Makefile index f702786ae..068d50fd8 100644 --- a/cmd/openim-rpc/openim-rpc-auth/Makefile +++ b/cmd/openim-rpc/openim-rpc-auth/Makefile @@ -1,6 +1,6 @@ .PHONY: all build run gotool install clean help -NAME=openim_auth +NAME=openim-rpc-auth BIN_DIR=../../../bin/ OS:= $(or $(os),linux) diff --git a/cmd/openim-rpc/openim-rpc-auth/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-auth/deploy.Dockerfile index 1fc1682dd..b529860f9 100644 --- a/cmd/openim-rpc/openim-rpc-auth/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-auth/deploy.Dockerfile @@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -COPY ./openim_auth ./ +COPY ./openim-rpc-auth ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["./openim_auth", "--port", "10160"] +CMD ["./openim-rpc-auth", "--port", "10160"] diff --git a/cmd/openim-rpc/openim-rpc-conversation/Makefile b/cmd/openim-rpc/openim-rpc-conversation/Makefile index fa973060e..4c9726011 100644 --- a/cmd/openim-rpc/openim-rpc-conversation/Makefile +++ b/cmd/openim-rpc/openim-rpc-conversation/Makefile @@ -1,6 +1,6 @@ .PHONY: all build run gotool install clean help -NAME=openim_conversation +NAME=openim-rpc-conversation BIN_DIR=../../../bin/ OS:= $(or $(os),linux) diff --git a/cmd/openim-rpc/openim-rpc-conversation/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-conversation/deploy.Dockerfile index 5aab79104..33e5c93c1 100644 --- a/cmd/openim-rpc/openim-rpc-conversation/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-conversation/deploy.Dockerfile @@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -COPY ./openim_conversation ./ +COPY ./openim-rpc-conversation ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["./openim_conversation", "--port", "10230", "--prometheus_port","20230"] +CMD ["./openim-rpc-conversation", "--port", "10230", "--prometheus_port","20230"] diff --git a/cmd/openim-rpc/openim-rpc-friend/Makefile b/cmd/openim-rpc/openim-rpc-friend/Makefile index 8cbb39c2b..e0068e97d 100644 --- a/cmd/openim-rpc/openim-rpc-friend/Makefile +++ b/cmd/openim-rpc/openim-rpc-friend/Makefile @@ -1,6 +1,6 @@ .PHONY: all build run gotool install clean help -NAME=openim_friend +NAME=openim-rpc-friend BIN_DIR=../../../bin/ OS:= $(or $(os),linux) diff --git a/cmd/openim-rpc/openim-rpc-friend/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-friend/deploy.Dockerfile index 3aaf86885..f306a7938 100644 --- a/cmd/openim-rpc/openim-rpc-friend/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-friend/deploy.Dockerfile @@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -COPY ./openim_friend ./ +COPY ./openim-rpc-friend ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["./openim_friend", "--port", "10120", "--prometheus_port","20120"] +CMD ["./openim-rpc-friend", "--port", "10120", "--prometheus_port","20120"] diff --git a/cmd/openim-rpc/openim-rpc-group/Makefile b/cmd/openim-rpc/openim-rpc-group/Makefile index b33dbb259..8ba79043d 100644 --- a/cmd/openim-rpc/openim-rpc-group/Makefile +++ b/cmd/openim-rpc/openim-rpc-group/Makefile @@ -1,6 +1,6 @@ .PHONY: all build run gotool install clean help -NAME=openim_group +NAME=openim-rpc-group BIN_DIR=../../../bin/ OS:= $(or $(os),linux) diff --git a/cmd/openim-rpc/openim-rpc-group/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-group/deploy.Dockerfile index 1adb00bc5..ed46edcf7 100644 --- a/cmd/openim-rpc/openim-rpc-group/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-group/deploy.Dockerfile @@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -COPY ./openim_group ./ +COPY ./openim-rpc-group ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["./openim_group", "--port", "10150", "--prometheus_port","20150"] +CMD ["./openim-rpc-group", "--port", "10150", "--prometheus_port","20150"] diff --git a/cmd/openim-rpc/openim-rpc-msg/Makefile b/cmd/openim-rpc/openim-rpc-msg/Makefile index b27c5c420..872fbfbba 100644 --- a/cmd/openim-rpc/openim-rpc-msg/Makefile +++ b/cmd/openim-rpc/openim-rpc-msg/Makefile @@ -1,6 +1,6 @@ .PHONY: all build run gotool install clean help -NAME=openim_msg +NAME=openim-rpc-msg BIN_DIR=../../../bin/ OS:= $(or $(os),linux) diff --git a/cmd/openim-rpc/openim-rpc-msg/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-msg/deploy.Dockerfile index 10fd29f0a..61737417e 100644 --- a/cmd/openim-rpc/openim-rpc-msg/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-msg/deploy.Dockerfile @@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -COPY ./openim_msg ./ +COPY ./openim-rpc-msg ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["./openim_msg", "--port", "10130", "--prometheus_port","20130"] +CMD ["./openim-rpc-msg", "--port", "10130", "--prometheus_port","20130"] diff --git a/cmd/openim-rpc/openim-rpc-third/Makefile b/cmd/openim-rpc/openim-rpc-third/Makefile index b5a7c546a..28059b2c4 100644 --- a/cmd/openim-rpc/openim-rpc-third/Makefile +++ b/cmd/openim-rpc/openim-rpc-third/Makefile @@ -1,6 +1,6 @@ .PHONY: all build run gotool install clean help -NAME=openim_third +NAME=openim-rpc-third BIN_DIR=../../../bin/ OS:= $(or $(os),linux) diff --git a/cmd/openim-rpc/openim-rpc-third/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-third/deploy.Dockerfile index 7b6a1dfaf..29bc2d068 100644 --- a/cmd/openim-rpc/openim-rpc-third/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-third/deploy.Dockerfile @@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -COPY ./openim_third ./ +COPY ./openim-rpc-third ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["./openim_third", "--port", "10200"] +CMD ["./openim-rpc-third", "--port", "10200"] diff --git a/cmd/openim-rpc/openim-rpc-user/Makefile b/cmd/openim-rpc/openim-rpc-user/Makefile index aef2d605a..1a7eed913 100644 --- a/cmd/openim-rpc/openim-rpc-user/Makefile +++ b/cmd/openim-rpc/openim-rpc-user/Makefile @@ -1,6 +1,6 @@ .PHONY: all build run gotool install clean help -NAME=openim_user +NAME=openim-rpc-user BIN_DIR=../../../bin/ OS:= $(or $(os),linux) diff --git a/cmd/openim-rpc/openim-rpc-user/deploy.Dockerfile b/cmd/openim-rpc/openim-rpc-user/deploy.Dockerfile index 0977dd634..8ab7df1e7 100644 --- a/cmd/openim-rpc/openim-rpc-user/deploy.Dockerfile +++ b/cmd/openim-rpc/openim-rpc-user/deploy.Dockerfile @@ -25,8 +25,8 @@ RUN apt-get install -y vim curl tzdata gawk RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && dpkg-reconfigure -f noninteractive tzdata RUN apt-get -qq update \ && apt-get -qq install -y --no-install-recommends ca-certificates curl -COPY ./openim_user ./ +COPY ./openim-rpc-user ./ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config"] -CMD ["./openim_user", "--port", "10110"] +CMD ["./openim-rpc-user", "--port", "10110"] diff --git a/docs/.generated_docs b/docs/.generated_docs index d46d40d88..4145ed52c 100644 --- a/docs/.generated_docs +++ b/docs/.generated_docs @@ -26,12 +26,12 @@ docs/guide/en-US/cmd/openim/openim_secret_get.md docs/guide/en-US/cmd/openim/openim_secret_list.md docs/guide/en-US/cmd/openim/openim_secret_update.md docs/guide/en-US/cmd/openim/openim_set.md -docs/guide/en-US/cmd/openim/openim_user.md -docs/guide/en-US/cmd/openim/openim_user_create.md -docs/guide/en-US/cmd/openim/openim_user_delete.md -docs/guide/en-US/cmd/openim/openim_user_get.md -docs/guide/en-US/cmd/openim/openim_user_list.md -docs/guide/en-US/cmd/openim/openim_user_update.md +docs/guide/en-US/cmd/openim/openim-rpc-user.md +docs/guide/en-US/cmd/openim/openim-rpc-user_create.md +docs/guide/en-US/cmd/openim/openim-rpc-user_delete.md +docs/guide/en-US/cmd/openim/openim-rpc-user_get.md +docs/guide/en-US/cmd/openim/openim-rpc-user_list.md +docs/guide/en-US/cmd/openim/openim-rpc-user_update.md docs/guide/en-US/cmd/openim/openim_validate.md docs/guide/en-US/cmd/openim/openim_version.md docs/guide/en-US/yaml/openim/openim.yaml @@ -44,7 +44,7 @@ docs/guide/en-US/yaml/openim/openim_options.yaml docs/guide/en-US/yaml/openim/openim_policy.yaml docs/guide/en-US/yaml/openim/openim_secret.yaml docs/guide/en-US/yaml/openim/openim_set.yaml -docs/guide/en-US/yaml/openim/openim_user.yaml +docs/guide/en-US/yaml/openim/openim-rpc-user.yaml docs/guide/en-US/yaml/openim/openim_validate.yaml docs/guide/en-US/yaml/openim/openim_version.yaml docs/man/man1/iam-apiserver.1 diff --git a/scripts/batch_build_all_service.sh b/scripts/batch_build_all_service.sh index 6c74e1957..79cbb6c64 100755 --- a/scripts/batch_build_all_service.sh +++ b/scripts/batch_build_all_service.sh @@ -13,14 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. +#Include shell font styles and some basic information +OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. -source ./style_info.cfg -source ./path_info.cfg -source ./function.sh +# Include necessary files +source "$(dirname "${BASH_SOURCE[0]}")/../scripts/function" + +# Include specific functions and variables +source "$(dirname "${BASH_SOURCE[0]}")/../scripts/style_info.cfg" \ + "$OPENIM_ROOT/scripts/path_info.cfg" + +bin_dir="$OPENIM_ROOT/bin" +logs_dir="$OPENIM_ROOT/logs" +sdk_db_dir="$OPENIM_ROOT/sdk/db/" -bin_dir="../bin" -logs_dir="../logs" -sdk_db_dir="../db/sdk/" #Automatically created when there is no bin, logs folder if [ ! -d $bin_dir ]; then mkdir -p $bin_dir diff --git a/scripts/batch_start_all.sh b/scripts/batch_start_all.sh index 119e85f65..aa7713280 100755 --- a/scripts/batch_start_all.sh +++ b/scripts/batch_start_all.sh @@ -16,21 +16,28 @@ #fixme This scripts is the total startup scripts #fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array -#fixme Put the shell scripts name here +OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. + +cd "$OPENIM_ROOT/scripts/" + need_to_start_server_shell=( - start_rpc_service.sh - msg_gateway_start.sh - push_start.sh - msg_transfer_start.sh + "start_rpc_service.sh" + "msg_gateway_start.sh" + "push_start.sh" + "msg_transfer_start.sh" ) -time=`date +"%Y-%m-%d %H:%M:%S"` -echo "==========================================================">>../logs/openIM.log 2>&1 & -echo "==========================================================">>../logs/openIM.log 2>&1 & -echo "==========================================================">>../logs/openIM.log 2>&1 & -echo "==========server start time:${time}===========">>../logs/openIM.log 2>&1 & -echo "==========================================================">>../logs/openIM.log 2>&1 & -echo "==========================================================">>../logs/openIM.log 2>&1 & -echo "==========================================================">>../logs/openIM.log 2>&1 & + +time=$(date +"%Y-%m-%d %H:%M:%S") + +for _ in {1..3}; do + echo "==========================================================" >> ../logs/openIM.log 2>&1 +done + +echo "==========server start time:${time}===========" >> ../logs/openIM.log 2>&1 + +for _ in {1..3}; do + echo "==========================================================" >> ../logs/openIM.log 2>&1 +done build_pid_array=() idx=0 diff --git a/scripts/build_images.sh b/scripts/build_images.sh deleted file mode 100755 index a94bc91d6..000000000 --- a/scripts/build_images.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -# Copyright © 2023 OpenIM. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -image=openim/openim_server:v1.0.5 -rm Open-IM-Server -rf -git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive -cd Open-IM-Server -git checkout tuoyun -cd cmd/Open-IM-SDK-Core/ -git checkout tuoyun -cd ../../ -docker build -t $image . -f deploy.Dockerfile -docker push $image \ No newline at end of file diff --git a/scripts/check_all.sh b/scripts/check_all.sh index 65f51c0cf..0bcb782dd 100755 --- a/scripts/check_all.sh +++ b/scripts/check_all.sh @@ -47,7 +47,7 @@ for i in ${service_port_name[*]}; do done #Check launched service process -check=$(ps aux | grep -w ./${msg_transfer_name} | grep -v grep | wc -l) +check=$(ps aux | grep -w ./${openim-msgtransfer} | grep -v grep | wc -l) if [ $check -eq ${msg_transfer_service_num} ]; then echo -e ${GREEN_PREFIX}"none port has been listening,belongs service is openImMsgTransfer"${COLOR_SUFFIX} else diff --git a/scripts/make-rules/golang.mk b/scripts/make-rules/golang.mk index 9602dbbbd..1b6c92ed3 100644 --- a/scripts/make-rules/golang.mk +++ b/scripts/make-rules/golang.mk @@ -73,10 +73,10 @@ EXCLUDE_TESTS=github.com/OpenIMSDK/Open-IM-Server/test github.com/OpenIMSDK/Open # ├── openim-sdk-core/ - main.go # ├── openim-api # ├── openim_cms_api -# ├── openim_cron_task +# ├── openim-crontask # ├── openim_demo -# ├── openim_msg_gateway -# ├── openim_msg_transfer +# ├── openim-rpc-msg_gateway +# ├── openim-rpc-msg_transfer # ├── openim-push # ├── rpc/openim_admin_cms/ - main.go # └── test/ - main.go @@ -84,7 +84,7 @@ EXCLUDE_TESTS=github.com/OpenIMSDK/Open-IM-Server/test github.com/OpenIMSDK/Open # PLATFORM=linux_amd64 # OS=linux # ARCH=amd64 -# BINS=openim-api openim_cms_api openim_cron_task openim_demo openim_msg_gateway openim_msg_transfer openim-push +# BINS=openim-api openim_cms_api openim-crontask openim_demo openim-rpc-msg_gateway openim-rpc-msg_transfer openim-push # BIN_DIR=/root/workspaces/OpenIM/_output/bin # ============================================================================== @@ -113,8 +113,8 @@ go.build.%: @mkdir -p $(BIN_DIR)/platforms/$(OS)/$(ARCH) @if [ "$(COMMAND)" == "openim-sdk-core" ]; then \ echo "===========> DEBUG: Compilation is not yet supported $(COMMAND)"; \ - elif [ "$(COMMAND)" == "openim_rpc" ]; then \ - for d in $(wildcard $(ROOT_DIR)/cmd/openim_rpc/*); do \ + elif [ "$(COMMAND)" == "openim-rpc" ]; then \ + for d in $(wildcard $(ROOT_DIR)/cmd/openim-rpc/*); do \ cd $${d} && CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) $(GO) build $(GO_BUILD_FLAGS) -o \ $(BIN_DIR)/platforms/$(OS)/$(ARCH)/$$(basename $${d})$(GO_OUT_EXT) $${d}/main.go; \ done; \ diff --git a/scripts/msg_gateway_start.sh b/scripts/msg_gateway_start.sh index c7cbc4823..9f2016be7 100755 --- a/scripts/msg_gateway_start.sh +++ b/scripts/msg_gateway_start.sh @@ -36,9 +36,9 @@ if [ ${#rpc_ports[@]} -ne ${#ws_ports[@]} ]; then fi #Check if the service exists #If it is exists,kill this process -check=$(ps aux | grep -w ./${msg_gateway_name} | grep -v grep | wc -l) +check=$(ps aux | grep -w ./${openim-msggateway} | grep -v grep | wc -l) if [ $check -ge 1 ]; then - oldPid=$(ps aux | grep -w ./${msg_gateway_name} | grep -v grep | awk '{print $2}') + oldPid=$(ps aux | grep -w ./${openim-msggateway} | grep -v grep | awk '{print $2}') kill -9 ${oldPid} fi #Waiting port recycling @@ -46,23 +46,23 @@ sleep 1 cd ${msg_gateway_binary_root} for ((i = 0; i < ${#ws_ports[@]}; i++)); do echo "==========================start msg_gateway server===========================">>../logs/openIM.log - nohup ./${msg_gateway_name} --port ${rpc_ports[$i]} --ws_port ${ws_ports[$i]} --prometheus_port ${prome_ports[$i]} >>../logs/openIM.log 2>&1 & + nohup ./${openim-msggateway} --port ${rpc_ports[$i]} --ws_port ${ws_ports[$i]} --prometheus_port ${prome_ports[$i]} >>../logs/openIM.log 2>&1 & done #Check launched service process sleep 3 -check=$(ps aux | grep -w ./${msg_gateway_name} | grep -v grep | wc -l) +check=$(ps aux | grep -w ./${openim-msggateway} | grep -v grep | wc -l) allPorts="" if [ $check -ge 1 ]; then - allNewPid=$(ps aux | grep -w ./${msg_gateway_name} | grep -v grep | awk '{print $2}') + allNewPid=$(ps aux | grep -w ./${openim-msggateway} | grep -v grep | awk '{print $2}') for i in $allNewPid; do ports=$(netstat -netulp | grep -w ${i} | awk '{print $4}' | awk -F '[:]' '{print $NF}') allPorts=${allPorts}"$ports " done echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS"${COLOR_SUFFIX} - echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${YELLOW_PREFIX}${msg_gateway_name}${COLOR_SUFFIX} + echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${YELLOW_PREFIX}${openim-msggateway}${COLOR_SUFFIX} echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${YELLOW_PREFIX}${allNewPid}${COLOR_SUFFIX} echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${YELLOW_PREFIX}${allPorts}${COLOR_SUFFIX} else - echo -e ${YELLOW_PREFIX}${msg_gateway_name}${COLOR_SUFFIX}${RED_PREFIX}"SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX} + echo -e ${YELLOW_PREFIX}${openim-msggateway}${COLOR_SUFFIX}${RED_PREFIX}"SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX} fi diff --git a/scripts/msg_transfer_start.sh b/scripts/msg_transfer_start.sh index 460d2e1c8..01118af32 100755 --- a/scripts/msg_transfer_start.sh +++ b/scripts/msg_transfer_start.sh @@ -14,21 +14,29 @@ # limitations under the License. #Include shell font styles and some basic information -source ./style_info.cfg -source ./path_info.cfg -source ./function.sh +OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. + +#Include shell font styles and some basic information +source $OPENIM_ROOT/scripts/style_info.cfg +source $OPENIM_ROOT/scripts/path_info.cfg +source $OPENIM_ROOT/scripts/function + +bin_dir="$OPENIM_ROOT/bin" +logs_dir="$OPENIM_ROOT/logs" +sdk_db_dir="$OPENIM_ROOT/sdk/db/" + +cd $OPENIM_ROOT list1=$(cat $config_path | grep messageTransferPrometheusPort | awk -F '[:]' '{print $NF}') list_to_string $list1 prome_ports=($ports_array) - #Check if the service exists #If it is exists,kill this process -check=`ps aux | grep -w ./${msg_transfer_name} | grep -v grep| wc -l` +check=`ps aux | grep -w ./${openim-msgtransfer} | grep -v grep| wc -l` if [ $check -ge 1 ] then -oldPid=`ps aux | grep -w ./${msg_transfer_name} | grep -v grep|awk '{print $2}'` +oldPid=`ps aux | grep -w ./${openim-msgtransfer} | grep -v grep|awk '{print $2}'` kill -9 $oldPid fi #Waiting port recycling @@ -37,7 +45,7 @@ sleep 1 cd ${msg_transfer_binary_root} for ((i = 0; i < ${msg_transfer_service_num}; i++)); do prome_port=${prome_ports[$i]} - cmd="nohup ./${msg_transfer_name}" + cmd="nohup ./${openim-msgtransfer}" if [ $prome_port != "" ]; then cmd="$cmd --prometheus_port $prome_port" fi @@ -46,15 +54,15 @@ for ((i = 0; i < ${msg_transfer_service_num}; i++)); do done #Check launched service process -check=`ps aux | grep -w ./${msg_transfer_name} | grep -v grep| wc -l` +check=`ps aux | grep -w ./${openim-msgtransfer} | grep -v grep| wc -l` if [ $check -ge 1 ] then -newPid=`ps aux | grep -w ./${msg_transfer_name} | grep -v grep|awk '{print $2}'` +newPid=`ps aux | grep -w ./${openim-msgtransfer} | grep -v grep|awk '{print $2}'` allPorts="" echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX} - echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${YELLOW_PREFIX}${msg_transfer_name}${COLOR_SUFFIX} + echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${YELLOW_PREFIX}${openim-msgtransfer}${COLOR_SUFFIX} echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${YELLOW_PREFIX}${newPid}${COLOR_SUFFIX} echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${YELLOW_PREFIX}${allPorts}${COLOR_SUFFIX} else - echo -e ${YELLOW_PREFIX}${msg_transfer_name}${COLOR_SUFFIX}${RED_PREFIX}"SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX} + echo -e ${YELLOW_PREFIX}${openim-msgtransfer}${COLOR_SUFFIX}${RED_PREFIX}"SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX} fi diff --git a/scripts/path_info.cfg b/scripts/path_info.cfg old mode 100644 new mode 100755 index aa36164ae..72759b2a4 --- a/scripts/path_info.cfg +++ b/scripts/path_info.cfg @@ -2,6 +2,8 @@ architecture=$(uname -m) version=$(uname -s | tr '[:upper:]' '[:lower:]') +OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. + # Define the supported architectures and corresponding bin directories declare -A supported_architectures=( ["linux-amd64"]="_output/bin/platforms/linux/amd64" @@ -18,40 +20,43 @@ declare -A supported_architectures=( # Check if the architecture and version are supported if [[ -z ${supported_architectures["$version-$architecture"]} ]]; then - echo "Unsupported architecture: $architecture or version: $version" + echo "================> Unsupported architecture: $architecture or version: $version" exit 1 fi +echo "================> Architecture: $architecture" + # Set the BIN_DIR based on the architecture and version BIN_DIR=${supported_architectures["$version-$architecture"]} -echo "BIN_DIR: $BIN_DIR" +echo "================> BIN_DIR: $OPENIM_ROOT/$BIN_DIR" + # Don't put the space between "=" -msg_gateway_name="openim-msggateway" -msg_gateway_binary_root= $BIN_DIR +openim_msggateway="openim-msggateway" +msg_gateway_binary_root= $OPENIM_ROOT/$BIN_DIR/ msg_gateway_source_root="../cmd/msggateway/" -msg_name="openim_msg" -msg_binary_root=$BIN_DIR +msg_name="openim-rpc-msg" +msg_binary_root=$OPENIM_ROOT/$BIN_DIR msg_source_root="../cmd/rpc/msg/" push_name="openim-push" -push_binary_root=$BIN_DIR +push_binary_root=$OPENIM_ROOT/$BIN_DIR push_source_root="../cmd/push/" -msg_transfer_name="openim_msg_transfer" -msg_transfer_binary_root=$BIN_DIR +openim_msgtransfer="openim-rpc-msg_transfer" +msg_transfer_binary_root=$OPENIM_ROOT/$BIN_DIR msg_transfer_source_root="../cmd/msgtransfer/" msg_transfer_service_num=4 -cron_task_name="openim_cron_task" -cron_task_binary_root=$BIN_DIR +cron_task_name="openim-crontask" +cron_task_binary_root=$OPENIM_ROOT/$BIN_DIR cron_task_source_root="../cmd/crontask/" cmd_utils_name="openim_cmd_utils" -cmd_utils_binary_root=$BIN_DIR +cmd_utils_binary_root=$OPENIM_ROOT/$BIN_DIR cmd_utils_source_root="../cmd/cmduitls/" # Global configuration file default dir @@ -81,15 +86,15 @@ service_names=( # api service filename "openim-api" # rpc service filename - "openim_user" - "openim_friend" - "openim_group" - "openim_auth" - "openim_conversation" - "openim_third" - "openim_cron_task" - "${msg_gateway_name}" - "${msg_transfer_name}" + "openim-rpc-user" + "openim-rpc-friend" + "openim-rpc-group" + "openim-rpc-auth" + "openim-rpc-conversation" + "openim-rpc-third" + "openim-crontask" + "${openim_msggateway}" + "${openim_msgtransfer}" "${msg_name}" "${push_name}" # "${sdk_server_name}" diff --git a/scripts/start_all.sh b/scripts/start_all.sh index c16ae3a11..b847ef89b 100755 --- a/scripts/start_all.sh +++ b/scripts/start_all.sh @@ -20,6 +20,8 @@ source ./style_info.cfg source ./path_info.cfg +OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. + # Print title echo -e "${BOLD_PREFIX}${BLUE_PREFIX}OpenIM Server Start${COLOR_SUFFIX}" @@ -35,6 +37,7 @@ echo -e "${BOLD_PREFIX}${CYAN_PREFIX}Server Start Time: ${time}${COLOR_SUFFIX}" # Print section separator echo -e "${PURPLE_PREFIX}==========================================================${COLOR_SUFFIX}" +cd $OPENIM_ROOT/scripts # FIXME Put the shell script names here need_to_start_server_shell=( start_rpc_service.sh @@ -65,7 +68,7 @@ for i in ${need_to_start_server_shell[*]}; do done # Print section separator -echo "${PURPLE_PREFIX}==========================================================${COLOR_SUFFIX}" +echo -e "${PURPLE_PREFIX}==========================================================${COLOR_SUFFIX}" # Print completion message -echo "${GREEN_PREFIX}${BOLD_PREFIX}OpenIM Server has been started successfully!${COLOR_SUFFIX}" \ No newline at end of file +echo -e "${GREEN_PREFIX}${BOLD_PREFIX}OpenIM Server has been started successfully!${COLOR_SUFFIX}" \ No newline at end of file diff --git a/scripts/start_cron.sh b/scripts/start_cron.sh index 5aa29c1c7..efe06d8f7 100755 --- a/scripts/start_cron.sh +++ b/scripts/start_cron.sh @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. + #Include shell font styles and some basic information -source ./style_info.cfg -source ./path_info.cfg - - +source $OPENIM_ROOT/scripts/style_info.cfg +source $OPENIM_ROOT/scripts/path_info.cfg #Check if the service exists #If it is exists,kill this process diff --git a/scripts/start_rpc_service.sh b/scripts/start_rpc_service.sh index 379dba474..940bf57c6 100755 --- a/scripts/start_rpc_service.sh +++ b/scripts/start_rpc_service.sh @@ -13,23 +13,31 @@ # See the License for the specific language governing permissions and # limitations under the License. +OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. -source ./style_info.cfg -source ./path_info.cfg -source ./function.sh +#Include shell font styles and some basic information +source $OPENIM_ROOT/scripts/style_info.cfg +source $OPENIM_ROOT/scripts/path_info.cfg +source $OPENIM_ROOT/scripts/function + +bin_dir="$OPENIM_ROOT/bin" +logs_dir="$OPENIM_ROOT/logs" +sdk_db_dir="$OPENIM_ROOT/sdk/db/" + +cd $OPENIM_ROOT #service filename service_filename=( #api openim-api #rpc - openim_user - openim_friend - openim_group - openim_auth + openim-rpc-user + openim-rpc-friend + openim-rpc-group + openim-rpc-auth ${msg_name} - openim_conversation - openim_third + openim-rpc-conversation + openim-rpc-third ) #service config port name diff --git a/scripts/style_info.cfg b/scripts/style_info.cfg old mode 100644 new mode 100755