pindo 5.17.0 → 5.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b43a5dce389720f816458f9c1b2f292e85e17b6271b5a09c9eabbd9fedf6acf
-  data.tar.gz: f6f036fbf0bf1cbf1c78adf550c35fae9b5e8be61d6c9bb74d398338c5e3b533
+  metadata.gz: 17b6cfbf38491d35d697067e22eac1b3246e892c06c0a2a621fcfdb9ae66d6f7
+  data.tar.gz: e95883cc77797db55c3a31cfd6a723092356f8086ed9df9e6b14f9eea7ff684c
 SHA512:
-  metadata.gz: 8e4409f9d7c1a0b648031d40ce7159bf199eadfe9b9d6ee950d25bede9f2a7fcbdf38a617f8cf8364e8ee7225b9911a4865f486f968c3cb57757f658968f09f4
-  data.tar.gz: 22550e91697b65e17a6ccb9d1ed8ed08bf8d4660288c9b7c5056455cfd162f92a0e5a8eda9051c9b4b2bbc7c386b5206e664f378ca34f854bd1102756e162ed2
+  metadata.gz: e021647b5933a7ce3b3677f8a914fa9e9a5d3732a0ac03f6ba82cf352a3baf5b2b49874f3be64f7fb6b55e517c271987711c95fc67ef321b125f47bf664d7f52
+  data.tar.gz: 4c96d77c6ef2ec92a961881195c30a5c826d4f580dbc574b046d1b636a43fdedec6dee96642cfb2d03b8a92f650d9440c835bb291abaff3f1b9dee32e4ec1a52

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

@@ -89,7 +89,7 @@ module Pindo
         def self.option_items
           @option_items ||= Pindo::Options::OptionGroup.merge(
             Pindo::Options::BuildOptions.select(:bundle_name),  # 添加 bundle_name 参数
-            Pindo::Options::JPSOptions.select(:proj, :upload, :media, :bind, :send),
+            Pindo::Options::JPSOptions.select(:conf, :upload, :media, :bind, :send),
             Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
             Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
             Pindo::Options::TaskOptions.select(:multi),
@@ -107,7 +107,7 @@ module Pindo
           @options = initialize_options(argv)
 
           @args_release_flag = argv.flag?('release', false)
-          @args_proj_name = @options[:proj]
+          @args_conf = @options[:conf]
           @args_bundle_name = @options[:bundle_name]  # 从 @options 获取，确保能被缓存
 
           # send、media 或 bind 都依赖 upload：如果指定了任一参数，自动启用 upload
@@ -182,7 +182,7 @@ module Pindo
           # 获取 JPS 配置
           app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
             working_directory: pindo_project_dir,
-            proj_name: @args_proj_name,
+            conf: @args_conf,
             package_type: 'apk'
           )
 
@@ -260,7 +260,7 @@ module Pindo
 
               # 2.3 Unity 导出任务（依赖上一个任务）
               unity_context = {}
-              unity_context[:project_name] = @args_proj_name if @args_proj_name
+              unity_context[:project_name] = nil
 
               unity_export_task = Pindo::TaskSystem::UnityExportTask.new(
                 'android',
@@ -285,7 +285,7 @@ module Pindo
             build_options = {
               project_path: android_project_path,
               bundle_name: config[:bundle_name],
-              proj_name: @args_proj_name,
+              conf: @args_conf,
               app_info_obj: config[:app_info_obj],
               workflow_info: config[:workflow_info],
               # Git 版本参数
@@ -320,7 +320,7 @@ module Pindo
                 nil,
                 app_info_obj: config[:app_info_obj],
                 workflow_info: config[:workflow_info],
-                project_name: @args_proj_name
+                project_name: nil
               )
               upload_task.dependencies << build_task.id
               tasks << upload_task
@@ -330,7 +330,7 @@ module Pindo
               message_task = Pindo::TaskSystem::JPSMessageTask.new(
                 nil,  # app_version_info 为 nil，从依赖任务获取
                 app_info_obj: config[:app_info_obj],
-                project_name: @args_proj_name,
+                project_name: nil,
                 send_message_type: 'self'  # 固定发送给自己
               )
               message_task.dependencies << upload_task.id
@@ -342,7 +342,7 @@ module Pindo
               # 获取 Git 管理类型的工作流（不同于 APK 上传的工作流）
               git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
                 working_directory: config[:project_path],
-                proj_name: @args_proj_name,
+                conf: @args_conf,
                 package_type: nil,  # package_type 在 manage_type=git 时会被忽略
                 manage_type: "git"
               )
@@ -352,7 +352,7 @@ module Pindo
                 config[:project_path],  # upload_path
                 app_info_obj: git_app_info_obj,
                 workflow_info: git_workflow_info,
-                project_name: @args_proj_name
+                project_name: nil
               )
               # 依赖 Git 提交任务
               media_upload_task.dependencies << git_commit_task.id
@@ -367,7 +367,7 @@ module Pindo
                 project_dir: config[:project_path],
                 app_info_obj: config[:app_info_obj],
                 workflow_info: config[:workflow_info],
-                project_name: @args_proj_name
+                project_name: nil
               )
               # 依赖上传任务和 Git 提交任务
               bind_package_task.dependencies << upload_task.id
@@ -380,7 +380,7 @@ module Pindo
               # 获取 Git 工作流信息
               git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
                 working_directory: config[:project_path],
-                proj_name: @args_proj_name,
+                conf: @args_conf,
                 package_type: nil,
                 manage_type: "git"
               )

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

@@ -79,7 +79,7 @@ module Pindo
           @option_items ||= begin
             items = Pindo::Options::OptionGroup.merge(
               Pindo::Options::BuildOptions.select(:bundleid),
-              Pindo::Options::JPSOptions.select(:proj, :upload, :send),
+              Pindo::Options::JPSOptions.select(:conf, :upload, :send),
               Pindo::Options::UnityOptions.all
             )
 
@@ -114,7 +114,7 @@ module Pindo
           @args_send_flag = @options[:send]
           # send 依赖 upload：如果指定了 send，自动启用 upload
           @args_upload_flag = @options[:send] || @options[:upload]
-          @args_proj_name = @options[:proj]
+          @args_conf = @options[:conf]
           @args_increase_flag = @options[:increase]
           @args_skip_config = argv.flag?('skipconfig', false)
           @args_skip_lib = argv.flag?('skiplib', false)
@@ -256,7 +256,7 @@ module Pindo
 
               # 1.4 Unity 导出任务（依赖上一个任务）
               unity_context = {}
-              unity_context[:project_name] = @args_proj_name if @args_proj_name
+              unity_context[:project_name] = nil
 
               unity_export_task = Pindo::TaskSystem::UnityExportTask.new(
                 'ios',
@@ -281,7 +281,6 @@ module Pindo
 
             build_options = {
               project_path: ios_project_path,
-              proj_name: @args_proj_name,
               upload: @args_upload_flag,
               send: @args_send_flag
             }
@@ -304,7 +303,7 @@ module Pindo
                 nil,
                 app_info_obj: config[:app_info_obj],
                 workflow_info: config[:workflow_info],
-                project_name: @args_proj_name,
+                project_name: nil,
                 upload_desc: "AdHoc 包",
                 context: {
                   send_to_chat: @args_send_flag
@@ -334,15 +333,12 @@ module Pindo
             # 忽略错误，proj_name 保持为 nil
           end
 
-          # 如果有命令行参数的 proj_name，优先使用
-          proj_name = @args_proj_name if @args_proj_name && !@args_proj_name.empty?
-
           # 只在需要上传时获取 JPS 配置
           if @args_upload_flag
             app_info_obj, workflow_info = PgyerHelper.share_instace.get_adhoc_upload_info(
               working_directory: pindo_project_dir,
               package_type: 'ipa',
-              proj_name: proj_name
+              conf: @args_conf
             )
           else
             app_info_obj = nil

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

@@ -85,7 +85,7 @@ module Pindo
             ))
 
             # 合并 JPSOptions
-            items.concat(Pindo::Options::JPSOptions.select(:proj, :upload, :send))
+            items.concat(Pindo::Options::JPSOptions.select(:conf, :upload, :send))
 
             items
           end
@@ -109,7 +109,7 @@ module Pindo
           # JPS 参数
           @args_upload_flag = @options[:send] || @options[:upload]
           @args_send_flag = @options[:send]
-          @args_proj_name = @options[:proj]
+          @args_conf = @options[:conf]
 
           # 证书快捷参数
           @args_adhoc_flag = @options[:adhoc]
@@ -294,13 +294,10 @@ module Pindo
             # 只使用命令行参数的 proj_name，不从 config.json 获取
             # skip_config_file: true 会跳过从 config.json 读取项目名称
             # 这样如果用户没有指定 --proj，会直接提示用户输入
-            proj_name = @args_proj_name
-
             app_info_obj, workflow_info = PgyerHelper.share_instace.get_adhoc_upload_info(
               working_directory: Dir.pwd,
               package_type: 'ipa',
-              proj_name: proj_name,
-              skip_config_file: true
+              conf: @args_conf
             )
             return [app_info_obj, workflow_info]
           end
@@ -339,7 +336,7 @@ module Pindo
               resigned_ipa_file,                # upload_file（明确指定重签名后的文件）
               app_info_obj: app_info_obj,
               workflow_info: workflow_info,
-              project_name: @args_proj_name,
+              project_name: nil,
               upload_desc: "重签名包",           # 上传描述
               context: {
                 send_to_chat: @args_send_flag

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

@@ -100,7 +100,7 @@ module Pindo
                 def self.option_items
                     @option_items ||= Pindo::Options::OptionGroup.merge(
                         Pindo::Options::BuildOptions.select(:bundleid, :build_type),
-                        Pindo::Options::JPSOptions.select(:proj, :upload, :media, :bind, :send),
+                        Pindo::Options::JPSOptions.select(:conf, :upload, :media, :bind, :send),
                         Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
                         Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
                         Pindo::Options::TaskOptions.select(:multi),
@@ -117,7 +117,7 @@ module Pindo
                     @options = initialize_options(argv)
 
                     # 保存参数到实例变量
-                    @args_proj_name = @options[:proj]
+                    @args_conf = @options[:conf]
                     @args_bundle_id = @options[:bundleid]
                     @build_type = @options[:build_type] || 'dev'
 
@@ -273,7 +273,7 @@ module Pindo
 
                             # 2.3 Unity 导出任务（依赖上一个任务）
                             unity_context = {}
-                            unity_context[:project_name] = @args_proj_name if @args_proj_name
+                            unity_context[:project_name] = nil
 
                             unity_export_task = Pindo::TaskSystem::UnityExportTask.new(
                                 'ios',
@@ -299,7 +299,6 @@ module Pindo
                         build_options = {
                             project_path: ios_project_path,
                             bundle_id: config[:bundle_id],
-                            proj_name: @args_proj_name,
                             app_info_obj: config[:app_info_obj],
                             workflow_info: config[:workflow_info],
                             # Git 版本参数
@@ -339,7 +338,7 @@ module Pindo
                                 nil,
                                 app_info_obj: config[:app_info_obj],
                                 workflow_info: config[:workflow_info],
-                                project_name: @args_proj_name
+                                project_name: nil
                             )
                             upload_task.dependencies << build_task.id
                             tasks << upload_task
@@ -349,7 +348,7 @@ module Pindo
                             message_task = Pindo::TaskSystem::JPSMessageTask.new(
                                 nil,  # app_version_info 为 nil，从依赖任务获取
                                 app_info_obj: config[:app_info_obj],
-                                project_name: @args_proj_name,
+                                project_name: nil,
                                 send_message_type: 'self'  # 固定发送给自己
                             )
                             message_task.dependencies << upload_task.id
@@ -362,7 +361,7 @@ module Pindo
                                 # 获取 Git 管理类型的工作流（不同于 IPA 上传的工作流）
                                 git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
                                     working_directory: config[:project_path],
-                                    proj_name: @args_proj_name,
+                                    conf: @args_conf,
                                     package_type: nil,  # package_type 在 manage_type=git 时会被忽略
                                     manage_type: "git"
                                 )
@@ -372,7 +371,7 @@ module Pindo
                                     config[:project_path],  # upload_path
                                     app_info_obj: git_app_info_obj,
                                     workflow_info: git_workflow_info,
-                                    project_name: @args_proj_name
+                                    project_name: nil
                                 )
                                 # 依赖 Git 提交任务
                                 media_upload_task.dependencies << git_commit_task.id
@@ -394,7 +393,7 @@ module Pindo
                                 project_dir: config[:project_path],
                                 app_info_obj: config[:app_info_obj],
                                 workflow_info: config[:workflow_info],
-                                project_name: @args_proj_name
+                                project_name: nil
                             )
                             # 依赖上传任务和 Git 提交任务
                             bind_package_task.dependencies << upload_task.id
@@ -407,7 +406,7 @@ module Pindo
                             # 获取 Git 工作流信息
                             git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
                                 working_directory: config[:project_path],
-                                proj_name: @args_proj_name,
+                                conf: @args_conf,
                                 package_type: nil,
                                 manage_type: "git"
                             )
@@ -449,7 +448,7 @@ module Pindo
 
                     app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: pindo_project_dir,
-                        proj_name: @args_proj_name,
+                        conf: @args_conf,
                         package_type: package_type
                     )
 

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

@@ -82,7 +82,7 @@ module Pindo
                         ))
 
                         # 合并 JPSOptions
-                        items.concat(Pindo::Options::JPSOptions.select(:proj, :upload, :send))
+                        items.concat(Pindo::Options::JPSOptions.select(:conf, :upload, :send))
 
                         items
                     end
@@ -109,7 +109,7 @@ module Pindo
                     # JPS 参数（从 options 中获取）
                     @args_upload_flag = @options[:upload]
                     @args_send_flag = @options[:send]
-                    @args_proj_name = @options[:proj]
+                    @args_conf = @options[:conf]
 
                     # 如果设置了 send，自动启用 upload
                     if @args_send_flag
@@ -279,13 +279,12 @@ module Pindo
                 # 准备 JPS 配置
                 def prepare_jps_config
                     if @args_upload_flag
-                        proj_name = @args_proj_name
                         # 根据 Xcode 工程类型动态设置 package_type（macOS 工程使用 'mac'，否则使用 'ipa'）
                         is_macos = Pindo::BuildHelper.share_instance.macos_project?(Dir.pwd)
                         package_type = is_macos ? 'mac' : 'ipa'
                         app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                             working_directory: Dir.pwd,
-                            proj_name: proj_name,
+                            conf: @args_conf,
                             package_type: package_type
                         )
                         return [app_info_obj, workflow_info]
@@ -329,7 +328,7 @@ module Pindo
                             resigned_ipa_file,
                             app_info_obj: app_info_obj,
                             workflow_info: workflow_info,
-                            project_name: @args_proj_name,
+                            project_name: nil,
                             upload_desc: "重签名包",
                             context: {
                                 send_to_chat: @args_send_flag

data/lib/pindo/command/jps/apptest.rb

@@ -37,7 +37,7 @@ module Pindo
                 # 定义此命令使用的参数项
                 def self.option_items
                   @option_items ||= Pindo::Options::OptionGroup.merge(
-                    Pindo::Options::JPSOptions.select(:proj, :send, :list, :group)
+                    Pindo::Options::JPSOptions.select(:conf, :send, :list, :group)
                   )
                 end
 
@@ -50,7 +50,7 @@ module Pindo
                     @options = initialize_options(argv)
 
                     # JPS 参数
-                    @args_proj_name = @options[:proj]
+                    @args_conf = @options[:conf]
                     @args_list_flag = @options[:list] || false
                     @args_send_flag = @options[:send] || false
                     @args_group_flag = @options[:group] || false
@@ -71,12 +71,12 @@ module Pindo
 
                     app_info_obj, workflow_info = pgyer_helper.prepare_upload(
                         working_directory: project_path,
-                        proj_name: @args_proj_name,
+                        conf: @args_conf,
                         package_type: 'ipa'  # 获取 IPA 工作流信息
                     )
 
                     if app_info_obj.nil?
-                        raise Informative, "#{@args_proj_name} 错误，请输入正确的 App 代号名称"
+                        raise Informative, "未找到 JPS 项目，请检查配置文件或重新选择"
                     end
 
                     # 2. 获取版本信息
@@ -103,7 +103,7 @@ module Pindo
                     message_task = Pindo::TaskSystem::JPSMessageTask.new(
                         version_item_obj,  # app_version_info
                         app_info_obj: app_info_obj,
-                        project_name: @args_proj_name,
+                        project_name: nil,
                         send_message_type: message_type
                     )
                     tasks << message_task
@@ -113,7 +113,7 @@ module Pindo
                         # 获取 Git 工作流信息
                         git_app_info_obj, git_workflow_info = pgyer_helper.prepare_upload(
                             working_directory: project_path,
-                            proj_name: @args_proj_name,
+                            conf: @args_conf,
                             package_type: nil,
                             manage_type: "git"
                         )

data/lib/pindo/command/jps/bind.rb

@@ -37,7 +37,7 @@ module Pindo
                 # 定义此命令使用的参数项
                 def self.option_items
                   @option_items ||= Pindo::Options::OptionGroup.merge(
-                    Pindo::Options::JPSOptions.select(:proj),
+                    Pindo::Options::JPSOptions.select(:conf),
                     Pindo::Options::TaskOptions.select(:select),
                     Pindo::Options::GitOptions.all
                   )
@@ -52,7 +52,7 @@ module Pindo
                     @options = initialize_options(argv)
 
                     # JPS 参数
-                    @args_proj_name = @options[:proj]
+                    @args_conf = @options[:conf]
 
                     # Task 参数
                     @args_select_flag = @options[:select] || false
@@ -93,13 +93,13 @@ module Pindo
 
                     app_info_obj, git_workflow_info = pgyer_helper.prepare_upload(
                         working_directory: project_path,
-                        proj_name: @args_proj_name,
+                        conf: @args_conf,
                         package_type: nil,
                         manage_type: "git"
                     )
 
                     if app_info_obj.nil?
-                        raise Informative, "#{@args_proj_name} 错误，请输入正确的App代号名称"
+                        raise Informative, "未找到 JPS 项目，请检查配置文件或重新选择"
                     end
 
                     project_id = app_info_obj["id"]
@@ -153,7 +153,7 @@ module Pindo
                             project_dir: project_path,
                             app_info_obj: app_info_obj,
                             workflow_info: git_workflow_info,
-                            project_name: @args_proj_name
+                            project_name: nil
                         }
                     )
                     bind_task.dependencies << git_commit_task.id

data/lib/pindo/command/jps/download.rb

@@ -38,7 +38,7 @@ module Pindo
                   [
                     ['--login', '强制再次登录jps网站'],
                     ['--list', '列出上传记录并选择，用法：pindo jps download --list'],
-                    ['--proj', '指定哪个项目(忽略大小写空格等等字符),用法：pindo jps download --proj=prancksoundv4'],
+                    ['--conf', '指定 JPSBuildConfig.json 配置文件路径，用法：pindo jps download --conf=./JPSBuildConfig.json'],
                   ].concat(super)
                 end
 
@@ -47,7 +47,7 @@ module Pindo
 
                     @args_login_flag = argv.flag?('login', false)
                     @args_list_flag = argv.flag?('list', false)
-                    @args_proj_name = argv.option('proj')
+                    @args_conf = argv.option('conf')
                     @app_version_index = argv.option('index') || nil
 
                     super(argv)
@@ -62,10 +62,10 @@ module Pindo
                 def run
 
                     PgyerHelper.share_instace.setForeLogin(beforeLogin:@args_login_flag)
-                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:@args_proj_name)
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, conf:@args_conf)
 
                     if app_info_obj.nil?
-                        raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， jps网站没有该App"
+                        raise Informative, "未找到 JPS 项目，请检查配置文件或重新选择"
                     end
 
                     version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(app_info_obj:app_info_obj, list_select_flat:@args_list_flag)

data/lib/pindo/command/jps/media.rb

@@ -44,7 +44,7 @@ module Pindo
                 # 定义此命令使用的参数项
                 def self.option_items
                   @option_items ||= Pindo::Options::OptionGroup.merge(
-                    Pindo::Options::JPSOptions.select(:proj),
+                    Pindo::Options::JPSOptions.select(:conf),
                     Pindo::Options::TaskOptions.select(:select),
                     Pindo::Options::GitOptions.all
                   )
@@ -65,7 +65,7 @@ module Pindo
                     @options = initialize_options(argv)
 
                     # JPS 参数
-                    @args_proj_name = @options[:proj]
+                    @args_conf = @options[:conf]
 
                     # Task 参数
                     @args_select_flag = @options[:select] || false
@@ -104,13 +104,13 @@ module Pindo
                     # 使用 manage_type: "git" 来获取 git 管理类型的工作流
                     app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: project_path,
-                        proj_name: @args_proj_name,
+                        conf: @args_conf,
                         package_type: nil,  # package_type 在 manage_type=git 时会被忽略
                         manage_type: "git"
                     )
 
                     if app_info_obj.nil?
-                        raise Informative, "#{@args_proj_name} 错误，请输入正确的App代号名称"
+                        raise Informative, "未找到 JPS 项目，请检查配置文件或重新选择"
                     end
 
                     # 获取 workflow_id
@@ -147,7 +147,7 @@ module Pindo
                         project_path,  # upload_path
                         app_info_obj: app_info_obj,
                         workflow_info: workflow_info,
-                        project_name: @args_proj_name,
+                        project_name: nil,
                         git_commit_id: selected_commit_info&.dig(:commit_id),
                         git_commit_time: selected_commit_info&.dig(:commit_time),
                         git_commit_desc: selected_commit_info&.dig(:commit_desc)

data/lib/pindo/command/jps/resign.rb

@@ -40,7 +40,7 @@ module Pindo
                 # 定义此命令使用的参数项
                 def self.option_items
                   @option_items ||= Pindo::Options::OptionGroup.merge(
-                    Pindo::Options::JPSOptions.select(:proj, :send, :list),
+                    Pindo::Options::JPSOptions.select(:conf, :send, :list),
                     Pindo::Options::BuildOptions.select(:bundleid)
                   )
                 end
@@ -54,7 +54,7 @@ module Pindo
                     @options = initialize_options(argv)
 
                     # JPS 参数
-                    @args_proj_name = @options[:proj]
+                    @args_conf = @options[:conf]
                     @args_list_flag = @options[:list] || false
                     @args_send_flag = @options[:send] || false
 
@@ -80,12 +80,12 @@ module Pindo
 
                     # app_info_obj, workflow_info = pgyer_helper.prepare_upload(
                     #     working_directory: project_path,
-                    #     proj_name: @args_proj_name,
+                    #     conf: @args_conf,
                     #     package_type: 'ipa'  # 获取 IPA 工作流信息
                     # )
 
                     # if app_info_obj.nil?
-                    #     raise Informative, "#{@args_proj_name} 错误，请输入正确的 App 代号名称"
+                    #     raise Informative, "未找到 JPS 项目，请检查配置文件或重新选择"
                     # end
 
                     # # 2. 创建任务
@@ -94,7 +94,7 @@ module Pindo
                     # # 2.1 创建重签名任务
                     # resign_task = Pindo::TaskSystem::JPSResignTask.new(
                     #     app_info_obj: app_info_obj,
-                    #     project_name: @args_proj_name,
+                    #     project_name: nil,
                     #     cert_id: @args_bundle_id,  # 使用 bundleid 参数
                     #     list_flag: @args_list_flag
                     # )
@@ -104,7 +104,7 @@ module Pindo
                     # message_task = Pindo::TaskSystem::JPSMessageTask.new(
                     #     nil,  # app_version_info 为 nil，从依赖任务获取
                     #     app_info_obj: app_info_obj,
-                    #     project_name: @args_proj_name,
+                    #     project_name: nil,
                     #     send_message_type: 'self',
                     #     dependencies: [resign_task.id]
                     # )
@@ -115,7 +115,7 @@ module Pindo
                     #     # 获取 Git 工作流信息
                     #     git_app_info_obj, git_workflow_info = pgyer_helper.prepare_upload(
                     #         working_directory: project_path,
-                    #         proj_name: @args_proj_name,
+                    #         conf: @args_conf,
                     #         package_type: "",
                     #         manage_type: "git"
                     #     )

data/lib/pindo/command/jps/upload.rb

@@ -59,7 +59,7 @@ module Pindo
                 # 定义此命令使用的参数项
                 def self.option_items
                   @option_items ||= Pindo::Options::OptionGroup.merge(
-                    Pindo::Options::JPSOptions.select(:proj, :send, :desc, :resign),
+                    Pindo::Options::JPSOptions.select(:conf, :send, :desc, :resign),
                     Pindo::Options::GitOptions.all
                   )
                 end
@@ -91,7 +91,7 @@ module Pindo
                     @options = initialize_options(argv)
 
                     # JPS 参数
-                    @args_proj_name = @options[:proj]
+                    @args_conf = @options[:conf]
                     @args_send_flag = @options[:send] || false
                     @args_resign_flag = @options[:resign] || false
                     @args_upload_desc = @options[:desc]
@@ -145,8 +145,8 @@ module Pindo
                         if !@args_cert_id.nil? && !@args_cert_id.empty?
                             args << "--certid=#{@args_cert_id}"
                         end
-                        if !@args_proj_name.nil? && !@args_proj_name.empty?
-                            args << "--proj=#{@args_proj_name}"
+                        if !@args_conf.nil? && !@args_conf.empty?
+                            args << "--conf=#{@args_conf}"
                         end
                         Pindo::Command::Jps::Resign::run(args)
                     end
@@ -196,7 +196,7 @@ module Pindo
                         message_task = Pindo::TaskSystem::JPSMessageTask.new(
                             nil,  # app_version_info 为 nil，从 upload_task 依赖任务获取
                             app_info_obj: upload_task.app_info_obj,
-                            project_name: @args_proj_name,
+                            project_name: nil,
                             send_message_type: @args_send_flag ? 'group' : 'self',
                             dependencies: [upload_task.id]  # 依赖对应的上传任务
                         )
@@ -477,12 +477,12 @@ module Pindo
                     # 提前获取 JPS 配置（app_info_obj 和 workflow_info）
                     app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: Dir.pwd,
-                        proj_name: @args_proj_name,
+                        conf: @args_conf,
                         package_type: package_type
                     )
 
                     if app_info_obj.nil?
-                        raise Informative, "#{@args_proj_name} 错误， 请输入正确的App代号名称， jps网站没有该App"
+                        raise Informative, "未找到 JPS 项目，请检查配置文件或重新选择"
                     end
 
                     # 创建 JPSUploadTask
@@ -492,7 +492,7 @@ module Pindo
                         upload_file,
                         app_info_obj: app_info_obj,
                         workflow_info: workflow_info,
-                        project_name: @args_proj_name,
+                        project_name: nil,
                         upload_desc: @args_upload_desc,
                         context: {
                             send_to_chat: @args_send_flag

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

@@ -100,7 +100,7 @@ module Pindo
                 def self.option_items
                     @option_items ||= Pindo::Options::OptionGroup.merge(
                         Pindo::Options::BuildOptions.select(:bundleid, :bundle_name),  # 添加 bundleid 和 bundle_name 参数
-                        Pindo::Options::JPSOptions.select(:proj, :upload, :send, :media, :bind),
+                        Pindo::Options::JPSOptions.select(:conf, :upload, :send, :media, :bind),
                         Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
                         Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
                         Pindo::Options::TaskOptions.select(:multi),
@@ -122,7 +122,7 @@ module Pindo
                 def initialize(argv)
                     @options = initialize_options(argv)
 
-                    @args_proj_name = @options[:proj]
+                    @args_conf = @options[:conf]
                     @args_adhoc_flag = argv.flag?('adhoc', false)
                     @args_deploy_flag = argv.flag?('deploy', false)
                     @args_release_flag = argv.flag?('release', false)
@@ -360,7 +360,7 @@ module Pindo
                         # 获取 Git 工作流信息（media、绑定、消息任务都需要）
                         git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
                             working_directory: Dir.pwd,
-                            proj_name: all_platform_configs["project_name"],
+                            conf: @args_conf,
                             package_type: nil,  # package_type 在 manage_type=git 时会被忽略
                             manage_type: "git"
                         )
@@ -474,7 +474,6 @@ module Pindo
 
                     # 准备构建选项
                     build_options = {
-                        proj_name: all_platform_configs["project_name"],
                         app_info_obj: all_platform_configs["app_info_obj"],      # 共享的项目信息
                         workflow_info: platform_config["workflow_info"],     # 平台特定的工作流
                         project_path: platform_path,
@@ -581,7 +580,7 @@ module Pindo
                         # 获取当前平台的 JPS 配置
                         app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                             working_directory: Dir.pwd,
-                            proj_name: @args_proj_name,
+                            conf: @args_conf,
                             package_type: package_type
                         )
 

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

@@ -93,7 +93,7 @@ module Pindo
                 def self.option_items
                     @option_items ||= Pindo::Options::OptionGroup.merge(
                         Pindo::Options::BuildOptions.select(:bundleid),  # 添加 bundleid 参数
-                        Pindo::Options::JPSOptions.select(:proj, :upload, :send, :media, :bind),
+                        Pindo::Options::JPSOptions.select(:conf, :upload, :send, :media, :bind),
                         Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
                         Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
                         Pindo::Options::TaskOptions.select(:multi),
@@ -113,7 +113,7 @@ module Pindo
 
                     @args_deploy_flag = argv.flag?('deploy', false)
                     @args_adhoc_flag = argv.flag?('adhoc', false)
-                    @args_proj_name = @options[:proj]
+                    @args_conf = @options[:conf]
                     @args_bundle_id = @options[:bundleid]  # 从 @options 获取，确保能被缓存
                     @args_run_flag = argv.flag?('run', false)
 
@@ -188,7 +188,7 @@ module Pindo
                   # 获取 JPS 配置
                   app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                     working_directory: pindo_project_dir,
-                    proj_name: @args_proj_name,
+                    conf: @args_conf,
                     package_type: 'zip'
                   )
 
@@ -303,7 +303,7 @@ module Pindo
                     web_export_path = File.join(config[:project_path], "GoodPlatform", "WebGL")
 
                     unity_context = {}
-                    unity_context[:project_name] = @args_proj_name if @args_proj_name
+                    unity_context[:project_name] = nil
                     unity_context[:index_count] = config[:index_count]
 
                     unity_export_task = Pindo::TaskSystem::UnityExportTask.new(
@@ -321,7 +321,7 @@ module Pindo
                       mode: :dev,
                       options: {
                         project_path: config[:project_path],
-                        proj_name: @args_proj_name,
+                        conf: @args_conf,
                         app_info_obj: config[:app_info_obj],
                         workflow_info: config[:workflow_info]
                       }
@@ -342,7 +342,7 @@ module Pindo
                         nil,
                         app_info_obj: config[:app_info_obj],
                         workflow_info: config[:workflow_info],
-                        project_name: @args_proj_name
+                        project_name: nil
                       )
                       upload_task.dependencies << build_task.id
                       tasks << upload_task
@@ -352,7 +352,7 @@ module Pindo
                       message_task = Pindo::TaskSystem::JPSMessageTask.new(
                         nil,  # app_version_info 为 nil，从依赖任务获取
                         app_info_obj: config[:app_info_obj],
-                        project_name: @args_proj_name,
+                        project_name: nil,
                         send_message_type: 'self'  # 固定发送给自己
                       )
                       message_task.dependencies << upload_task.id
@@ -364,7 +364,7 @@ module Pindo
                       # 获取 Git 管理类型的工作流（不同于 HTML 上传的工作流）
                       git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: config[:project_path],
-                        proj_name: @args_proj_name,
+                        conf: @args_conf,
                         package_type: nil,  # package_type 在 manage_type=git 时会被忽略
                         manage_type: "git"
                       )
@@ -374,7 +374,7 @@ module Pindo
                         config[:project_path],  # upload_path
                         app_info_obj: git_app_info_obj,
                         workflow_info: git_workflow_info,
-                        project_name: @args_proj_name
+                        project_name: nil
                       )
                       # 依赖 Git 提交任务
                       media_upload_task.dependencies << git_commit_task.id
@@ -389,7 +389,7 @@ module Pindo
                         project_dir: config[:project_path],
                         app_info_obj: config[:app_info_obj],
                         workflow_info: config[:workflow_info],
-                        project_name: @args_proj_name
+                        project_name: nil
                       )
                       # 依赖上传任务和 Git 提交任务
                       bind_package_task.dependencies << upload_task.id
@@ -402,7 +402,7 @@ module Pindo
                       # 获取 Git 工作流信息
                       git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: config[:project_path],
-                        proj_name: @args_proj_name,
+                        conf: @args_conf,
                         package_type: nil,
                         manage_type: "git"
                       )

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -55,10 +55,10 @@ module Pindo
         #   - project_name [String] 项目名称
         #   - project_id [String] 项目ID
         #   - workflow_info [Hash] 工作流信息（如果有效）
-        def try_load_jps_build_config(working_directory:, package_type:, manage_type: "")
+        def try_load_jps_build_config(config_file:, package_type:, manage_type: "")
           if ENV['PINDO_DEBUG']
             puts "\n[PINDO_DEBUG] try_load_jps_build_config 调用:"
-            puts "  working_directory: #{working_directory}"
+            puts "  config_file: #{config_file}"
             puts "  package_type: #{package_type.inspect}"
             puts "  manage_type: #{manage_type.inspect}"
           end
@@ -70,9 +70,6 @@ module Pindo
             workflow_info: nil
           }
 
-          # 1. 确定配置文件路径
-          config_file = determine_config_file_path(working_directory)
-
           if ENV['PINDO_DEBUG']
             puts "[PINDO_DEBUG] 配置文件路径: #{config_file}"
             puts "[PINDO_DEBUG] 文件存在: #{File.exist?(config_file)}"
@@ -392,17 +389,28 @@ module Pindo
         # @param proj_name [String] 项目名称（可选）
         # @param skip_config_file [Boolean] 是否跳过从 config.json 获取项目名称（默认 false）
         # @return [Array] [app_info_obj, workflow_info]
-        def get_adhoc_upload_info(working_directory:, package_type:, proj_name: nil, skip_config_file: false)
-          upload_proj_name = proj_name
+        def get_adhoc_upload_info(working_directory:, package_type:, conf: nil)
+          # 确定配置文件路径
+          config_path = if conf && !conf.empty?
+            File.expand_path(conf)
+          else
+            determine_config_file_path(working_directory)
+          end
 
-          # 1. 项目名称获取逻辑
-          # 1.1 如果 proj_name 为空，从环境变量获取
-          if upload_proj_name.nil? || upload_proj_name.empty?
-            upload_proj_name = ENV['PINDO_PROJECT_NAME']
+          upload_proj_name = nil
+
+          # 尝试从配置文件读取项目名称
+          if File.exist?(config_path)
+            begin
+              config = JSON.parse(File.read(config_path))
+              upload_proj_name = config['project_name']
+            rescue => e
+              puts "[get_adhoc_upload_info] 配置文件解析失败: #{e.message}"
+            end
           end
 
-          # 1.2 如果仍为空且未禁用，从 IosConfigParser 获取
-          if (upload_proj_name.nil? || upload_proj_name.empty?) && !skip_config_file
+          # 配置文件中没有，从 IosConfigParser 获取
+          if upload_proj_name.nil? || upload_proj_name.empty?
             require 'pindo/config/ios_config_parser'
             config_parser = Pindo::IosConfigParser.instance
             if config_parser.config_json
@@ -410,7 +418,7 @@ module Pindo
             end
           end
 
-          # 1.3 如果还是为空，让用户输入
+          # 仍为空，让用户输入
           if upload_proj_name.nil? || upload_proj_name.empty?
             require 'highline/import'
             puts "\n未找到项目名称配置"
@@ -421,12 +429,12 @@ module Pindo
             upload_proj_name = upload_proj_name.strip if upload_proj_name
           end
 
-          # 2. 确保已登录
+          # 确保已登录
           unless login
             raise Informative, "请先登录 JPS 网站"
           end
 
-          # 3. 获取 app_info_obj
+          # 获取 app_info_obj
           app_info_obj = find_app_info_with_obj_list(proj_name: upload_proj_name)
 
           unless app_info_obj
@@ -454,34 +462,30 @@ module Pindo
           return app_info_obj, workflow_info
         end
 
-        def prepare_upload(working_directory:nil, proj_name:nil, package_type:nil, manage_type: "")
+        def prepare_upload(working_directory:nil, conf:nil, package_type:nil, manage_type: "")
+            working_directory ||= Dir.pwd
+
             if ENV['PINDO_DEBUG']
               puts "\n[PINDO_DEBUG] prepare_upload 调用参数:"
               puts "  working_directory: #{working_directory}"
-              puts "  proj_name: #{proj_name.inspect}"
+              puts "  conf: #{conf.inspect}"
               puts "  package_type: #{package_type.inspect}"
               puts "  manage_type: #{manage_type.inspect}"
             end
 
-            upload_proj_name = proj_name
-            if upload_proj_name.nil? || upload_proj_name.empty?
-                upload_proj_name = @proj_name
+            # 确定配置文件路径：显式指定 > 工作目录自动检测 > 工程目录自动检测
+            config_path = if conf && !conf.empty?
+              File.expand_path(conf)
+            else
+              determine_config_file_path(working_directory)
             end
 
-            # 检查环境变量
-            env_project_name = ENV['PINDO_PROJECT_NAME']
-            if env_project_name && !env_project_name.empty?
-                upload_proj_name = env_project_name
-                puts "\n使用环境变量指定的项目名称: #{upload_proj_name}"
-                puts
-            end
+            puts "[PINDO_DEBUG] 使用配置文件: #{config_path}" if ENV['PINDO_DEBUG']
 
-            # 【核心优化】尝试从 JPSBuildConfig.json 加载配置
+            # 尝试从配置文件加载
             if package_type || manage_type
-              puts "[PINDO_DEBUG] 准备加载配置文件 (package_type=#{package_type.inspect}, manage_type=#{manage_type.inspect})" if ENV['PINDO_DEBUG']
-
               config_result = try_load_jps_build_config(
-                working_directory: working_directory,
+                config_file: config_path,
                 package_type: package_type,
                 manage_type: manage_type
               )
@@ -489,7 +493,6 @@ module Pindo
               puts "[PINDO_DEBUG] 配置加载结果: valid=#{config_result[:valid]}" if ENV['PINDO_DEBUG']
 
               if config_result[:valid]
-                # 配置有效，直接使用
                 puts "\n使用 JPSBuildConfig.json 配置:"
                 puts "  项目: #{config_result[:project_name]}"
                 puts "  工作流: #{config_result[:workflow_info][:tab_name]}"
@@ -501,12 +504,10 @@ module Pindo
                   puts "  workflow_info: #{config_result[:workflow_info].inspect}"
                 end
 
-                # 确保已登录
                 unless login
                   raise Informative, "请先登录JPS网站"
                 end
 
-                # 获取完整的 app_info_obj
                 puts "[PINDO_DEBUG] 正在查找项目: #{config_result[:project_name]}" if ENV['PINDO_DEBUG']
                 app_info_obj = find_app_info_with_obj_list(
                   proj_name: config_result[:project_name]
@@ -523,25 +524,15 @@ module Pindo
               else
                 puts "[PINDO_DEBUG] 配置无效，进入交互选择流程" if ENV['PINDO_DEBUG']
               end
-            else
-              puts "[PINDO_DEBUG] 跳过配置加载（package_type 和 manage_type 都为空）" if ENV['PINDO_DEBUG']
             end
 
             # ===== 配置无效或不存在，进入用户选择流程 =====
 
+            upload_proj_name = nil
             app_info_obj = nil
             if login
 
-                if !upload_proj_name.nil?
-                    app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:upload_proj_name)
-                end
-
                 if !app_info_obj.nil?
-                    # 如果使用环境变量找到了项目，保存到 GlobalOptionsState
-                    if env_project_name && !env_project_name.empty?
-                        Pindo::Options::GlobalOptionsState.instance[:proj] = upload_proj_name
-                    end
-
                     # 如果提供了 package_type 或 manage_type，选择工作流并保存配置
                     if package_type || manage_type
                       workflow_info = select_workflow_for_project(
@@ -618,16 +609,12 @@ module Pindo
                 proj_name_array.uniq
                 proj_name_array << "自定义输入JPS上的项目名称"
 
-                # 如果环境变量已经设置了项目名，跳过选择逻辑
-                if !(env_project_name && !env_project_name.empty?)
-                    # 检查 GlobalOptionsState 缓存
-                    cached_app_key = Pindo::Options::GlobalOptionsState.instance[:proj]
+                # 检查 GlobalOptionsState 缓存（上次交互选择的项目）
+                cached_app_key = Pindo::Options::GlobalOptionsState.instance[:proj]
 
-                    if cached_app_key && proj_name_array.include?(cached_app_key)
-                        puts "\n使用之前选择的JPS项目: #{cached_app_key}"
-                        upload_proj_name = cached_app_key
-                        # 直接使用缓存的选择，跳过后续选择逻辑
-                    end
+                if cached_app_key && proj_name_array.include?(cached_app_key)
+                    puts "\n使用之前选择的JPS项目: #{cached_app_key}"
+                    upload_proj_name = cached_app_key
                 end
 
                 # 只有在没有缓存或缓存无效，且没有环境变量时才显示选择菜单

data/lib/pindo/module/task/model/jps/jps_resign_task.rb

@@ -136,8 +136,7 @@ module Pindo
 
         # 重签名任务不需要 package_type，只获取 app_info_obj
         @app_info_obj = pgyer_helper.prepare_upload(
-          working_directory: working_directory,
-          proj_name: @project_name
+          working_directory: working_directory
         )
 
         unless @app_info_obj

data/lib/pindo/module/task/model/jps/jps_upload_task.rb

@@ -164,7 +164,6 @@ module Pindo
         # 上传任务需要 package_type 和 workflow_info
         @app_info_obj, @workflow_info = pgyer_helper.prepare_upload(
           working_directory: working_directory,
-          proj_name: @project_name,
           package_type: package_type
         )
 

data/lib/pindo/module/unity/nuget_helper.rb

@@ -648,10 +648,12 @@ module Pindo
 
           Dir.chdir(temp_dir)
 
-          # 过滤只保留符合规范的 commits（feat:, fix:, docs:, perf:, refactor:, style:, test:, chore:, revert:）
-          valid_prefixes = ['feat:', 'fix:', 'docs:', 'doc:', 'perf:', 'refactor:', 'style:', 'test:', 'chore:', 'revert:']
+          # 过滤只保留符合规范的 commits（支持带 scope 和不带 scope 格式）
+          # 匹配格式: feat:, feat(scope):, fix:, fix(api): 等
+          conventional_commit_regex = /^(feat|fix|docs|doc|perf|refactor|style|test|chore|revert)(\([^)]+\))?:/i
           filtered_commits = commits.select do |commit|
-            valid_prefixes.any? { |prefix| commit.downcase.start_with?(prefix) }
+            first_line = commit.lines.first&.strip || ""
+            conventional_commit_regex.match?(first_line)
           end
 
           # 如果没有符合规范的 commits，返回默认消息

data/lib/pindo/options/core/global_options_state.rb

@@ -107,7 +107,7 @@ module Pindo
         # 2. 构建配置
         :build_type, :scheme,
         # 3. JPS 相关
-        :proj, :upload, :send, :desc,
+        :conf, :upload, :send, :desc,
         # 4. Unity 相关
         :skipconfig, :skiplib, :skipyoo,
         # 5. Git 相关

data/lib/pindo/options/groups/jps_options.rb

@@ -10,15 +10,15 @@ module Pindo
 
       def self.all_options
         @all_options ||= {
-          proj: OptionItem.new(
-            key: :proj,
-            name: '项目名称',
-            description: '指定上传到测试平台的项目名称',
+          conf: OptionItem.new(
+            key: :conf,
+            name: '配置文件',
+            description: '指定 JPSBuildConfig.json 配置文件路径；不指定时自动从当前工作目录或工程目录查找',
             type: String,
-            env_name: 'PINDO_PROJECT_NAME',
+            env_name: 'PINDO_CONF_PATH',
             optional: true,
-            cacheable: true,  # 存入文件缓存
-            example: 'pindo ios autobuild --proj="My App"'
+            cacheable: false,
+            example: 'pindo ios autobuild --conf=./JPSBuildConfig.json'
           ),
 
           upload: OptionItem.new(

data/lib/pindo/version.rb

@@ -6,13 +6,13 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.17.0"
+  VERSION = "5.17.3"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'
     VERSION_INFO_FILE = File.expand_path('~/.pindo/version_info.yml')
     CHECK_INTERVAL = 5 * 60 * 60   # 5小时检查一次
-    CONFIG_MIN_VERSION = '1.4.0'  # 硬编码的配置版本要求
+    CONFIG_MIN_VERSION = '1.5.0'  # 硬编码的配置版本要求
 
     class << self
       # 主版本检查方法（保持向后兼容）

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.17.0
+  version: 5.17.3
 platform: ruby
 authors:
 - wade
@@ -112,7 +112,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement