1

xueying_run.sh

@@ -12,6 +12,10 @@ production_run_repo="git.wkwork.xyz/root/install_projects.git"
 
 production_install_dir="$production_run_dir/xueying"
 
+projects=(
+    "web git.wkwork.xyz/root/xueying.git  $install_dir/web"
+)
+
 
 
 
@@ -351,20 +355,25 @@ select_operation() {
         echo_content "yellow" "请选择要执行的操作："
 
         PS3="请输入操作对应的数字："
-        select operation in  "启动/重启" "卸载" "退出"; do
+        select operation in "更新项目" "启动/重启" "卸载" "退出"; do
             case $REPLY in
-    
                 1) 
-                    echo_content "green" "你选择了操作: (启动/重启)"
+                    echo_content "green" "你选择了操作: 更新项目"
+                    select_project   
                     start_project
                     break
                     ;;
                 2)
+                    echo_content "green" "你选择了操作: (启动/重启)"
+                    start_project
+                    break
+                    ;;    
+                3)
                     echo_content "green" "你选择了操作: 卸载"
                     uninstall_project
                     exit
                     ;;       
-                3)
+                4)
                     echo_content "green" "你选择了操作: 退出"
                     exit
                     ;;       
@@ -393,12 +402,26 @@ init_environment_check(){
             echo_content "green" "项目目录: $production_run_dir"
             updata_project  "$production_run_dir"  "production_run"
         fi
-    rm -rf "$production_install_dir/server/admin/Runtime"  # 删除目录及其内容
-    mkdir -p "$production_install_dir/server/admin/Runtime"  # 创建目录
-    chmod -R 777 "$production_install_dir/server/admin/Runtime"  
     
+    get_project_names
+
+    for project in "${projects[@]}"; do
+        # 获取项目信息
+        project_name=$(get_project_info "$project" 0)
+        project_repo=$(get_project_info "$project" 1)
+        project_dir=$(get_project_info "$project" 2)
+
+        # 检查项目目录中是否存在 .git 目录（即项目是否已拉取）
+        if [ ! -d "$project_dir/.git" ]; then
+            # 如果项目未被拉取，执行拉取操作
+            echo_content "green" "拉取项目: $project_name"
+            echo_content "green" "项目仓库: $project_repo"
+            echo_content "green" "项目目录: $project_dir"
         
-    ls "$production_install_dir/server/admin"
+            # 调用 pull_project 函数进行项目拉取
+            pull_project "$project_repo" "$project_dir" "$project_name"
+        fi
+    done
     
 
 }

商城_run.sh

@@ -311,6 +311,11 @@ uninstall_project() {
 
 # 函数：启动或重启项目
 start_project() {
+
+    rm nginx/nginx.conf
+    rm -rf nginx/nginx.conf
+    cp nginx/nginx_clear_mysql.conf  nginx/nginx.conf
+
     cd "$production_install_dir" || exit 1
 
     echo_content "green" "是否要启动/重启 项目？(y/n):"
@@ -398,7 +403,7 @@ select_operation() {
         echo_content "yellow" "请选择要执行的操作："
 
         PS3="请输入操作对应的数字：" 
-        select operation in "更新项目" "启动/重启【项目】" "启动/重启【mysql】" "对外开放【mysql】" "关闭对外开放【mysql】" "重置容器" "卸载" "退出"; do
+        select operation in "更新项目" "启动/重启【项目】" "启动/重启【mysql】" "对外开放【mysql】" "重置容器" "卸载" "退出"; do
             case $REPLY in
                 1) 
                     echo_content "green" "你选择了操作: 更新项目"
@@ -428,16 +433,6 @@ select_operation() {
                     break
                     ;;
                 5)
-                    echo_content "green" "关闭对外开放【mysql】"
-                    cd "$production_install_dir" || exit 1
-                    rm nginx/nginx.conf
-                    rm -rf nginx/nginx.conf
-                    cp nginx/nginx_clear_mysql.conf  nginx/nginx.conf
-                    docker-compose rm -sf nginx
-                    docker-compose up -d nginx
-                    break
-                    ;;  
-                6)
                     echo_content "green" "你选择了操作: 重置容器"
                     echo_content "green" "是否要启动/重启 项目？(y/n):"
                     read -r restart
@@ -448,12 +443,12 @@ select_operation() {
                     fi
                     exit
                     ;;   
-                7)
+                6)
                     echo_content "green" "你选择了操作: 卸载"
                     uninstall_project
                     exit
                     ;;          
-                8)
+                7)
                     echo_content "green" "你选择了操作: 退出"
                     exit
                     ;;