pindo 5.13.9 → 5.13.10

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

@@ -0,0 +1,248 @@
+require 'pindo/module/task/model/jps_task'
+require 'pindo/module/task/task_config'
+require 'pindo/module/pgyer/pgyerhelper'
+
+module Pindo
+  module TaskSystem
+    # JPS Media 上传任务
+    # 上传图片、视频等 media 文件到 JPS 并关联到提交记录
+    #
+    # 支持两种模式：
+    # 1. 指定模式：传入 file_paths 和 git_commit_id
+    # 2. 自动模式：只传入 project_path，自动查找 JPSMedia/ 目录和 git HEAD 信息
+    class JPSUploadMediaTask < JPSTask
+      attr_reader :file_paths, :git_commit_id, :git_commit_time, :git_commit_desc
+      attr_reader :workflow_id, :project_path
+
+      # 支持的媒体文件扩展名
+      MEDIA_EXTENSIONS = %w[png jpg jpeg gif bmp webp mp4 mov avi mkv webm].freeze
+
+      # 任务键
+      def self.task_key
+        :jps_upload_media
+      end
+
+      # 初始化 Media 上传任务
+      # @param file_paths [Array<String>] 要上传的文件路径列表（可选，为空时自动查找）
+      # @param options [Hash] 选项
+      # @option options [String] :git_commit_id Git commit SHA（可选，为空时自动获取 HEAD）
+      # @option options [String] :git_commit_time Git commit 时间（可选）
+      # @option options [String] :git_commit_desc Git commit 描述（可选）
+      # @option options [Integer] :workflow_id 工作流ID（可选，用于筛选 commit_log）
+      # @option options [String] :project_name 项目名称（可选）
+      # @option options [String] :project_path 项目路径（必需，用于查找 git 仓库和 JPSMedia 目录）
+      def initialize(file_paths, options = {})
+        @file_paths = file_paths || []                  # 要上传的文件路径列表
+        @git_commit_id = options[:git_commit_id]        # Git commit SHA
+        @git_commit_time = options[:git_commit_time]    # Git commit 时间
+        @git_commit_desc = options[:git_commit_desc]    # Git commit 描述
+        @workflow_id = options[:workflow_id]            # 工作流ID
+        @project_path = options[:project_path]          # 项目路径
+
+        # 设置任务优先级为 LOW，确保在其他任务之后执行
+        options[:priority] ||= TaskPriority::LOW
+
+        name = "上传 Media 附件"
+
+        super(name, options)
+      end
+
+      def validate
+        # 验证 project_path（必需参数）
+        unless @project_path && !@project_path.empty? && Dir.exist?(@project_path)
+          @error = "缺少必需参数: project_path（项目路径）或路径不存在"
+          return false
+        end
+
+        true
+      end
+
+      # Media 上传任务重试配置
+      def self.default_retry_mode
+        RetryMode::DELAYED
+      end
+
+      def self.default_retry_count
+        2  # Media 上传重试次数较少
+      end
+
+      def self.default_retry_delay
+        5  # 延迟 5 秒
+      end
+
+      protected
+
+      # 构建任务参数（供其他任务使用）
+      def build_task_param
+        return {} unless @status == TaskStatus::SUCCESS && @result
+
+        {
+          success_urls: @result[:success_urls],
+          failed_files: @result[:failed_files],
+          all_urls: @result[:all_urls],
+          commit_log_id: @result[:commit_log_id],
+          git_commit_id: @result[:git_commit_id]
+        }
+      end
+
+      def do_work
+        # 1. 查找 git 仓库根目录
+        git_root = find_git_root(@project_path)
+        unless git_root
+          raise "未找到 git 仓库，请确保 project_path 在 git 仓库内"
+        end
+
+        # 2. 如果没有提供 git_commit_id，自动获取 HEAD 信息
+        if @git_commit_id.nil? || @git_commit_id.empty?
+          git_info = get_git_head_info(git_root)
+          @git_commit_id = git_info[:commit_id]
+          @git_commit_time = git_info[:commit_time]
+          @git_commit_desc = git_info[:commit_desc]
+        end
+
+        # 验证 git_commit_id
+        if @git_commit_id.nil? || @git_commit_id.empty?
+          raise "无法获取 git commit id，请确保在 git 仓库中运行"
+        end
+
+        # 3. 打印 git commit 信息
+        puts
+        puts "  ===== Git Commit 信息 ====="
+        puts "    Commit ID:   #{@git_commit_id}"
+        puts "    Commit Time: #{@git_commit_time}" if @git_commit_time
+        puts "    Commit Desc: #{@git_commit_desc}" if @git_commit_desc
+        puts "  " + "=" * 28
+        puts
+
+        # 4. 如果 file_paths 为空，自动查找 JPSMedia 目录
+        if @file_paths.nil? || @file_paths.empty?
+          @file_paths = find_media_files(git_root)
+        end
+
+        # 过滤存在的文件
+        existing_files = @file_paths.select { |f| File.exist?(f) }
+        if existing_files.empty?
+          puts "  没有找到有效的 media 文件"
+          puts "  提示: 请在项目根目录创建 JPSMedia/ 目录并放入要上传的图片或视频文件"
+          return {
+            success: false,
+            success_urls: [],
+            failed_files: @file_paths,
+            existing_urls: [],
+            all_urls: [],
+            commit_log_id: nil,
+            git_commit_id: @git_commit_id,
+            update_success: false
+          }
+        end
+
+        puts "  准备上传 #{existing_files.size} 个文件"
+        existing_files.each_with_index do |file, index|
+          puts "    #{index + 1}. #{File.basename(file)}"
+        end
+        puts
+
+        # 5. 确保 PgyerHelper 已登录
+        pgyer_helper = PgyerHelper.share_instace
+        unless pgyer_helper.login
+          raise "JPS 登录失败"
+        end
+
+        # 6. 调用 PgyerHelper 的 start_media_upload 方法
+        upload_result = pgyer_helper.start_media_upload(
+          file_paths: existing_files,
+          git_commit_id: @git_commit_id,
+          workflow_id: @workflow_id
+        )
+
+        # 7. 判断是否成功
+        if upload_result[:success_urls].any?
+          # 上传成功后，将重试次数设为 0
+          @retry_count = 0
+
+          {
+            success: true,
+            success_urls: upload_result[:success_urls],
+            failed_files: upload_result[:failed_files],
+            existing_urls: upload_result[:existing_urls],
+            all_urls: upload_result[:all_urls],
+            commit_log_id: upload_result[:commit_log_id],
+            git_commit_id: upload_result[:git_commit_id],
+            update_success: upload_result[:update_success]
+          }
+        elsif upload_result[:commit_log_id].nil?
+          # 未找到 commit_log 记录，不重试
+          @retry_count = 0
+          raise "未找到 git commit id 对应的 JPS 提交记录"
+        else
+          raise "所有文件上传失败"
+        end
+      end
+
+      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
+
+      # 获取 git HEAD 信息
+      # @param git_root [String] git 仓库根目录
+      # @return [Hash] 包含 :commit_id, :commit_time, :commit_desc
+      def get_git_head_info(git_root)
+        result = {
+          commit_id: nil,
+          commit_time: nil,
+          commit_desc: nil
+        }
+
+        Dir.chdir(git_root) do
+          # 获取 HEAD commit id
+          commit_id = `git rev-parse HEAD 2>/dev/null`.strip
+          result[:commit_id] = commit_id unless commit_id.empty?
+
+          # 获取 commit time (ISO 8601 格式)
+          commit_time = `git log -1 --format=%ci 2>/dev/null`.strip
+          result[:commit_time] = commit_time unless commit_time.empty?
+
+          # 获取 commit message (第一行)
+          commit_desc = `git log -1 --format=%s 2>/dev/null`.strip
+          result[:commit_desc] = commit_desc unless commit_desc.empty?
+        end
+
+        result
+      end
+
+      # 在 JPSMedia 目录下查找 media 文件
+      # @param git_root [String] git 仓库根目录
+      # @return [Array<String>] 找到的文件路径列表
+      def find_media_files(git_root)
+        jps_media_dir = File.join(git_root, 'JPSMedia')
+
+        unless File.directory?(jps_media_dir)
+          puts "  未找到 JPSMedia/ 目录: #{jps_media_dir}"
+          return []
+        end
+
+        puts "  在 #{jps_media_dir} 目录查找 media 文件..."
+
+        # 使用 glob 查找所有支持的媒体文件
+        pattern = File.join(jps_media_dir, "**", "*.{#{MEDIA_EXTENSIONS.join(',')}}")
+        files = Dir.glob(pattern, File::FNM_CASEFOLD)
+
+        # 过滤有效文件并去重
+        files.uniq.select { |f| File.file?(f) }
+      end
+
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-require 'pindo/module/task/pindo_task'
+require 'pindo/module/task/model/jps_task'
 require 'pindo/module/task/task_config'
 require 'pindo/module/pgyer/pgyerhelper'
 
@@ -6,24 +6,12 @@ module Pindo
   module TaskSystem
     # JPS 上传任务
     # 上传构建产物到 JPS 测试平台
-    class JPSUploadTask < PindoTask
+    class JPSUploadTask < JPSTask
       attr_reader :file_type, :upload_path, :upload_file
 
-      def self.task_type
-        :upload
-      end
-
-      # 重试配置
-      def self.default_retry_mode
-        RetryMode::DELAYED  # 延迟重试
-      end
-
-      def self.default_retry_count
-        3  # 默认可以重试 3 次
-      end
-
-      def self.default_retry_delay
-        10  # 默认延迟 10 秒
+      # 任务键
+      def self.task_key
+        :jps_upload
       end
 
       # 初始化上传任务
@@ -39,11 +27,6 @@ module Pindo
         @file_type = file_type        # 'ipa' | 'apk' | 'html' | 'app'
         @upload_path = upload_path    # 搜索文件的路径
         @upload_file = upload_file    # 要上传的文件（nil 表示自动查找）
-
-        # 可选参数（如果为 nil，在 do_work 中延迟获取）
-        @app_info_obj = options[:app_info_obj]
-        @workflow_info = options[:workflow_info]
-        @project_name = options[:project_name]
         @upload_desc = options[:upload_desc]  # 上传描述
 
         # 设置上传任务的优先级为 LOW，确保在构建任务之后执行
@@ -87,6 +70,19 @@ module Pindo
 
       protected
 
+      # 构建任务参数（供其他任务使用）
+      def build_task_param
+        # 只有在任务成功完成后才返回有效数据
+        return {} unless @status == TaskStatus::SUCCESS && @result
+
+        {
+          app_version_info: @result[:app_version_info],
+          app_info_obj: @result[:app_info_obj],
+          file_type: @result[:file_type],
+          file_path: @result[:file_path]
+        }
+      end
+
       def do_work
         # 1. 确定上传文件
         if @upload_file && !@upload_file.empty? && File.exist?(@upload_file)
@@ -106,16 +102,22 @@ module Pindo
 
         # 2. 如果没有 JPS 配置，延迟获取
         if @app_info_obj.nil? || @workflow_info.nil?
-          fetch_jps_config(file_to_upload)
+          package_type = @file_type == 'html' ? 'zip' : @file_type
+          @app_info_obj, @workflow_info = fetch_jps_config(
+            working_directory: @upload_path,
+            package_type: package_type
+          )
         end
 
         # 3. 上传到 JPS
-        upload_to_jps(file_to_upload)
+        app_version_info = upload_to_jps(file_to_upload)
 
         {
           success: true,
           file_type: @file_type,
-          file_path: file_to_upload
+          file_path: file_to_upload,
+          app_version_info: app_version_info,
+          app_info_obj: @app_info_obj
         }
       end
 
@@ -152,18 +154,15 @@ module Pindo
         end
       end
 
-      # 延迟获取 JPS 配置
-      def fetch_jps_config(file_path)
+      # 延迟获取 JPS 配置（上传任务专用）
+      # @return [Array] 返回 [app_info_obj, workflow_info]
+      def fetch_jps_config(working_directory: Dir.pwd, package_type: nil)
         puts "  获取 JPS 配置..."
 
-        # 根据 file_type 确定 package_type
-        package_type = @file_type == 'html' ? 'zip' : @file_type
-
-        # 获取项目目录（从文件路径推断）
-        working_directory = @upload_path
+        pgyer_helper = PgyerHelper.share_instace
 
-        # 调用 PgyerHelper 获取配置
-        @app_info_obj, @workflow_info = PgyerHelper.share_instace.prepare_upload(
+        # 上传任务需要 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
@@ -172,9 +171,12 @@ module Pindo
         unless @app_info_obj && @workflow_info
           raise "无法获取 JPS 配置"
         end
+
+        [@app_info_obj, @workflow_info]
       end
 
       # 上传到 JPS 测试平台
+      # @return [Hash] 应用版本信息
       def upload_to_jps(file_path)
         pgyer_helper = PgyerHelper.share_instace
 
@@ -197,67 +199,10 @@ module Pindo
 
         app_version_info = result_data["data"]
 
-        # 处理上传成功后的操作
-        handle_post_upload_actions(app_version_info)
+        # 返回版本信息，由外部创建 JPSMessageTask 处理消息发送
+        app_version_info
       end
 
-      # 处理上传成功后的操作
-      # @param app_version_info [Hash] 应用版本信息
-      def handle_post_upload_actions(app_version_info)
-        puts "\n  📋 开始处理上传后续操作..."
-
-        begin
-          pgyer_helper = PgyerHelper.share_instace
-
-          # 打印应用版本信息（失败只警告，不中断）
-          begin
-            puts "  📝 打印应用版本信息..."
-            pgyer_helper.print_app_version_info(
-              app_info_obj: @app_info_obj,
-              app_version_info_obj: app_version_info
-            )
-            puts "  ✓ 应用版本信息打印成功"
-          rescue => e
-            puts "  ⚠️  打印应用版本信息失败: #{e.message}"
-          end
-
-          # 发送消息给自己（失败只警告，不中断）
-          begin
-            puts "  📨 发送消息给自己..."
-            pgyer_helper.send_apptest_msg(
-              app_info_obj: @app_info_obj,
-              app_version_info_obj: app_version_info,
-              receiveType: "self"
-            )
-            puts "  ✓ 消息发送成功"
-          rescue => e
-            puts "  ⚠️  发送消息给自己失败: #{e.message}"
-          end
-
-          # 如果需要发送到测试群（失败只警告，不中断）
-          if @context[:send_to_chat]
-            begin
-              puts "  📢 发送消息到测试群..."
-              pgyer_helper.send_apptest_msg(
-                app_info_obj: @app_info_obj,
-                app_version_info_obj: app_version_info,
-                chatEnv: "DevTest",
-                receiveType: "chat"
-              )
-              puts "  ✓ 测试群消息发送成功"
-            rescue => e
-              puts "  ⚠️  发送消息到测试群失败: #{e.message}"
-            end
-          end
-
-          puts "  ✅ 上传后续操作全部完成\n"
-        rescue => e
-          # 外层错误保护：任何未预期的错误都不应影响上传任务的成功状态
-          puts "  ⚠️  上传后续操作发生未预期错误: #{e.message}"
-          puts "  ⚠️  错误堆栈: #{e.backtrace.first(3).join("\n           ")}" if e.backtrace
-          puts "  ℹ️  上传已成功，后续操作失败不影响上传结果\n"
-        end
-      end
     end
   end
 end

data/lib/pindo/module/task/model/jps_task.rb

@@ -0,0 +1,43 @@
+require 'pindo/module/task/pindo_task'
+require 'pindo/module/pgyer/pgyerhelper'
+
+module Pindo
+  module TaskSystem
+    # JPS 任务基类
+    # 所有 JPS 相关任务的父类，提供通用的 JPS 操作和配置
+    class JPSTask < PindoTask
+      attr_reader :app_info_obj, :workflow_info, :project_name
+
+      def initialize(name, options = {})
+        @app_info_obj = options[:app_info_obj]
+        @workflow_info = options[:workflow_info]
+        @project_name = options[:project_name]
+
+        super(name, options)
+      end
+
+      # JPS 任务类型
+      def self.task_type
+        :jps
+      end
+
+      # JPS 任务类型显示名称
+      def self.task_type_name
+        "JPS操作"
+      end
+
+      # JPS 任务默认重试配置
+      def self.default_retry_mode
+        RetryMode::DELAYED  # 延迟重试
+      end
+
+      def self.default_retry_count
+        3  # 默认重试 3 次
+      end
+
+      def self.default_retry_delay
+        10  # 默认延迟 10 秒
+      end
+    end
+  end
+end

data/lib/pindo/module/task/model/resign/ipa_local_resign_task.rb

@@ -13,6 +13,11 @@ module Pindo
         :resign
       end
 
+      # 任务类型显示名称
+      def self.task_type_name
+        "重签名"
+      end
+
       # 重试配置
       def self.default_retry_mode
         RetryMode::DELAYED

data/lib/pindo/module/task/model/unity/unity_config_task.rb

@@ -8,10 +8,6 @@ module Pindo
     class UnityConfigTask < UnityTask
       attr_reader :deploy_mode
 
-      def self.task_type
-        :unity_config
-      end
-
       # @param deploy_mode [String] 部署模式 ('dev', 'adhoc', 'release')
       # @param options [Hash] 额外选项
       #   - :project_path [String] Unity 项目路径（默认当前目录）

data/lib/pindo/module/task/model/unity/unity_export_task.rb

@@ -8,7 +8,8 @@ module Pindo
     class UnityExportTask < UnityTask
       attr_reader :platform, :export_path, :deploy_mode, :is_library_mode
 
-      def self.task_type
+      # 任务键
+      def self.task_key
         :unity_export
       end
 
@@ -28,18 +29,18 @@ module Pindo
 
         name = case platform
                when 'ios', 'ipa'
-                 "Unity 导出 iOS"
+                 "Unity导出iOS平台"
                when 'android', 'apk'
-                 "Unity 导出 Android"
+                 "Unity导出Android平台"
                when 'web', 'html'
-                 "Unity 导出 WebGL"
+                 "Unity导出WebGL平台"
                else
-                 "Unity 导出 #{platform.upcase}"
+                 "Unity导出#{platform.upcase}平台"
                end
 
         # 传递 project_path 给基类
-        project_path = options[:project_path] || Dir.pwd
-        super(name, project_path: project_path, options: options)
+        options[:project_path] ||= Dir.pwd
+        super(name, options)
       end
 
       def validate

data/lib/pindo/module/task/model/unity/unity_update_task.rb

@@ -6,7 +6,8 @@ module Pindo
     # Unity 更新必备库任务
     # 用于强制更新 Unity 项目的必备库（NugetForUnity）
     class UnityUpdateTask < UnityTask
-      def self.task_type
+      # 任务键
+      def self.task_key
         :unity_update
       end
 
@@ -16,8 +17,8 @@ module Pindo
         @unity_exe_path = nil  # 将在 do_work 中自动查找
 
         # 传递 project_path 给基类
-        project_path = options[:project_path] || Dir.pwd
-        super("Unity工具库更新", project_path: project_path, options: options)
+        options[:project_path] ||= Dir.pwd
+        super("Unity工具库更新", options)
       end
 
       def validate

data/lib/pindo/module/task/model/unity/unity_yoo_asset_task.rb

@@ -8,7 +8,8 @@ module Pindo
     class UnityYooAssetTask < UnityTask
       attr_reader :platform
 
-      def self.task_type
+      # 任务键
+      def self.task_key
         :unity_yoo_asset
       end
 
@@ -21,18 +22,18 @@ module Pindo
 
         name = case platform
                when 'ios', 'ipa'
-                 "Unity资源Yoo 打包 iOS"
+                 "YooAsset打包iOS平台资源"
                when 'android', 'apk'
-                 "Unity资源Yoo 打包 Android"
+                 "YooAsset打包Android平台资源"
                when 'web', 'html'
-                 "Unity资源Yoo 打包 WebGL"
+                 "YooAsset打包WebGL平台资源"
                else
-                 "Unity资源Yoo 打包 #{platform.upcase}"
+                 "YooAsset打包#{platform.upcase}资源"
                end
 
         # 传递 project_path 给基类
-        project_path = options[:project_path] || Dir.pwd
-        super(name, project_path: project_path, options: options)
+        options[:project_path] ||= Dir.pwd
+        super(name, options)
       end
 
       def validate

data/lib/pindo/module/task/model/unity_task.rb

@@ -9,8 +9,8 @@ module Pindo
     class UnityTask < PindoTask
       attr_reader :project_path, :unity_root_path
 
-      def initialize(name, project_path:, options: {})
-        @project_path = File.expand_path(project_path)
+      def initialize(name, options = {})
+        @project_path = options[:project_path] ? File.expand_path(options[:project_path]) : nil
         @unity_root_path = options[:unity_root_path] || @project_path
 
         super(name, options)
@@ -21,6 +21,11 @@ module Pindo
         :unity
       end
 
+      # Unity 任务类型显示名称
+      def self.task_type_name
+        "Unity操作"
+      end
+
       # Unity 任务默认重试配置
       def self.default_retry_mode
         RetryMode::DELAYED