pindo 5.17.5 → 5.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dc0ea199e9881c190ba29b0da86845f0f628d92e8d44fdc5276a00ab8945a23
-  data.tar.gz: 5c001a0004db9f0cfe726bbf20bfbd855c8cbdd65e35a63043cf62f059b4d513
+  metadata.gz: 6aa6cacda33572effc137d3edb8cc37b1cf395c200da85365b8f1f975dd8b56a
+  data.tar.gz: ae49f32ec2d23e85acb5311b9358e8fa2dd0f136c85613401d4053e9538e03a2
 SHA512:
-  metadata.gz: 3cf203666f973af0185f1a7cd0b700e918e6fe4a273ce5af2324cfa7e809c55ea2c6669b1678d54b0d3c851660d0021c3edd60d0a20253ab47f68b5b6df70ad2
-  data.tar.gz: 1dad5465cd43d8e974ba99c059f0f7a9995144c5af8c890c092c471fd677ca657bd024ffb677d42463b4ad27c6bc91644fba8acb5be86f1c360870de46d7413a
+  metadata.gz: 878e76466b93a3f095b024af378a47b6c54e36d5000455eaf29f07c1b5d6ec1d3ace1b7624a2d3826dc595d976cf030c3e241158e675b74ca8affdca696d7c7a
+  data.tar.gz: '0769e7e7f5f55836395bedb94f04d5665accb807a88e5c5bbb98f6c0cd92547a62410dfd4ae1a3873e40114d302fcb966f65aaed4d8b8a31e02fa2342b7171c3'

data/lib/pindo/base/git_handler.rb

@@ -20,6 +20,50 @@ module Pindo
         git!(%W(config --global user.name #{usrname}))
       end
 
+      # 检查指定目录的 Git 仓库是否使用 gitee.com 远程地址
+      def is_gitee_repo?(local_repo_dir: nil)
+        return false if local_repo_dir.nil? || !File.exist?(local_repo_dir)
+        begin
+          remote_url = git!(%W(-C #{local_repo_dir} remote get-url origin)).strip rescue ""
+          remote_url.include?("gitee.com")
+        rescue
+          false
+        end
+      end
+
+      # 临时去除代理环境变量执行代码块
+      # 用于 gitee.com 等不需要代理的仓库操作
+      def without_proxy(&block)
+        saved_env = {}
+        %w[http_proxy https_proxy HTTP_PROXY HTTPS_PROXY all_proxy ALL_PROXY].each do |key|
+          saved_env[key] = ENV[key]
+          ENV.delete(key)
+        end
+        begin
+          block.call
+        ensure
+          saved_env.each do |key, value|
+            if value.nil?
+              ENV.delete(key)
+            else
+              ENV[key] = value
+            end
+          end
+        end
+      end
+
+      # 执行需要联网的 git 命令（fetch / push / pull）
+      # 若仓库地址包含 gitee.com，自动清除代理环境变量再执行
+      # @param project_dir [String] 仓库目录（用于判断是否 gitee）
+      # @param args [Array] git 命令参数
+      def git_remote!(project_dir, args)
+        if is_gitee_repo?(local_repo_dir: project_dir)
+          without_proxy { git!(args) }
+        else
+          git!(args)
+        end
+      end
+
       def is_git_directory?(local_repo_dir: nil)
         args = local_repo_dir ? %W(-C #{local_repo_dir} rev-parse --is-inside-work-tree) : %w(rev-parse --is-inside-work-tree)
         begin
@@ -51,7 +95,7 @@ module Pindo
             result = true
           end
 
-          git!(%W(-C #{local_repo_dir} push origin #{branch}:#{branch}))
+          git_remote!(local_repo_dir, %W(-C #{local_repo_dir} push origin #{branch}:#{branch}))
 
           Dir.chdir(current)
           return result
@@ -69,7 +113,7 @@ module Pindo
             end
 
             if remote_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
-                git!(%W(-C #{local_repo_dir} push origin :#{branch}))
+                git_remote!(local_repo_dir, %W(-C #{local_repo_dir} push origin :#{branch}))
                 result = true
             end
 
@@ -105,7 +149,7 @@ module Pindo
           result = false
           if File.exist?(local_repo_dir)
             Dir.chdir(local_repo_dir)
-            res_data = git!(%W(-C #{local_repo_dir} ls-remote --heads origin refs/heads/#{branch}))
+            res_data = git_remote!(local_repo_dir, %W(-C #{local_repo_dir} ls-remote --heads origin refs/heads/#{branch}))
             result = !res_data.nil? && !res_data.empty?
           else
             result = false
@@ -125,7 +169,7 @@ module Pindo
                 git!(%W(-C #{local_repo_dir} tag #{tag_name}))
                 result = true
             end
-            git!(%W(-C #{local_repo_dir} push origin #{tag_name}))
+            git_remote!(local_repo_dir, %W(-C #{local_repo_dir} push origin #{tag_name}))
           else
             result = false
           end
@@ -152,7 +196,7 @@ module Pindo
               if local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
                   git!(%W(-C #{local_repo_dir} tag -d #{tag_name}))
               end
-              git!(%W(-C #{local_repo_dir} push origin :#{tag_name}))
+              git_remote!(local_repo_dir, %W(-C #{local_repo_dir} push origin :#{tag_name}))
               add_tag(local_repo_dir:local_repo_dir, tag_name:tag_name)
           else
               if local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
@@ -173,7 +217,7 @@ module Pindo
                 result = true
             end
             if remote_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
-                git!(%W(-C #{local_repo_dir} push origin :#{tag_name}))
+                git_remote!(local_repo_dir, %W(-C #{local_repo_dir} push origin :#{tag_name}))
                 result = true
             end
           else
@@ -193,7 +237,7 @@ module Pindo
           if File.exist?(local_repo_dir)
             Dir.chdir(local_repo_dir)
             tag_ref = "refs/tags/#{tag_name}"
-            res_data = git!(%W(-C #{local_repo_dir} ls-remote --tags origin #{tag_ref}))
+            res_data = git_remote!(local_repo_dir, %W(-C #{local_repo_dir} ls-remote --tags origin #{tag_ref}))
             result =  !res_data.nil? && !res_data.empty?
           else
             result = false
@@ -250,6 +294,19 @@ module Pindo
         current=Dir.pwd
         local_repo_dir = File::join(path, reponame)
 
+        # gitee.com 仓库自动去除代理
+        if remote_url && remote_url.include?("gitee.com")
+          return without_proxy { getcode_to_dir_impl(reponame: reponame, remote_url: remote_url, path: path, new_branch: new_branch, new_tag: new_tag) }
+        end
+
+        getcode_to_dir_impl(reponame: reponame, remote_url: remote_url, path: path, new_branch: new_branch, new_tag: new_tag)
+      end
+
+      def getcode_to_dir_impl(reponame:nil, remote_url:nil, path: nil, new_branch:"master", new_tag: nil)
+
+        current=Dir.pwd
+        local_repo_dir = File::join(path, reponame)
+
         Funlog.instance.fancyinfo_update("开始更新仓库:#{local_repo_dir}...")
 
         begin
@@ -267,13 +324,17 @@ module Pindo
                   git!(%W(remote add origin #{remote_url}))
                   args = %W(-C #{local_repo_dir} fetch origin)
                   args.push('--progress')
-                  git!(args)
+                  git_remote!(local_repo_dir, args)
                   git!(%W(-C #{local_repo_dir} branch --set-upstream-to=origin/#{current_branch}  #{current_branch}))
                 end
 
-                git!(%W(-C #{local_repo_dir} fetch origin --progress))
+                git_remote!(local_repo_dir, %W(-C #{local_repo_dir} fetch origin --progress))
               else
-                git! ['clone', remote_url, local_repo_dir]
+                if remote_url&.include?("gitee.com")
+                  without_proxy { git!(['clone', remote_url, local_repo_dir]) }
+                else
+                  git!(['clone', remote_url, local_repo_dir])
+                end
               end
 
               Dir.chdir(local_repo_dir)
@@ -281,7 +342,7 @@ module Pindo
               if current_branch.eql?(new_branch)
                   git!(%W(-C #{local_repo_dir} reset --hard origin/#{new_branch}))
                   git!(%W(-C #{local_repo_dir} branch --set-upstream-to=origin/#{new_branch} #{new_branch}))
-                  git!(%W(-C #{local_repo_dir} pull))
+                  git_remote!(local_repo_dir, %W(-C #{local_repo_dir} pull))
 
               else
                 git!(%W(-C #{local_repo_dir} clean -fd))
@@ -295,7 +356,7 @@ module Pindo
                   end
                 end
                 git!(%W(-C #{local_repo_dir} branch --set-upstream-to=origin/#{new_branch} #{new_branch}))
-                git!(%W(-C #{local_repo_dir} pull))
+                git_remote!(local_repo_dir, %W(-C #{local_repo_dir} pull))
               end
 
               if !new_tag.nil? && new_tag != ""
@@ -335,17 +396,20 @@ module Pindo
           FileUtils.mkdir(pindo_dir)
         end
 
+        # 通配符 bundle id (如 com.eyesofstorms.*) 对应的仓库名去掉 .* 后缀
+        actual_repo_name = repo_name&.gsub(".*", "") || repo_name
+
         repo_org_name = Pindoconfig.instance.build_deploy_org
 
         git_repo_file = File.join(Pindoconfig.instance.pindo_env_configdir,  "git_base_url.json")
         git_repo_json = JSON.parse(File.read(git_repo_file))
-        if repo_name && git_repo_json && git_repo_json[repo_name]
-          repo_org_name = git_repo_json[repo_name]
+        if actual_repo_name && git_repo_json && git_repo_json[actual_repo_name]
+          repo_org_name = git_repo_json[actual_repo_name]
         end
 
-        url = File.join("https://gitee.com", repo_org_name, repo_name + ".git")
-        getcode_to_dir(reponame:repo_name, remote_url: url, path:pindo_dir)
-        config_repo_dir = File.join(pindo_dir, repo_name)
+        url = File.join("https://gitee.com", repo_org_name, actual_repo_name + ".git")
+        getcode_to_dir(reponame:actual_repo_name, remote_url: url, path:pindo_dir)
+        config_repo_dir = File.join(pindo_dir, actual_repo_name)
 
 
 
@@ -414,6 +478,19 @@ module Pindo
       def git_addpush_repo(path:nil, message:"res", commit_file_params:nil)
         current=Dir.pwd
         Dir.chdir(path)
+
+        # gitee.com 仓库自动去除代理
+        if is_gitee_repo?(local_repo_dir: path)
+          Dir.chdir(current)
+          return without_proxy { git_addpush_repo_impl(path: path, message: message, commit_file_params: commit_file_params) }
+        end
+
+        git_addpush_repo_impl(path: path, message: message, commit_file_params: commit_file_params)
+      end
+
+      def git_addpush_repo_impl(path:nil, message:"res", commit_file_params:nil)
+        current=Dir.pwd
+        Dir.chdir(path)
         begin
             if !commit_file_params.nil? && !commit_file_params.empty?
               files_list = git! ['ls-files', '--other', '--modified', '--exclude-standard'] || []
@@ -527,9 +604,13 @@ module Pindo
                     handle_delete_all(current_project_dir, coding_branch)
                 when Pindo::UncommittedFilesProcessType::STASH
                     handle_stash(current_project_dir, coding_branch)
-                when Pindo::UncommittedFilesProcessType::SKIP
-                    # 跳过处理，不做任何操作
-                    Funlog.instance.warning("跳过提交，可能导致 build number 与代码仓库不一致")
+                when Pindo::UncommittedFilesProcessType::SKIP_WITH_TAG
+                    # 不提交，但后续会合并分支并打 tag
+                    Funlog.instance.warning("跳过提交，但会合并分支并打 tag")
+                    return
+                when Pindo::UncommittedFilesProcessType::SKIP_WITHOUT_TAG
+                    # 不提交，不合并分支，不打 tag
+                    Funlog.instance.warning("跳过提交，不合并分支，不打 tag")
                     return
                 when Pindo::UncommittedFilesProcessType::EXIT
                     raise Informative, "请手动处理未提交的文件！！！"
@@ -593,14 +674,14 @@ module Pindo
                 end
             end
 
-            git!(%W(-C #{project_dir} fetch origin))
+            git_remote!(project_dir, %W(-C #{project_dir} fetch origin))
             Funlog.instance.fancyinfo_start("正在push...")
             if remote_branch_exists?(local_repo_dir: project_dir, branch: branch)
                 git!(%W(-C #{project_dir} branch --set-upstream-to=origin/#{branch} #{branch}))
-                git! ['pull']
-                git! ['push']
+                git_remote!(project_dir, %W(-C #{project_dir} pull))
+                git_remote!(project_dir, %W(-C #{project_dir} push))
             else
-                git!(%W(-C #{project_dir} push --set-upstream origin #{branch}))
+                git_remote!(project_dir, %W(-C #{project_dir} push --set-upstream origin #{branch}))
             end
             Funlog.instance.fancyinfo_success("push文件完成!")
         end
@@ -615,7 +696,7 @@ module Pindo
             git!(%W(-C #{project_dir} reset --hard))
             git!(%W(-C #{project_dir} clean -df))
             git!(%W(-C #{project_dir} branch --set-upstream-to=origin/#{branch} #{branch}))
-            git!(%W(-C #{project_dir} pull))
+            git_remote!(project_dir, %W(-C #{project_dir} pull))
             Funlog.instance.fancyinfo_success("未提交的文件已删除!")
         end
 
@@ -887,7 +968,7 @@ module Pindo
         git_root = git_root_directory(local_repo_dir: project_dir)
         unless git_root
           Funlog.instance.fancyinfo_warning("当前目录不是Git仓库")
-          return Pindo::UncommittedFilesProcessType::SKIP
+          return Pindo::UncommittedFilesProcessType::SKIP_WITH_TAG
         end
 
         current_branch = git!(%W(-C #{git_root} rev-parse --abbrev-ref HEAD)).strip
@@ -897,11 +978,12 @@ module Pindo
         cli = HighLine.new
         cli.choose do |menu|
           menu.header = "仓库有未提交的修改，请选择处理方式"
-          menu.prompt = "请输入选项(1/2/3/4/5):"
+          menu.prompt = "请输入选项(1/2/3/4/5/6):"
           menu.choice("(commit) 全部提交") { Pindo::UncommittedFilesProcessType::COMMIT }
-          menu.choice("(skip) 跳过并且不作任何修改，继续执行") { Pindo::UncommittedFilesProcessType::SKIP }
+          menu.choice("(skip-with-tag) 不提交，但合并分支并打tag") { Pindo::UncommittedFilesProcessType::SKIP_WITH_TAG }
+          menu.choice("(skip-without-tag) 不提交，不合并分支，不打tag") { Pindo::UncommittedFilesProcessType::SKIP_WITHOUT_TAG }
           menu.choice("(reset) 全部丢弃更改，回滚代码") { Pindo::UncommittedFilesProcessType::RESET }
-          menu.choice("(stash) 保存到stash区域（该部分代码本次不生效）") { Pindo::UncommittedFilesProcessType::STASH }
+          menu.choice("(stash) 保存到stash区域（该部分代码本次编译不生效）") { Pindo::UncommittedFilesProcessType::STASH }
           menu.choice("(exit) 先退出，手动来处理退出") { Pindo::UncommittedFilesProcessType::EXIT }
         end
       end
@@ -936,7 +1018,7 @@ module Pindo
             end
 
             git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{target_branch} #{target_branch}))
-            git!(%W(-C #{current_project_dir} fetch origin #{target_branch}))
+            git_remote!(current_project_dir, %W(-C #{current_project_dir} fetch origin #{target_branch}))
             git!(%W(-C #{current_project_dir} merge origin/#{target_branch}))
 
             # 执行合并操作
@@ -947,7 +1029,7 @@ module Pindo
             if !conflict_filelist.nil? && !conflict_filelist.strip.empty?
               raise Informative, "合并#{source_branch}到#{target_branch}时产生冲突，请手动处理！"
             else
-              git!(%W(-C #{current_project_dir} push))
+              git_remote!(current_project_dir, %W(-C #{current_project_dir} push))
               Funlog.instance.fancyinfo_success("代码已经合并到#{target_branch}分支")
               # 获取 target_branch 的 commit ID（处理空分支情况）
               begin
@@ -977,7 +1059,7 @@ module Pindo
 
             # 基于 source_branch 创建 target_branch（明确指定起点，避免基于错误的分支创建）
             git!(%W(-C #{current_project_dir} checkout -b #{target_branch} #{source_branch}))
-            git!(%W(-C #{current_project_dir} push origin #{target_branch}))
+            git_remote!(current_project_dir, %W(-C #{current_project_dir} push origin #{target_branch}))
             git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{target_branch} #{target_branch}))
 
             Funlog.instance.fancyinfo_success("代码已经合并到#{target_branch}分支")
@@ -1013,14 +1095,14 @@ module Pindo
                   Funlog.instance.fancyinfo_success("已将#{source_branch} fast-forward 到#{target_branch}，两分支现在在同一节点")
 
                   # 推送到远程（普通 push，因为是 fast-forward）
-                  git!(%W(-C #{current_project_dir} push origin #{source_branch}))
+                  git_remote!(current_project_dir, %W(-C #{current_project_dir} push origin #{source_branch}))
                   Funlog.instance.fancyinfo_success("已推送#{source_branch}分支到远程")
                 rescue => e
                   if e.message.include?("Not possible to fast-forward")
                     # 理论上不应该到这里，因为前面检查过是祖先
                     Funlog.instance.fancyinfo_warning("无法 fast-forward，将产生 merge commit")
                     git!(%W(-C #{current_project_dir} merge #{target_branch}))
-                    git!(%W(-C #{current_project_dir} push origin #{source_branch}))
+                    git_remote!(current_project_dir, %W(-C #{current_project_dir} push origin #{source_branch}))
                   else
                     raise e
                   end
@@ -1036,7 +1118,7 @@ module Pindo
                   raise Informative, "合并#{target_branch}到#{source_branch}时产生冲突，请手动处理！"
                 end
 
-                git!(%W(-C #{current_project_dir} push origin #{source_branch}))
+                git_remote!(current_project_dir, %W(-C #{current_project_dir} push origin #{source_branch}))
                 Funlog.instance.fancyinfo_success("已将#{target_branch}合并到#{source_branch}（产生了新 merge commit）")
               end
             else
@@ -1071,13 +1153,13 @@ module Pindo
         unless remote_exists
           Funlog.instance.fancyinfo_warning("远程分支 #{remote_branch} 不存在，需要创建")
           Funlog.instance.fancyinfo_start("正在推送并创建远程分支...")
-          git!(%W(-C #{project_dir} push -u origin #{branch}))
+          git_remote!(project_dir, %W(-C #{project_dir} push -u origin #{branch}))
           Funlog.instance.fancyinfo_success("远程分支创建成功!")
           return
         end
 
         # 3. 先 fetch 获取最新的远程状态
-        git!(%W(-C #{project_dir} fetch origin #{branch}))
+        git_remote!(project_dir, %W(-C #{project_dir} fetch origin #{branch}))
 
         # 4. 检查本地分支是否领先远程分支
         ahead_count = git!(%W(-C #{project_dir} rev-list --count #{remote_branch}..#{branch})).strip.to_i
@@ -1093,7 +1175,7 @@ module Pindo
           # 仅本地领先：直接推送
           Funlog.instance.fancyinfo_warning("检测到 #{ahead_count} 个本地提交尚未推送")
           Funlog.instance.fancyinfo_start("正在推送到远程分支 #{remote_branch}...")
-          git!(%W(-C #{project_dir} push origin #{branch}))
+          git_remote!(project_dir, %W(-C #{project_dir} push origin #{branch}))
           Funlog.instance.fancyinfo_success("推送成功!")
         elsif ahead_count == 0 && behind_count > 0
           # 仅远程领先：重置本地到远程位置

data/lib/pindo/command/android/autobuild.rb

@@ -66,7 +66,7 @@ module Pindo
 
             使用示例:
 
-                $ pindo and autobuild --bundle_name=com.example.app  # 指定 Bundle Name
+                $ pindo and autobuild --bundle_name=com.example.*  # 指定 Bundle Name（支持通配符）
 
                 $ pindo and autobuild --proj="My App"           # 指定项目名称
 
@@ -151,8 +151,11 @@ module Pindo
         def run
           pindo_project_dir = Dir.pwd
 
-          # 加载 JPS 配置（如果存在）
-          Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir)
+          # 加载 JPS 配置（缓存 project_name，并通过映射表解析 bundle_id）
+          Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir, conf: @args_conf)
+
+          # 解析 bundle_name（优先级：命令行参数 > JPSBuildConfig映射 > 交互选择）
+          resolve_bundle_name!
 
           # 准备配置
           config = prepare_android_config(pindo_project_dir)
@@ -177,27 +180,56 @@ module Pindo
 
         private
 
-        # 准备 Android 配置
-        def prepare_android_config(pindo_project_dir)
-          # 获取 Bundle Name
-          bundle_name = @args_bundle_name || get_selected_dev_bundle_name()
+        # 解析 bundle_name（优先级：命令行参数 > JPSBuildConfig映射 > prepare_upload交互选择）
+        def resolve_bundle_name!
+          # 优先级 1：命令行 --bundle_name 参数
+          return if @args_bundle_name && !@args_bundle_name.empty?
 
-          # 重要：如果 bundle_name 是通过交互式选择获取的，同步回 @options
-          if bundle_name && (@args_bundle_name.nil? || @args_bundle_name.empty?)
-            @args_bundle_name = bundle_name
-            @options[:bundle_name] = bundle_name  # 确保能被缓存系统保存
+          # 优先级 2：JPSBuildConfig.json 通过映射表解析的 bundle_name
+          resolved = Pindo::Options::GlobalOptionsState.instance[:bundle_name]
+          if resolved && !resolved.empty?
+            @args_bundle_name = resolved
+            return
           end
 
-          # 获取 JPS 配置
-          app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
+          # 优先级 3：走 prepare_upload 交互选择 JPS 项目，创建/更新 JPSBuildConfig.json
+          pindo_project_dir = Dir.pwd
+          @cached_app_info_obj, @cached_workflow_info = PgyerHelper.share_instace.prepare_upload(
             working_directory: pindo_project_dir,
             conf: @args_conf,
             package_type: 'apk'
           )
 
+          # prepare_upload 已创建 JPSBuildConfig.json，重新加载获取 bundle_name
+          Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir, conf: @args_conf)
+          resolved = Pindo::Options::GlobalOptionsState.instance[:bundle_name]
+          if resolved && !resolved.empty?
+            @args_bundle_name = resolved
+            return
+          end
+
+          # 最终降级：交互选择 bundle_name
+          @args_bundle_name = get_selected_dev_bundle_name()
+        end
+
+        # 准备 Android 配置
+        def prepare_android_config(pindo_project_dir)
+          # 获取 JPS 配置（复用 resolve_bundle_name! 中已缓存的结果）
+          if @cached_app_info_obj && @cached_workflow_info
+            app_info_obj = @cached_app_info_obj
+            workflow_info = @cached_workflow_info
+          else
+            app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
+              working_directory: pindo_project_dir,
+              conf: @args_conf,
+              package_type: 'apk',
+              bundle_name: @args_bundle_name
+            )
+          end
+
           {
             project_path: pindo_project_dir,
-            bundle_name: bundle_name,
+            bundle_name: @args_bundle_name,
             app_info_obj: app_info_obj,
             workflow_info: workflow_info
           }
@@ -223,13 +255,15 @@ module Pindo
             # 如果用户指定了 --git-commit 参数，直接使用该参数；否则交互式询问
             user_specified_git_commit = @options[:git_commit] != nil
             
-            Funlog.instance.info("DEBUG: @options[:git_commit] = #{@options[:git_commit].inspect}")
-            Funlog.instance.info("DEBUG: @args_git_commit = #{@args_git_commit.inspect}")
-            Funlog.instance.info("DEBUG: user_specified_git_commit = #{user_specified_git_commit}")
+            if ENV['PINDO_DEBUG']
+              puts "[PINDO_DEBUG] @options[:git_commit] = #{@options[:git_commit].inspect}"
+              puts "[PINDO_DEBUG] @args_git_commit = #{@args_git_commit.inspect}"
+              puts "[PINDO_DEBUG] user_specified_git_commit = #{user_specified_git_commit}"
+            end
             
             if user_specified_git_commit
               # 用户指定了 --git-commit 参数，直接使用
-              process_type = @args_git_commit || Pindo::UncommittedFilesProcessType::SKIP
+              process_type = @args_git_commit || Pindo::UncommittedFilesProcessType::SKIP_WITH_TAG
               Funlog.instance.info("使用用户指定的 Git 提交处理方式：#{process_type}")
             else
               # 未指定参数，交互式询问
@@ -327,12 +361,15 @@ module Pindo
             build_task.dependencies << tasks.last.id if tasks.any?
             tasks << build_task
 
-            # 4. Git 标签任务（依赖第一个编译任务）
-            # 所有参数都从 GitCommitTask 获取
-            git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
-            git_tag_task.dependencies << build_task.id
-            git_tag_task.dependencies << git_commit_task.id
-            tasks << git_tag_task
+            # 4. Git 标签任务（skip_without_tag 模式下不创建）
+            git_tag_task = nil
+            unless process_type == Pindo::UncommittedFilesProcessType::SKIP_WITHOUT_TAG
+              # 所有参数都从 GitCommitTask 获取
+              git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
+              git_tag_task.dependencies << build_task.id
+              git_tag_task.dependencies << git_commit_task.id
+              tasks << git_tag_task
+            end
 
             # 5. 上传和消息发送任务（如果需要）
             upload_task = nil  # 声明变量以便后续绑定任务使用
@@ -419,7 +456,7 @@ module Pindo
               )
               # 依赖 Git Commit、Git Tag 和 Bind Package 任务
               workflow_message_task.dependencies << git_commit_task.id
-              workflow_message_task.dependencies << git_tag_task.id
+              workflow_message_task.dependencies << git_tag_task.id if git_tag_task
               workflow_message_task.dependencies << bind_package_task.id
               tasks << workflow_message_task
             end

data/lib/pindo/command/appstore/adhocbuild.rb

@@ -133,7 +133,7 @@ module Pindo
 
           begin
             # 加载 JPS 配置（如果存在）
-            Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir)
+            Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir, conf: @args_conf)
 
             # 处理配置文件
             prepare_config(pindo_project_dir)

data/lib/pindo/command/appstore/autobuild.rb

@@ -97,7 +97,7 @@ module Pindo
           @args_release_branch = @options[:release_branch] || 'master'
           @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type])
           @args_tag_pre = @options[:tag_pre] || 'ios_release_'
-          @args_git_commit = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit]) || Pindo::UncommittedFilesProcessType::SKIP
+          @args_git_commit = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit]) || Pindo::UncommittedFilesProcessType::SKIP_WITH_TAG
 
           super(argv)
         end

data/lib/pindo/command/appstore/autoresign.rb

@@ -165,7 +165,7 @@ module Pindo
         def run
           begin
             # 加载 JPS 配置（如果存在）
-            Pindo::BuildHelper.share_instance.load_jps_build_config(Dir.pwd)
+            Pindo::BuildHelper.share_instance.load_jps_build_config(Dir.pwd, conf: @args_conf)
 
             # 1. 查找或指定 IPA 文件
             ipa_file_path = find_ipa_file()