feat: add more test project

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

.env

@@ -15,5 +15,5 @@
 USER=root
 PASSWORD=openIM123
 MINIO_ENDPOINT=http://127.0.0.1:10005
-API_URL=http://127.0.0.1:10002
+API_URL=http://14.153.17.42:10002
-DATA_DIR=./
+DATA_DIR=/root/workspaces/openim/openim-server

config/config.yaml

@@ -29,8 +29,8 @@
 zookeeper:
   schema: openim
   address: [ 127.0.0.1:2181 ]
-  username:
+  username: ''
-  password:
+  password: ''
 
 ###################### Mysql ######################
 # MySQL configuration
@@ -60,7 +60,7 @@ mysql:
 # Default MongoDB database name
 # Maximum connection pool size
 mongo:
-  uri:
+  uri: ''
   address: [ 127.0.0.1:37017 ]
   database: openIM_v3
   username: root
@@ -73,7 +73,7 @@ mongo:
 # Username is required only for Redis version 6.0+
 redis:
   address: [ 127.0.0.1:16379 ]
-  username:
+  username: ''
   password: openIM123
 
 ###################### Kafka configuration information ######################
@@ -84,8 +84,8 @@ redis:
 # It's not recommended to modify this topic name
 # Consumer group ID, it's not recommended to modify
 kafka:
-  username:
+  username: ''
-  password:
+  password: ''
   addr: [ 127.0.0.1:9092 ]
   latestMsgToRedis:
     topic: "latestMsgToRedis"
@@ -105,7 +105,7 @@ kafka:
 # IP address to register with zookeeper when starting RPC, the IP and corresponding rpcPort should be accessible by api/gateway
 # Default listen IP is 0.0.0.0
 rpc:
-  registerIP:
+  registerIP: ''
   listenIP: 0.0.0.0
 
 ###################### API configuration information ######################
@@ -132,26 +132,27 @@ api:
 # minio.signEndpoint is minio public network address
 object:
   enable: "minio"
-  apiURL: "http://127.0.0.1:10002"
+  apiURL: "http://14.153.17.42:10002"
   minio:
     bucket: "openim"
     endpoint: "http://127.0.0.1:10005"
     accessKeyID: "root"
     secretAccessKey: "openIM123"
-    sessionToken: ""
+    sessionToken: ''
-    signEndpoint: "http://127.0.0.1:10005"
+    signEndpoint: "http://14.153.17.42:10005"
   cos:
-    bucketURL: "https://temp-1252357374.cos.ap-chengdu.myqcloud.com"
+    bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com
-    secretID: ""
+    secretID: ''
-    secretKey: ""
+    secretKey: ''
-    sessionToken: ""
+    sessionToken: ''
   oss:
     endpoint: "https://oss-cn-chengdu.aliyuncs.com"
     bucket: "demo-9999999"
     bucketURL: "https://demo-9999999.oss-cn-chengdu.aliyuncs.com"
-    accessKeyID: ""
+    accessKeyID: ''
-    accessKeySecret: ""
+    accessKeySecret: ''
-    sessionToken: ""
+    sessionToken: ''
+
 
 ###################### RPC Port Configuration ######################
 # RPC service ports
@@ -193,11 +194,11 @@ rpcRegisterName:
 # Whether to output in json format
 # Whether to include stack trace in logs
 log:
-  storageLocation: ../../../../../logs/
+  storageLocation: /root/workspaces/openim/openim-server/logs/
   rotationTime: 24
   remainRotationCount: 2
   remainLogLevel: 6
-  isStdout: false 
+  isStdout: false
   isJson: false
   withStack: false
 

docker-compose.yaml

@@ -103,11 +103,11 @@ services:
     # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main
     # image: openim/openim-server:main
     container_name: openim-server
-    # healthcheck:
+    healthcheck:
-    #   test: ["CMD-SHELL", "./scripts/check-all.sh"]
+      test: ["CMD-SHELL", "./scripts/check-all.sh"]
-    #   interval: 30s
+      interval: 30s
-    #   timeout: 10s
+      timeout: 10s
-    #   retries: 5
+      retries: 5
     volumes:
       - ./logs:/openim/openim-server/logs
       - ./config:/openim/openim-server/config

scripts/docker-start-all.sh

@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -o errexit
+set -o nounset
+set -o pipefail
+
 #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
 
@@ -22,10 +26,7 @@ source "${OPENIM_ROOT}/scripts/install/common.sh"
 
 trap 'openim::util::onCtrlC' INT
 
-nohup "${OPENIM_ROOT}"/scripts/start-all.sh >> ${LOG_FILE} 2>&1 &
+"${OPENIM_ROOT}"/scripts/start-all.sh
-
+"${OPENIM_ROOT}"/scripts/check-all.sh
-sleep 15
-
-nohup "${OPENIM_ROOT}"/scripts/check-all.sh >> ${LOG_FILE} 2>&1 &
 
 tail -f ${LOG_FILE}

scripts/init-config.sh

@@ -24,27 +24,30 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 source "${OPENIM_ROOT}/scripts/lib/init.sh"
 
-# 定义一个配置文件数组，其中包含需要生成的配置文件的名称路径 (en: Define a profile array that contains the name path of the profile to be generated.)
+# 定义一个配置文件数组，其中包含需要生成的配置文件的名称路径 
-readonly ENV_FILE=${ENV_FILE:-"${OPENIM_ROOT}"/scripts/install/environment.sh}
+# (en: Define a profile array that contains the name path of the profile to be generated.)
+readonly ENV_FILE=${ENV_FILE:-"${OPENIM_ROOT}/scripts/install/environment.sh"}
 
-# 定义关联数组，其中键是模板文件，值是对应的输出文件 (en: Defines an associative array where the keys are the template files and the values are the corresponding output files.)
+# 定义关联数组，其中键是模板文件，值是对应的输出文件 
+# (en: Defines an associative array where the keys are the template files and the values are the corresponding output files.)
 declare -A TEMPLATES=(
-  [""${OPENIM_ROOT}"/deployments/templates/env_template.yaml"]=""${OPENIM_ROOT}"/.env"
+  ["${OPENIM_ROOT}/deployments/templates/env_template.yaml"]="${OPENIM_ROOT}/.env"
-  [""${OPENIM_ROOT}"/deployments/templates/openim.yaml"]=""${OPENIM_ROOT}"/config/config.yaml"
+  ["${OPENIM_ROOT}/deployments/templates/openim.yaml"]="${OPENIM_ROOT}/config/config.yaml"
 )
 
 for template in "${!TEMPLATES[@]}"; do
-  output_file=${TEMPLATES[$template]}
-
   if [[ ! -f "${template}" ]]; then
     openim::log::error_exit "template file ${template} does not exist..."
   fi
 
-  openim::log::info "⌚  Working with template file: ${template} to ${output_file}..."
+  IFS=';' read -ra OUTPUT_FILES <<< "${TEMPLATES[$template]}"
-  ""${OPENIM_ROOT}"/scripts/genconfig.sh" "${ENV_FILE}" "${template}" > "${output_file}" || {
+  for output_file in "${OUTPUT_FILES[@]}"; do
-    openim::log::error "Error processing template file ${template}"
+    openim::log::info "⌚  Working with template file: ${template} to ${output_file}..."
-    exit 1
+    "${OPENIM_ROOT}/scripts/genconfig.sh" "${ENV_FILE}" "${template}" > "${output_file}" || {
-  }
+      openim::log::error "Error processing template file ${template}"
+      exit 1
+    }
+  done
 done
 
-openim::log::success "✨  All configuration files have been successfully generated!"
+openim::log::success "✨  All configuration files have been successfully generated!"

scripts/install/openim-tools.sh

@@ -102,7 +102,7 @@ function openim::tools::start_service() {
     cmd="${cmd} --prometheus_port ${prometheus_port}"
   fi
   openim::log::info "Starting ${binary_name}..."
-  ${cmd} >> "${LOG_FILE}" 2>&1 &
+  ${cmd}
 }
 
 function openim::tools::start() {

scripts/lib/logging.sh

@@ -212,11 +212,11 @@ openim::log::success()
 
 function openim::log::test_log() {
     echo_log "test log"
-    openim::log::error "openim::log::error"
     openim::log::info "openim::log::info"
     openim::log::progress "openim::log::progress"
     openim::log::status "openim::log::status"
     openim::log::success "openim::log::success"
+    openim::log::error "openim::log::error"
     openim::log::error_exit "openim::log::error_exit"
 }
 

scripts/start-all.sh

@@ -61,10 +61,11 @@ function execute_scripts() {
         else
             openim::log::errexit "Script ${script_path##*/} is missing or not executable."
         fi
-        sleep 0.5
     done
 }
 
+sleep 0.5
+
 # TODO Prelaunch tools, simple for now, can abstract functions later
 TOOLS_START_SCRIPTS_PATH=${START_SCRIPTS_PATH}/openim-tools.sh
 ${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start