From 24e36c72124248e7c3fddc1f65433bdcd1c94f32 Mon Sep 17 00:00:00 2001 From: swwhaha Date: Wed, 2 Nov 2022 08:59:22 +0800 Subject: [PATCH 1/6] Update run_cluster.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复错别字 --- script/run_cluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/run_cluster.sh b/script/run_cluster.sh index 844248d..455b4a3 100755 --- a/script/run_cluster.sh +++ b/script/run_cluster.sh @@ -117,7 +117,7 @@ function docker_run(){ docker run --name $DOCKER_CLUSTER_NAME --net $DOCKER_NETWORK --ip $DOCKER_CVCLUSTER_IP --restart always --privileged=true -v $DOCKER_CLUSTER_PATH:/MyData -e MyDataPath=/MyData -p $DOCKER_HTTP_PORT:80 -p $DOCKER_HTTPS_PORT:443 -p $DOCKER_WEBSOCKET_PORT:17000 -d $DOCKER_CLUSTER_IMAGE_NAME } function main(){ - echo "依耐文件检查...." + echo "依赖文件检查...." init_system_files_path #启动镜像 From ad97e6241fe1da0749493826973292feefa7ee24 Mon Sep 17 00:00:00 2001 From: swwhaha Date: Wed, 2 Nov 2022 09:42:41 +0800 Subject: [PATCH 2/6] Update run_28181.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复错别字 --- script/run_28181.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/run_28181.sh b/script/run_28181.sh index 8050f07..3bcdf48 100755 --- a/script/run_28181.sh +++ b/script/run_28181.sh @@ -113,7 +113,7 @@ function docker_run(){ docker run --name $DOCKER_GBSIP_NAME --net $DOCKER_NETWORK --ip $DOCKER_GBSIP_IP --restart always --privileged=true -v $DOCKER_GBSIP_PATH:/MyData -e MyDataPath=/MyData -p $DOCKER_GBSIP_HTTP_PORT:80 -p $DOCKER_GBSIP_PORT:$DOCKER_GBSIP_PORT/tcp -p $DOCKER_GBSIP_PORT:$DOCKER_GBSIP_PORT/udp -d $DOCKER_GBSIP_IMAGE_NAME } function main(){ - echo "依耐文件检查...." + echo "依赖文件检查...." init_system_files_path if [ -n "$MYSQL_Server_IP" ] ;then @@ -124,7 +124,7 @@ function main(){ #启动镜像 docker_run - echo "GB28281服务启动完成" + echo "GB28181服务启动完成" echo "" } ###################################脚本入口####################################### From ae6b9890be4b88087246798d3204b05e964d9e4c Mon Sep 17 00:00:00 2001 From: swwhaha Date: Wed, 2 Nov 2022 09:43:32 +0800 Subject: [PATCH 3/6] Update run_28181_gb2jt.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复错别字 --- script/run_28181_gb2jt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/run_28181_gb2jt.sh b/script/run_28181_gb2jt.sh index e6ffc73..d1b3a30 100644 --- a/script/run_28181_gb2jt.sh +++ b/script/run_28181_gb2jt.sh @@ -91,13 +91,13 @@ function docker_run(){ docker run --name $DOCKER_GB2JT_NAME --net $DOCKER_NETWORK --ip $DOCKER_GB2JT_IP --restart always --privileged=true -v $DOCKER_GB2JT_PATH:/MyData -e MyDataPath=/MyData -p $DOCKER_SIP_PORT:$DOCKER_SIP_PORT/tcp -p $DOCKER_SIP_PORT:$DOCKER_SIP_PORT/udp -p $DOCKER_RTP_PORT:$DOCKER_RTP_PORT/tcp -p $DOCKER_RTP_PORT:$DOCKER_RTP_PORT/udp -d $DOCKER_GB2JT_IMAGE_NAME } function main(){ - echo "依耐文件检查...." + echo "依赖文件检查...." init_system_files_path #启动镜像 docker_run - echo "GB28281服务启动完成" + echo "GB28181服务启动完成" echo "" } ###################################脚本入口####################################### From 4a28721aa90116cb0340068e7d6d8a735f7a66b4 Mon Sep 17 00:00:00 2001 From: swwhaha Date: Wed, 2 Nov 2022 09:44:58 +0800 Subject: [PATCH 4/6] Update run_attachment.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复错别字 --- script/run_attachment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/run_attachment.sh b/script/run_attachment.sh index 9db93cd..825542b 100755 --- a/script/run_attachment.sh +++ b/script/run_attachment.sh @@ -81,7 +81,7 @@ function docker_run(){ -d $DOCKER_ATTACHMENT_IMAGE_NAME } function main(){ - echo "依耐文件检查...." + echo "依赖文件检查...." init_system_files_path #启动镜像 From 14d36513e1535541d7327409e3197697e95af4be Mon Sep 17 00:00:00 2001 From: swwhaha Date: Wed, 2 Nov 2022 09:46:49 +0800 Subject: [PATCH 5/6] Update run_gw.sh --- script/run_gw.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/run_gw.sh b/script/run_gw.sh index fdb696b..0946b24 100755 --- a/script/run_gw.sh +++ b/script/run_gw.sh @@ -24,13 +24,13 @@ function docker_run(){ docker_stat $DOCKER_REDIS_NAME ret=$? if [[ ret -eq 2 ]]; then - echo "REDIS未安装，即将安装REDIS" + echo "Redis未安装，即将安装Redis" docker run --name $DOCKER_REDIS_NAME --net $DOCKER_NETWORK --ip $DOCKER_REDIS_IP --restart always --privileged=true -d $DOCKER_REDIS_IMAGE_NAME cd .. elif [[ ret -eq 1 ]]; then - echo "REDIS已启动" + echo "Redis已启动" else - echo "REDIS未启动，即将启动REDIS" + echo "Redis未启动，即将启动Redis" docker start $DOCKER_REDIS_NAME fi From 716b31b18dc530ab8118dd6028b6e2005c60b08a Mon Sep 17 00:00:00 2001 From: swwhaha Date: Wed, 2 Nov 2022 09:52:13 +0800 Subject: [PATCH 6/6] Update run_rtvs.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 规范大小写 --- script/run_rtvs.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/script/run_rtvs.sh b/script/run_rtvs.sh index f40259d..cfbb883 100755 --- a/script/run_rtvs.sh +++ b/script/run_rtvs.sh @@ -13,7 +13,7 @@ NGINX_DOCKER_IMAGE_NAME=${NGINX_DOCKER_IMAGE_NAME:-"vanjoge/nginx-rtmp:flvlive"} MYSQL_DOCKER_CONTAINER_NAME=${MYSQL_DOCKER_CONTAINER_NAME:-"mysql5.7"} MYSQL_DOCKER_PATH=${MYSQL_DOCKER_PATH:-"/etc/mysql"} MYSQL_DOCKER_IP=${MYSQL_DOCKER_IP:-"172.29.108.241"} -#传入有效值时不启动MYSQL实例 +#传入有效值时不启动Mysql实例 #MYSQL_Server_IP #MYSQL_Server_PORT @@ -147,7 +147,7 @@ function init_system_files_path_base() if [[ ! -d "$TSDB_DOCKER_PATH/scripts" ]]; then mkdir $TSDB_DOCKER_PATH/scripts fi - # 创建grafana目录 + # 创建Grafana目录 if [[ ! -d "$GRAFANA_DOCKER_PATH" ]]; then mkdir $GRAFANA_DOCKER_PATH fi @@ -342,7 +342,7 @@ function docker_base_install() InfluxdbBaseUrl="http://$TSDB_DOCKER_IP:8086" fi if [[ "$RUN_GRAFANA" == "true" ]]; then - #grafana安装检查 + #Grafana安装检查 docker_grafana_checkAndInstall fi @@ -373,19 +373,19 @@ function docker_mysql_checkAndInstall(){ docker_stat $MYSQL_DOCKER_CONTAINER_NAME ret=$? if [[ ret -eq 2 ]]; then - echo "MYSQL未安装，即将安装MYSQL" + echo "Mysql未安装，即将安装Mysql" cd mysql docker_mysql_install cd .. elif [[ ret -eq 1 ]]; then - echo "MYSQL已启动" + echo "Mysql已启动" else - echo "MYSQL未启动，即将启动MYSQL" + echo "Mysql未启动，即将启动Mysql" docker start $MYSQL_DOCKER_CONTAINER_NAME fi #创建数据库表检查 - echo "正在进行MYSQL数据库表检查" + echo "正在进行Mysql数据库表检查" cd mysql cp docker_mysql_create_table.sh $MYSQL_DOCKER_PATH/scripts/docker_mysql_create_table.sh chmod a+x $MYSQL_DOCKER_PATH/scripts/docker_mysql_create_table.sh @@ -482,7 +482,7 @@ function docker_grafana_checkAndInstall(){ docker_stat $GRAFANA_DOCKER_CONTAINER_NAME ret=$? if [[ ret -eq 2 ]]; then - echo "grafana未安装，即将开始安装" + echo "Grafana未安装，即将开始安装" cd grafana docker_grafana_install cd ..