12

demo_video.sh

@@ -632,7 +632,7 @@ clone_branch() {
 	done
 }
 
-deal_git_svr() {
+fetch_git_svr() {
 
 	REPO_URL="git@git.wkwork.xyz:LaunchDemo/0000_BD_Demo_Video_Svr.git"
 	BASE_DIR="./svr"
@@ -656,7 +656,7 @@ deal_git_svr() {
 	done
 }
 
-deal_git_web() {
+fetch_git_web() {
 
 	REPO_URL="git@git.wkwork.xyz:LaunchDemo/0000_BD_Demo_Video_Web.git"
 	BASE_DIR="./web"
@@ -784,7 +784,7 @@ EOF
 	# fi
 
 }
-run_docker_base() {
+run_docker() {
 
 	cd ./svr/docker-base || exit
 	make addnet
@@ -804,53 +804,14 @@ run_docker_base() {
 run_service() {
 	cd ./svr/bdvideo || exit
 	make export_env
+	make ffmpeg
 	make start
 	cd ../..
 }
 
-main() {
-	if [ "$(id -u)" -ne 0 ]; then
-		echo_content "red" "请以 root 权限运行此脚本。"
-		exit 1
-	fi
-	echo_content "green" "安装目录:$install_dir"
-
-	echo_content "green" " 1. 初始化脚本 检查环境..."
-
-	check_install_git
-	check_install_NodeJs
-	check_install_PM2
-	check_install_unzip
-	check_install_docker
-
-	echo_content "green" " 2. 测试git账户"
-	if check_git_account; then
-		echo "🔗 SSH 连接正常"
-	else
-		echo "⚠️ SSH 连接失败，退出"
-		exit 1
-	fi
-
-	echo_content "green" " 3. 获取更新"
-	cd $install_dir
-	echo_content "blue" "获取 svr"
-	deal_git_svr
-	echo_content "blue" "获取 web"
-	deal_git_web
-	echo_content "blue" "运行 base"
-
-	run_docker_base
-
-	# echo_content "blue" "运行 proxy"
-
-	# run_docker_web
-	# init_environment_check
-	# select_operation
-}
-
 # main
 
-main_1() {
+main() {
 	#!/bin/bash
 
 	pause() {
@@ -891,15 +852,15 @@ main_1() {
 			pause
 			;;
 		3)
-				deal_git_svr
+			fetch_git_svr
 			pause
 			;;
 		4)
-				deal_git_web
+			fetch_git_web
 			pause
 			;;
 		5)
-				run_docker_base
+			run_docker
 			pause
 			;;
 		6)
@@ -918,4 +879,4 @@ main_1() {
 	done
 }
 
-main_1
+main