Merge branch 'master' of git.wkwork.xyz:root/install_sh

商城_run.sh

@@ -177,11 +177,9 @@ set_branches(){
 
 
         #打印当前分支名称
-        echo_content "yellow" "当前分支为: '$current_branch'"
-
         branch_count=$(echo "$branches" | wc -l)
         if [ "$branch_count" -gt 1 ]; then
-            echo_content "yellow" "$repo_name 项目:分支选择 (如不需要更换直接回车)："
+            echo_content "yellow" "$repo_name 项目:分支选择 (如继续使用 '$current_branch' 直接回车)："
     
             # 显示分支列表
             i=1
@@ -225,16 +223,23 @@ updata_project(){
    repo_dir=$1
    repo_name=$2
 
+   set_branches $repo_dir  $repo_name
+
    cd "$repo_dir" || exit 1
-   # 更新代码，如果有冲突时使用本地版本
-   #git fetch origin
-   #git merge -X ours origin/master  # 使用 'ours' 策略以本地为主
-   if [ $? -ne 0 ]; then
+
+    # 检查工作区是否有未提交的更改
+    if [[ -n $(git status --porcelain) ]]; then
+       git add .
+       git commit -m "Auto-commit: 保存当前变动"
+    fi 
+    CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+    # git pull origin "$CURRENT_BRANCH"
+    git pull --rebase -X theirs origin "$CURRENT_BRANCH"
+    if [ $? -ne 0 ]; then
         echo_content "red" "更新代码失败，请手动检查冲突。"
-   else   
+    else   
         echo_content "green" "代码更新完成。"   
-   fi
-   set_branches $repo_dir  $repo_name
+    fi
   
 }
 
@@ -428,18 +433,6 @@ init_environment_check(){
         updata_project  "$production_run_dir"  "production_run"
     fi
 
-    if [ ! -d "$production_server_config_dir/.git" ]; then
-        # 运行相关逻辑，找到匹配项后可立即处理
-        echo_content  "green" "拉取项目: 服务端配置文件"
-        echo_content  "green" "项目仓库: $production_server_config_repo"
-        echo_content  "green" "项目目录: $production_server_config_dir"
-        pull_project  "$production_server_config_repo" "$production_server_config_dir" "服务端配置"
-    else   
-        echo_content "green" "更新项目: 服务端配置文件"
-        echo_content "green" "项目仓库: $production_server_config_repo"
-        echo_content "green" "项目目录: $production_server_config_dir"
-        updata_project  "$production_server_config_dir"  "服务端配置文件"
-    fi
 
 
     if [ ! -d "$production_mysql_dir/.git" ]; then
@@ -448,8 +441,8 @@ init_environment_check(){
         echo_content  "green" "项目仓库: $production_mysql_repo"
         echo_content  "green" "项目目录: $production_mysql_dir"
         pull_project  "$production_mysql_repo" "$production_mysql_dir" "服务端配置"
-        # cd "$production_mysql_dir/mysql"
-        # unzip data.zip
+        cd "$production_mysql_dir/mysql"
+        unzip data.zip
     # else   
     #     echo_content "green" "更新项目: production_mysql"
     #     echo_content "green" "项目仓库: $production_mysql_repo"
@@ -457,6 +450,19 @@ init_environment_check(){
     #     updata_project  "$production_mysql_dir"  "production_mysql"
     fi
 
+    if [ ! -d "$production_server_config_dir/.git" ]; then
+        # 运行相关逻辑，找到匹配项后可立即处理
+        echo_content  "green" "拉取项目: 服务端配置文件"
+        echo_content  "green" "项目仓库: $production_server_config_repo"
+        echo_content  "green" "项目目录: $production_server_config_dir"
+        pull_project  "$production_server_config_repo" "$production_server_config_dir" "服务端配置"
+    else   
+        echo_content "green" "更新项目: 服务端配置文件"
+        echo_content "green" "项目仓库: $production_server_config_repo"
+        echo_content "green" "项目目录: $production_server_config_dir"
+        updata_project  "$production_server_config_dir"  "服务端配置文件"
+    fi
+
 
 
     get_project_names