pindo 5.14.4 → 5.14.5

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

@@ -1550,6 +1550,93 @@ module Pindo
             end
         end
 
+        # 绑定 Git commit 到项目包
+        #
+        # @param commit_id [String] Git commit SHA
+        # @param project_package_ids [Array<String>] 项目包 ID 数组
+        # @return [Hash] 绑定结果
+        def bind_commit_to_package(commit_id:, project_package_ids:)
+            if commit_id.nil? || commit_id.empty?
+                Funlog.instance.fancyinfo_error("commit_id 不能为空")
+                return { success: false, error: "commit_id 不能为空" }
+            end
+
+            if project_package_ids.nil? || project_package_ids.empty?
+                Funlog.instance.fancyinfo_error("project_package_ids 不能为空")
+                return { success: false, error: "project_package_ids 不能为空" }
+            end
+
+            begin
+                result = @pgyer_client.bind_commit_to_package(
+                    commitId: commit_id,
+                    projectPackageIds: project_package_ids
+                )
+
+                # 兼容两种响应格式
+                response_code = result&.dig("code") || result&.dig("meta", "code")
+
+                if result && (response_code == 0 || response_code == 200)
+                    return { success: true, result: result }
+                else
+                    error_msg = result&.dig("msg") || result&.dig("meta", "message") || result&.dig("message") || "未知错误"
+                    return { success: false, error: error_msg, result: result }
+                end
+            rescue => e
+                Funlog.instance.fancyinfo_error("绑定失败: #{e.message}")
+                return { success: false, error: e.message }
+            end
+        end
+
+        # 发送工作流消息（commit log 消息）
+        #
+        # @param project_id [String] 项目 ID
+        # @param workflow_id [Integer] 工作流 ID
+        # @param commit_id [String] Git commit SHA
+        # @param branch [String] 分支名（可选，默认 'master'）
+        # @param single [Boolean] 是否单个提交（可选，默认 true）
+        # @return [Hash] 发送结果
+        def send_workflow_message(project_id:, workflow_id:, commit_id:, branch: 'master', single: true)
+            if project_id.nil? || project_id.empty?
+                Funlog.instance.fancyinfo_error("project_id 不能为空")
+                return { success: false, error: "project_id 不能为空" }
+            end
+
+            if workflow_id.nil?
+                Funlog.instance.fancyinfo_error("workflow_id 不能为空")
+                return { success: false, error: "workflow_id 不能为空" }
+            end
+
+            if commit_id.nil? || commit_id.empty?
+                Funlog.instance.fancyinfo_error("commit_id 不能为空")
+                return { success: false, error: "commit_id 不能为空" }
+            end
+
+            begin
+                result = @pgyer_client.send_commit_log_message(
+                    projectId: project_id,
+                    workflowId: workflow_id,
+                    params: {
+                        single: single,
+                        branch: branch,
+                        commitIds: [commit_id]
+                    }
+                )
+
+                # 兼容两种响应格式
+                response_code = result&.dig("code") || result&.dig("meta", "code")
+
+                if result && (response_code == 0 || response_code == 200)
+                    return { success: true, result: result }
+                else
+                    error_msg = result&.dig("msg") || result&.dig("meta", "message") || result&.dig("message") || "未知错误"
+                    return { success: false, error: error_msg, result: result }
+                end
+            rescue => e
+                Funlog.instance.fancyinfo_error("发送工作流消息失败: #{e.message}")
+                return { success: false, error: e.message }
+            end
+        end
+
         private
 
         # 确定 JPSBuildConfig.json 文件路径

data/lib/pindo/module/task/model/git/git_commit_task.rb

@@ -150,7 +150,7 @@ module Pindo
         # 如果不是 Git 仓库，返回空参数（让依赖任务知道没有有效数据）
         return {} if @build_version.nil? || @build_number.nil?
 
-        {
+        param = {
           release_branch: @release_branch,
           build_version: @build_version,
           build_number: @build_number,
@@ -158,6 +158,24 @@ module Pindo
           tag_type: @tag_type,
           ver_inc: @ver_inc
         }
+
+        # 添加 git commit 信息（供 JPSUploadMediaTask 等任务使用）
+        if @git_root_path
+          begin
+            # 获取当前 HEAD commit 信息
+            git_commit_info = Pindo::GitHandler.get_latest_conventional_commit(project_dir: @git_root_path)
+            if git_commit_info
+              param[:git_commit_id] = git_commit_info[:commit_id]
+              param[:git_commit_time] = git_commit_info[:commit_time]
+              param[:git_commit_desc] = git_commit_info[:commit_desc]
+            end
+          rescue => e
+            # 如果获取失败，不影响主流程
+            Funlog.instance.fancyinfo_warning("获取 git commit 信息失败: #{e.message}") if ENV['PINDO_DEBUG']
+          end
+        end
+
+        param
       end
     end
   end

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

@@ -0,0 +1,217 @@
+require 'pindo/module/task/model/jps_task'
+require 'pindo/module/task/task_config'
+require 'pindo/module/pgyer/pgyerhelper'
+require 'pindo/base/git_handler'
+
+module Pindo
+  module TaskSystem
+    # JPS 绑定包任务
+    # 将 Git commit 绑定到已上传的项目包（支持批量绑定）
+    #
+    # 支持两种模式：
+    # 1. 指定模式：传入 git_commit_id 和 app_version_list
+    # 2. 依赖模式：从依赖任务（GitCommitTask、JPSUploadTask）获取信息
+    class JPSBindPackageTask < JPSTask
+      attr_reader :git_commit_id, :git_commit_time, :git_commit_desc
+      attr_reader :app_version_list
+
+      # 任务键
+      def self.task_key
+        :jps_bind_package
+      end
+
+      # 初始化绑定包任务
+      # @param app_version_list [Array<Hash>, nil] 应用版本信息列表（可选，如为 nil 则从依赖任务获取）
+      # @param options [Hash] 选项
+      # @option options [String] :git_commit_id Git commit SHA（可选，为空时从依赖任务获取）
+      # @option options [String] :git_commit_time Git commit 时间（可选）
+      # @option options [String] :git_commit_desc Git commit 描述（可选）
+      # @option options [String] :project_dir 项目目录（可选，用于自动获取 commit 信息）
+      # @option options [Hash] :app_info_obj JPS 应用信息对象（可选，继承自基类）
+      # @option options [Hash] :workflow_info 工作流信息（可选，继承自基类）
+      # @option options [String] :project_name 项目名称（可选，继承自基类）
+      def initialize(app_version_list = nil, options = {})
+        # 兼容性处理：如果传入的是单个 Hash，转为数组
+        if app_version_list.is_a?(Hash)
+          @app_version_list = [app_version_list]
+        elsif app_version_list.is_a?(Array)
+          @app_version_list = app_version_list
+        else
+          @app_version_list = nil
+        end
+
+        @git_commit_id = options[:git_commit_id]
+        @git_commit_time = options[:git_commit_time]
+        @git_commit_desc = options[:git_commit_desc]
+        @project_dir = options[:project_dir]
+
+        # 设置任务优先级为 LOW，确保在上传任务之后执行
+        options[:priority] ||= TaskPriority::LOW
+
+        super("绑定 Git Commit 到项目包", options)
+      end
+
+      def validate
+        # app_version_list 和 git_commit_id 可以延迟获取，不在这里验证
+        true
+      end
+
+      # 绑定任务重试配置
+      def self.default_retry_mode
+        RetryMode::DELAYED
+      end
+
+      def self.default_retry_count
+        2  # 绑定任务重试 2 次
+      end
+
+      def self.default_retry_delay
+        3  # 延迟 3 秒
+      end
+
+      protected
+
+      # 构建任务参数（供其他任务使用）
+      def build_task_param
+        return {} unless @status == TaskStatus::SUCCESS && @result
+
+        {
+          git_commit_id: @git_commit_id,
+          app_version_list: @app_version_list,
+          bind_success: @result[:success],
+          bound_package_ids: @result[:bound_package_ids]
+        }
+      end
+
+      def do_work
+        puts ""
+        puts "  📦 开始绑定 Git Commit 到项目包..."
+
+        # 1. 如果没有提供 app_version_list，从依赖任务获取
+        if @app_version_list.nil? || @app_version_list.empty?
+          fetch_app_version_from_dependencies
+        end
+
+        # 验证 app_version_list
+        if @app_version_list.nil? || @app_version_list.empty?
+          raise "无法获取 app_version_list，请确保传入参数或添加 JPSUploadTask 依赖"
+        end
+
+        # 2. 如果没有提供 git_commit_id，从依赖任务获取或自动获取
+        if @git_commit_id.nil? || @git_commit_id.empty?
+          fetch_git_commit_info
+        end
+
+        # 验证 git_commit_id
+        if @git_commit_id.nil? || @git_commit_id.empty?
+          raise "无法获取 git_commit_id，请确保传入参数或添加 GitCommitTask 依赖"
+        end
+
+        # 3. 提取所有 project_package_ids
+        project_package_ids = @app_version_list.map { |pkg| pkg["id"] }.compact
+        if project_package_ids.empty?
+          raise "app_version_list 中的包都缺少 id 字段"
+        end
+
+        # 4. 打印绑定信息
+        puts ""
+        puts "  📝 绑定信息："
+        puts "     Git Commit: #{@git_commit_id[0..7]}"
+        puts "     包数量: #{project_package_ids.size} 个"
+        @app_version_list.each do |pkg|
+          package_type = pkg['nativePackageType'] || pkg['originalType'] || 'unknown'
+          puts "     [#{package_type}] ID: #{pkg['id']}, Version: #{pkg['projectVersion']}, Build: #{pkg['build']}"
+        end
+        if @git_commit_desc
+          puts "     Commit Desc: #{@git_commit_desc}"
+        end
+        if @git_commit_time
+          puts "     Commit Time: #{@git_commit_time}"
+        end
+        puts ""
+
+        # 5. 确保 PgyerHelper 已登录
+        pgyer_helper = PgyerHelper.share_instace
+        unless pgyer_helper.login
+          raise "无法登录 JPS，请检查配置"
+        end
+
+        # 6. 批量绑定所有包
+        Funlog.instance.fancyinfo_start("正在绑定 #{project_package_ids.size} 个项目包...")
+
+        bind_result = pgyer_helper.bind_commit_to_package(
+          commit_id: @git_commit_id,
+          project_package_ids: project_package_ids
+        )
+
+        if bind_result[:success]
+          Funlog.instance.fancyinfo_success("绑定成功！")
+          puts ""
+
+          {
+            success: true,
+            git_commit_id: @git_commit_id,
+            bound_package_ids: project_package_ids,
+            app_version_list: @app_version_list
+          }
+        else
+          if ENV['PINDO_DEBUG']
+            puts "[PINDO_DEBUG] bind_commit_to_package 返回结果: #{bind_result.inspect}"
+            puts "[PINDO_DEBUG] git_commit_id: #{@git_commit_id}"
+            puts "[PINDO_DEBUG] project_package_ids: #{project_package_ids.inspect}"
+          end
+
+          raise "绑定失败: #{bind_result[:error]}"
+        end
+      end
+
+      private
+
+      # 从依赖任务获取 app_version_list
+      def fetch_app_version_from_dependencies
+        # 从 JPSUploadTask 获取数据
+        upload_data = get_data_param_by_key(:jps_upload)
+
+        if upload_data && upload_data[:task_param] && upload_data[:task_param][:app_version_info]
+          # 兼容单个版本信息，转为数组
+          @app_version_list = [upload_data[:task_param][:app_version_info]]
+          return
+        end
+
+        # 兼容旧机制：从第一个依赖获取结果
+        unless @dependencies.empty?
+          upload_result = get_dependency_result(@dependencies.first)
+
+          if upload_result && upload_result[:app_version_info]
+            # 兼容单个版本信息，转为数组
+            @app_version_list = [upload_result[:app_version_info]]
+          end
+        end
+      end
+
+      # 从依赖任务获取或自动获取 git commit 信息
+      def fetch_git_commit_info
+        # 1. 首先尝试从 GitCommitTask 依赖任务获取
+        git_commit_data = get_data_param_by_key(:git_commit)
+        if git_commit_data && git_commit_data[:task_param]
+          param = git_commit_data[:task_param]
+          @git_commit_id = param[:git_commit_id] if param[:git_commit_id]
+          @git_commit_time = param[:git_commit_time] if param[:git_commit_time]
+          @git_commit_desc = param[:git_commit_desc] if param[:git_commit_desc]
+        end
+
+        # 2. 如果依赖任务没有提供，且指定了 project_dir，使用自动获取
+        if (@git_commit_id.nil? || @git_commit_id.empty?) && @project_dir
+          # 查找 git 仓库根目录
+          git_root = Pindo::GitHandler.git_root_directory(local_repo_dir: @project_dir)
+          if git_root
+            git_info = Pindo::GitHandler.get_latest_conventional_commit(project_dir: git_root)
+            @git_commit_id = git_info[:commit_id]
+            @git_commit_time = git_info[:commit_time]
+            @git_commit_desc = git_info[:commit_desc]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -90,17 +90,30 @@ module Pindo
 
       def do_work
         # 1. 查找 git 仓库根目录
-        git_root = find_git_root(@upload_path)
+        git_root = Pindo::GitHandler.git_root_directory(local_repo_dir: @upload_path)
         unless git_root
           raise "未找到 git 仓库，请确保 upload_path 在 git 仓库内"
         end
 
-        # 2. 如果没有提供 git_commit_id，获取最新的符合规范的 commit
+        # 2. 如果没有提供 git_commit_id，尝试从依赖任务获取或自动获取
         if @git_commit_id.nil? || @git_commit_id.empty?
-          git_info = Pindo::GitHandler.get_latest_conventional_commit(project_dir: git_root)
-          @git_commit_id = git_info[:commit_id]
-          @git_commit_time = git_info[:commit_time]
-          @git_commit_desc = git_info[:commit_desc]
+          # 2.1 首先尝试从 GitCommitTask 依赖任务获取
+          git_commit_data = get_data_param_by_key(:git_commit)
+          if git_commit_data && git_commit_data[:task_param]
+            param = git_commit_data[:task_param]
+            # 尝试从 task_param 获取 commit 信息
+            @git_commit_id = param[:git_commit_id] if param[:git_commit_id]
+            @git_commit_time = param[:git_commit_time] if param[:git_commit_time]
+            @git_commit_desc = param[:git_commit_desc] if param[:git_commit_desc]
+          end
+
+          # 2.2 如果依赖任务没有提供，使用 get_latest_conventional_commit
+          if @git_commit_id.nil? || @git_commit_id.empty?
+            git_info = Pindo::GitHandler.get_latest_conventional_commit(project_dir: git_root)
+            @git_commit_id = git_info[:commit_id]
+            @git_commit_time = git_info[:commit_time]
+            @git_commit_desc = git_info[:commit_desc]
+          end
         end
 
         # 验证 git_commit_id
@@ -110,8 +123,8 @@ module Pindo
 
         # 3. 打印 git commit 信息
         puts ""
-        puts "  📝 Commit: #{@git_commit_desc}" if @git_commit_desc
         puts "     ID: #{@git_commit_id[0..7]}"
+        puts "  📝 Commit: #{@git_commit_desc}" if @git_commit_desc
         puts "     Time: #{@git_commit_time}" if @git_commit_time
         puts ""
 
@@ -192,20 +205,6 @@ module Pindo
 
       private
 
-      # 查找 git 仓库根目录
-      # @param path [String] 起始路径
-      # @return [String, nil] git 仓库根目录路径，未找到返回 nil
-      def find_git_root(path)
-        current = File.expand_path(path)
-        while current != '/'
-          if File.exist?(File.join(current, '.git'))
-            return current
-          end
-          current = File.dirname(current)
-        end
-        nil
-      end
-
       # 展开文件路径（支持通配符和目录）
       # 自动过滤 3 小时以内的文件，超过 3 小时的文件归档
       # @param paths [Array<String>] 原始路径列表

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

@@ -0,0 +1,190 @@
+require 'pindo/module/task/model/jps_task'
+require 'pindo/module/task/task_config'
+require 'pindo/module/pgyer/pgyerhelper'
+
+module Pindo
+  module TaskSystem
+    # JPS 工作流消息发送任务
+    # 使用 commit_log/send_message 接口发送 Git commit 消息到工作流
+    class JPSWorkFlowMessageTask < JPSTask
+      attr_reader :git_commit_id, :git_commit_time, :git_commit_desc
+      attr_reader :project_id, :workflow_id, :branch
+
+      # 任务键
+      def self.task_key
+        :jps_workflow_message
+      end
+
+      # 初始化工作流消息发送任务
+      # @param options [Hash] 选项
+      # @option options [String] :git_commit_id Git commit SHA（可选，从依赖任务获取）
+      # @option options [String] :git_commit_time Git commit 时间（可选）
+      # @option options [String] :git_commit_desc Git commit 描述（可选）
+      # @option options [String] :project_id 项目 ID（可选，从 app_info_obj 获取）
+      # @option options [Integer] :workflow_id 工作流 ID（可选，从 workflow_info 获取）
+      # @option options [String] :branch 分支名（可选，默认 'master'）
+      # @option options [Boolean] :single 是否单个提交（默认 true）
+      # @option options [Hash] :app_info_obj JPS 应用信息对象（可选，用于获取 project_id）
+      # @option options [Hash] :workflow_info 工作流信息（可选，用于获取 workflow_id）
+      def initialize(options = {})
+        @git_commit_id = options[:git_commit_id]
+        @git_commit_time = options[:git_commit_time]
+        @git_commit_desc = options[:git_commit_desc]
+        @project_id = options[:project_id]
+        @workflow_id = options[:workflow_id]
+        @branch = options[:branch] || 'master'
+        @single = options.fetch(:single, true)
+
+        # 消息发送任务优先级为 LOW，确保在其他任务之后执行
+        options[:priority] ||= TaskPriority::LOW
+
+        super("JPS 工作流消息发送", options)
+      end
+
+      def validate
+        # 参数可以从依赖任务获取，这里不做严格验证
+        true
+      end
+
+      protected
+
+      def do_work
+        puts "\n  📋 开始发送 JPS 工作流消息..."
+
+        begin
+          # 1. 如果没有提供参数，从依赖任务获取
+          fetch_data_from_dependencies if need_fetch_dependencies?
+
+          # 2. 验证必需参数
+          validate_required_params!
+
+          # 3. 发送消息
+          send_workflow_message
+
+          puts "  ✅ JPS 工作流消息发送完成\n"
+
+          {
+            success: true,
+            git_commit_id: @git_commit_id,
+            project_id: @project_id,
+            workflow_id: @workflow_id
+          }
+        rescue => e
+          # 外层错误保护：消息发送失败不应影响整体流程
+          puts "  ⚠️  JPS 工作流消息发送发生错误: #{e.message}"
+          puts "  ⚠️  错误堆栈: #{e.backtrace.first(3).join("\n           ")}" if ENV['PINDO_DEBUG'] && e.backtrace
+          puts "  ℹ️  消息发送失败不影响主流程\n"
+
+          # 消息发送失败不抛出异常，返回成功但带警告
+          {
+            success: true,
+            warning: e.message,
+            git_commit_id: @git_commit_id
+          }
+        end
+      end
+
+      private
+
+      # 判断是否需要从依赖任务获取数据
+      def need_fetch_dependencies?
+        @git_commit_id.nil? || @project_id.nil? || @workflow_id.nil?
+      end
+
+      # 从依赖任务获取数据
+      def fetch_data_from_dependencies
+        # 1. 从 GitCommitTask 获取 commit 信息
+        if @git_commit_id.nil?
+          git_commit_data = get_data_param_by_key(:git_commit)
+          if git_commit_data && git_commit_data[:task_param]
+            param = git_commit_data[:task_param]
+            @git_commit_id = param[:git_commit_id] if param[:git_commit_id]
+            @git_commit_time = param[:git_commit_time] if param[:git_commit_time]
+            @git_commit_desc = param[:git_commit_desc] if param[:git_commit_desc]
+          end
+        end
+
+        # 2. 从 JPSUploadTask 获取 project_id 和 workflow_id
+        if @project_id.nil? || @workflow_id.nil?
+          upload_data = get_data_param_by_key(:jps_upload)
+          if upload_data && upload_data[:task_param]
+            param = upload_data[:task_param]
+
+            # 从 app_info_obj 获取 project_id
+            if @project_id.nil? && param[:app_info_obj]
+              @project_id = param[:app_info_obj]["id"] || param[:app_info_obj][:id]
+            end
+
+            # 从 workflow_info 获取 workflow_id
+            if @workflow_id.nil? && param[:workflow_info]
+              @workflow_id = param[:workflow_info]["id"] ||
+                             param[:workflow_info][:id] ||
+                             param[:workflow_info]["workflow_id"] ||
+                             param[:workflow_info][:workflow_id]
+            end
+          end
+        end
+
+        # 3. 如果还没有，尝试从 app_info_obj 和 workflow_info（基类属性）获取
+        if @project_id.nil? && @app_info_obj
+          @project_id = @app_info_obj["id"] || @app_info_obj[:id]
+        end
+
+        if @workflow_id.nil? && @workflow_info
+          @workflow_id = @workflow_info["id"] ||
+                         @workflow_info[:id] ||
+                         @workflow_info["workflow_id"] ||
+                         @workflow_info[:workflow_id]
+        end
+      end
+
+      # 验证必需参数
+      def validate_required_params!
+        missing_params = []
+        missing_params << "git_commit_id" if @git_commit_id.nil? || @git_commit_id.empty?
+        missing_params << "project_id" if @project_id.nil? || @project_id.empty?
+        missing_params << "workflow_id" if @workflow_id.nil?
+
+        unless missing_params.empty?
+          raise "缺少必需参数: #{missing_params.join(', ')}"
+        end
+      end
+
+      # 发送工作流消息
+      def send_workflow_message
+        puts "  📨 发送工作流消息..."
+        puts "     Project ID: #{@project_id}"
+        puts "     Workflow ID: #{@workflow_id}"
+        puts "     Commit ID: #{@git_commit_id[0..7]}" if @git_commit_id
+        puts "     Branch: #{@branch}"
+        puts ""
+
+        pgyer_helper = PgyerHelper.share_instace
+
+        # 确保已登录
+        unless pgyer_helper.login
+          raise "无法登录 JPS，请检查配置"
+        end
+
+        # 使用 PgyerHelper 的便捷方法发送工作流消息
+        result = pgyer_helper.send_workflow_message(
+          project_id: @project_id,
+          workflow_id: @workflow_id,
+          commit_id: @git_commit_id,
+          branch: @branch,
+          single: @single
+        )
+
+        if result[:success]
+          puts "  ✓ 工作流消息发送成功"
+        else
+          if ENV['PINDO_DEBUG']
+            puts "[PINDO_DEBUG] send_workflow_message 返回结果: #{result.inspect}"
+          end
+
+          raise "工作流消息发送失败: #{result[:error]}"
+        end
+      end
+    end
+  end
+end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.14.4"
+  VERSION = "5.14.5"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'