jpsclient 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2709f21c8f075e561ae9b67991774b7bb95872100711cd88890f09a8225652e
-  data.tar.gz: 686ed38ce06861e1bec6d1b27c975a40da7c542145f14fbeff33051d3a1b9cbd
+  metadata.gz: fc2afd23d09740af2160dbbfc2c6c1f0cffb937b5da3ab905c29582d0738eeb1
+  data.tar.gz: 6dacc82e06e921343226aca9a2277ea7a5a6f2c43f949fc46f4cbdc5136ba1ad
 SHA512:
-  metadata.gz: a0fc9a740eb975486a0851c7d5ef8339b6a4afd59e9999b0d258def275a4381838e0144f9462f7aedb7f8c678feed53ca02af2dbc9743aa51c7758ff5c68d0f2
-  data.tar.gz: 7823ba00bb6b794a116892f614d883dbbf8a8a43f885d7bc384adb732db35cc2056fa7ce2d3bba5d924533e53965a293bbbf2f39d63da454abc5a78976503869
+  metadata.gz: b9b0002b6139c3b5d83dc4afcb9d4c185e4009205845db11fecbc06429cf4b588d7557bf71f1a648465f20532e2915f3d3a3939b4fec6209b6b57f862f4715b6
+  data.tar.gz: 0ab8ae8afd9e9db0a5a508a8ce2c4a6f2ba5552906506f05168ac6d053140ffda61f62c15d7de8599438d9b62c03d63018a8aa98940ede6e7921201ffc0aadb0

data/lib/jpsclient/api/commit_log.rb

@@ -4,31 +4,67 @@ module JPSClient
     # 处理 /api/commit_log/* 路径的所有接口
     module CommitLog
 
+      # 更新提交记录
+      #
+      # @param id [Integer] 提交记录ID（必需）
+      # @param params [Hash] 更新参数
+      # @option params [String] :description 描述
+      # @option params [Array<String>] :fileUrls 文件URL数组
+      # @return [Hash] API响应
+      def update_commit_log(id:, params: {})
+        config = @request_config && @request_config["commit_log_update"]
+        raise JPSClient::ExceptionError, "Missing config for commit_log_update" unless config && config["url"]
+        path = config["url"]
+
+        body_params = {
+          id: id
+        }
+
+        # 添加可选参数
+        body_params[:description] = params[:description] if params.key?(:description)
+        body_params[:fileUrls] = params[:fileUrls] if params[:fileUrls]
+
+        response = @http_client.post(path, body: body_params)
+        result = JPSClient::Response.new(response)
+
+        if result.need_login?
+          do_login(force_login: true)
+          response = @http_client.post(path, body: body_params)
+          result = JPSClient::Response.new(response)
+        end
+
+        return result.to_h
+      end
+
       # 发送提交记录消息通知
       #
       # @param projectId [String] 项目ID（必需）
-      # @param commitIds [Array<String>] 提交ID数组（必需）
+      # @param workflowId [Integer] 工作流ID（必需）
       # @param params [Hash] 其他参数
       # @option params [Boolean] :single 是否单个提交（默认 true）
-      # @option params [String] :branch 分支名称，多个分支用逗号分隔
+      # @option params [Array<String>] :branches 分支名称数组
+      # @option params [Array<String>] :commitIds 提交ID数组
+      # @option params [Integer] :startTimestamp 开始时间戳
+      # @option params [Integer] :endTimestamp 结束时间戳
       # @option params [Integer] :indexNo 索引号
-      # @option params [Integer] :workflowId 工作流ID
       # @return [Hash] API响应
-      def send_commit_log_message(projectId:, commitIds:, params: {})
+      def send_commit_log_message(projectId:, workflowId:, params: {})
         config = @request_config && @request_config["commit_log_send_message"]
         raise JPSClient::ExceptionError, "Missing config for commit_log_send_message" unless config && config["url"]
         path = config["url"]
 
         body_params = {
-        projectId: projectId,
-        commitIds: commitIds,
-        single: params[:single] || true
+          projectId: projectId,
+          workflowId: workflowId,
+          single: params.fetch(:single, true)
         }
 
         # 添加可选参数
-        body_params[:branch] = params[:branch] if params[:branch]
+        body_params[:branches] = params[:branches] if params[:branches]
+        body_params[:commitIds] = params[:commitIds] if params[:commitIds]
+        body_params[:startTimestamp] = params[:startTimestamp] if params[:startTimestamp]
+        body_params[:endTimestamp] = params[:endTimestamp] if params[:endTimestamp]
         body_params[:indexNo] = params[:indexNo] if params[:indexNo]
-        body_params[:workflowId] = params[:workflowId] if params[:workflowId]
 
         response = @http_client.post(path, body: body_params)
         result = JPSClient::Response.new(response)
@@ -36,7 +72,6 @@ module JPSClient
         # 处理 401 错误，自动重新登录
         if result.need_login?
           do_login(force_login: true)
-          # 重试请求
           response = @http_client.post(path, body: body_params)
           result = JPSClient::Response.new(response)
         end
@@ -44,28 +79,53 @@ module JPSClient
         return result.to_h
       end
 
-      # 获取提交记录列表（如果有这个接口）
-      def get_commit_log_list(projectId:, params: {})
-        config = @request_config && @request_config["commit_log_list"]
-        raise JPSClient::ExceptionError, "Missing config for commit_log_list" unless config && config["url"]
+      # 获取提交记录简要信息
+      #
+      # @param commitId [String] 提交ID（必需）
+      # @return [Hash] API响应
+      def get_commit_log_simple(commitId:)
+        config = @request_config && @request_config["commit_log_simple"]
+        raise JPSClient::ExceptionError, "Missing config for commit_log_simple" unless config && config["url"]
         path = config["url"]
 
         get_params = {
-        projectId: projectId,
-        pageNo: params[:pageNo] || 1,
-        pageSize: params[:pageSize] || 20
+          commitId: commitId
         }
 
-        # 添加可选的筛选参数
-        get_params[:branch] = params[:branch] if params[:branch]
-        get_params[:author] = params[:author] if params[:author]
-        get_params[:startTime] = params[:startTime] if params[:startTime]
-        get_params[:endTime] = params[:endTime] if params[:endTime]
+        response = @http_client.get(path, params: get_params)
+        result = JPSClient::Response.new(response)
+
+        if result.need_login?
+          do_login(force_login: true)
+          response = @http_client.get(path, params: get_params)
+          result = JPSClient::Response.new(response)
+        end
+
+        return result.to_h
+      end
+
+      # 预览提交记录
+      #
+      # @param workflowId [Integer] 工作流ID（必需）
+      # @param commitIds [Array<String>] 提交ID数组（必需）
+      # @param params [Hash] 其他参数
+      # @option params [Boolean] :onlyCliff 是否只显示cliff格式
+      # @return [Hash] API响应
+      def get_commit_log_preview(workflowId:, commitIds:, params: {})
+        config = @request_config && @request_config["commit_log_preview"]
+        raise JPSClient::ExceptionError, "Missing config for commit_log_preview" unless config && config["url"]
+        path = config["url"]
+
+        get_params = {
+          workflowId: workflowId,
+          commitIds: commitIds.is_a?(Array) ? commitIds.join(',') : commitIds
+        }
+
+        get_params[:onlyCliff] = params[:onlyCliff] if params.key?(:onlyCliff)
 
         response = @http_client.get(path, params: get_params)
         result = JPSClient::Response.new(response)
 
-        # 处理 401 错误
         if result.need_login?
           do_login(force_login: true)
           response = @http_client.get(path, params: get_params)
@@ -75,17 +135,44 @@ module JPSClient
         return result.to_h
       end
 
-      # 获取单个提交记录详情
-      def get_commit_log_detail(projectId:, commitId:)
-        config = @request_config && @request_config["commit_log_detail"]
-        raise JPSClient::ExceptionError, "Missing config for commit_log_detail" unless config && config["url"]
+      # 获取提交记录列表
+      #
+      # @param params [Hash] 查询参数
+      # @option params [Array<Integer>] :ids 提交记录ID数组
+      # @option params [Array<Integer>] :workflowIds 工作流ID数组
+      # @option params [Array<String>] :committers 提交者数组
+      # @option params [String] :repoPath 仓库路径
+      # @option params [String] :keyword 关键字
+      # @option params [String] :remark 备注
+      # @option params [Boolean] :onlyCliff 是否只显示cliff格式
+      # @option params [Boolean] :personalCenter 是否个人中心
+      # @option params [Integer] :pageNo 页码，默认1
+      # @option params [Integer] :pageSize 每页数量，默认20
+      # @option params [Integer] :startTimestamp 开始时间戳
+      # @option params [Integer] :endTimestamp 结束时间戳
+      # @return [Hash] API响应
+      def get_commit_log_list(params: {})
+        config = @request_config && @request_config["commit_log_list"]
+        raise JPSClient::ExceptionError, "Missing config for commit_log_list" unless config && config["url"]
         path = config["url"]
 
         get_params = {
-        projectId: projectId,
-        commitId: commitId
+          pageNo: params[:pageNo] || 1,
+          pageSize: params[:pageSize] || 20
         }
 
+        # 添加可选的筛选参数
+        get_params[:ids] = params[:ids].join(',') if params[:ids]
+        get_params[:workflowIds] = params[:workflowIds].join(',') if params[:workflowIds]
+        get_params[:committers] = params[:committers].join(',') if params[:committers]
+        get_params[:repoPath] = params[:repoPath] if params[:repoPath]
+        get_params[:keyword] = params[:keyword] if params[:keyword]
+        get_params[:remark] = params[:remark] if params[:remark]
+        get_params[:onlyCliff] = params[:onlyCliff] if params.key?(:onlyCliff)
+        get_params[:personalCenter] = params[:personalCenter] if params.key?(:personalCenter)
+        get_params[:startTimestamp] = params[:startTimestamp] if params[:startTimestamp]
+        get_params[:endTimestamp] = params[:endTimestamp] if params[:endTimestamp]
+
         response = @http_client.get(path, params: get_params)
         result = JPSClient::Response.new(response)
 

data/lib/jpsclient/api/file.rb

@@ -16,13 +16,39 @@ module JPSClient
         region: upload_config.region
         }
 
-        response = @http_client.post(path, body: body_params, timeout: 60)
+        response = @http_client.post(path, body: body_params)
         result = JPSClient::Response.new(response)
 
         # 处理 401 错误，自动重新登录
         if result.need_login?
           do_login(force_login: true)
-          response = @http_client.post(path, body: body_params, timeout: 60)
+          response = @http_client.post(path, body: body_params)
+          result = JPSClient::Response.new(response)
+        end
+
+        return result.to_h
+      end
+
+      # 获取简单上传预签名URL（用于小文件直接上传，使用 media 配置）
+      # @param s3_key [String] S3 文件路径
+      # @param upload_config [UploadConfig] 上传配置
+      # @return [Hash] 包含预签名URL的响应
+      def get_simple_sign_url(s3_key:, upload_config:)
+        path = @request_config["file_sign_url"]["url"]
+
+        body_params = {
+        s3Key: s3_key,
+        uploadType: upload_config.upload_type,
+        bucketName: upload_config.media_bucket_name,
+        region: upload_config.media_region
+        }
+
+        response = @http_client.post(path, body: body_params)
+        result = JPSClient::Response.new(response)
+
+        if result.need_login?
+          do_login(force_login: true)
+          response = @http_client.post(path, body: body_params)
           result = JPSClient::Response.new(response)
         end
 
@@ -42,12 +68,12 @@ module JPSClient
         region: upload_config.region
         }
 
-        response = @http_client.post(path, body: body_params, timeout: 60)
+        response = @http_client.post(path, body: body_params)
         result = JPSClient::Response.new(response)
 
         if result.need_login?
           do_login(force_login: true)
-          response = @http_client.post(path, body: body_params, timeout: 60)
+          response = @http_client.post(path, body: body_params)
           result = JPSClient::Response.new(response)
         end
 
@@ -66,13 +92,12 @@ module JPSClient
         region: upload_config.region
         }
 
-        # 完成上传可能需要更长时间
-        response = @http_client.post(path, body: body_params, timeout: 120)
+        response = @http_client.post(path, body: body_params)
         result = JPSClient::Response.new(response)
 
         if result.need_login?
           do_login(force_login: true)
-          response = @http_client.post(path, body: body_params, timeout: 120)
+          response = @http_client.post(path, body: body_params)
           result = JPSClient::Response.new(response)
         end
 

data/lib/jpsclient/api/project_package.rb

@@ -16,7 +16,10 @@ module JPSClient
     module ProjectPackage
 
       # 上传项目包
-      def upload_project_package(projectId:nil, params:nil)
+      # @param projectId [String] 项目ID（必需）
+      # @param params [Hash] 上传参数
+      # @param timeout [Integer, nil] 请求超时时间（秒），nil 时使用 common_http_config.timeout_seconds
+      def upload_project_package(projectId:nil, params:nil, timeout:nil)
         config = @request_config && @request_config["project_package_upload"]
         raise JPSClient::ExceptionError, "Missing config for project_package_upload" unless config && config["url"]
         path = config["url"]
@@ -42,14 +45,14 @@ module JPSClient
         # 移除值为nil的键
         body_params.compact!
 
-        response = @http_client.post(path, body: body_params)
+        response = @http_client.post(path, body: body_params, timeout: timeout)
         result = JPSClient::Response.new(response)
 
         # 处理 401 错误，自动重新登录
         if result.need_login?
           do_login(force_login: true)
           # 重试请求
-          response = @http_client.post(path, body: body_params)
+          response = @http_client.post(path, body: body_params, timeout: timeout)
           result = JPSClient::Response.new(response)
         end
 
@@ -268,7 +271,7 @@ module JPSClient
         packId: params[:packId],
         packageType: params[:packageType],
         packageVersion: params[:packageVersion],
-        projectName: params[:projectName]
+        projectId: params[:projectId]
         }.compact # 移除nil值
 
         response = @http_client.get(path, params: get_params)

data/lib/jpsclient/{api → base}/client.rb

@@ -222,8 +222,17 @@ module JPSClient
           @token = @token_manager.to_h
         end
 
+        # 从 common_http_config 获取 HTTP 配置
+        common_http_config = @config_json["common_http_config"] || {}
+        default_timeout = common_http_config["timeout_seconds"]
+        max_retry_times = common_http_config["max_retry_times"] || 3
+
         # 初始化共享的 HTTP 客户端
-        @http_client = HttpClient.new(base_url: @baseurl)
+        @http_client = HttpClient.new(
+          base_url: @baseurl,
+          default_timeout: default_timeout,
+          max_retry_times: max_retry_times
+        )
         @http_client.update_token(@token["token"]) if @token && @token["token"]
 
       rescue JSON::ParserError => error

data/lib/jpsclient/http/http_client.rb

@@ -7,19 +7,29 @@ module JPSClient
   class HttpClient
     attr_accessor :base_url
     attr_accessor :token
-
-    def initialize(base_url: nil, token: nil)
+    attr_accessor :default_timeout
+    attr_accessor :max_retry_times
+
+    # @param base_url [String] API 基础 URL
+    # @param token [String] 认证 token
+    # @param default_timeout [Integer] 默认超时时间（秒），默认 60 秒
+    # @param max_retry_times [Integer] 最大重试次数，默认 3
+    def initialize(base_url: nil, token: nil, default_timeout: nil, max_retry_times: 3)
       @base_url = base_url
       @token = token
+      @default_timeout = default_timeout || 60
+      @max_retry_times = max_retry_times || 3
       @connection = nil
     end
 
     # GET 请求
-    def get(path, params: nil)
-      request(:get, path, params: params)
+    # @param timeout [Integer, nil] 超时时间，nil 时使用 default_timeout
+    def get(path, params: nil, timeout: nil)
+      request(:get, path, params: params, timeout: timeout)
     end
 
     # POST 请求
+    # @param timeout [Integer, nil] 超时时间，nil 时使用 default_timeout
     def post(path, body: nil, timeout: nil)
       request(:post, path, body: body, timeout: timeout)
     end
@@ -35,6 +45,16 @@ module JPSClient
     def request(method, path, params: nil, body: nil, timeout: nil)
       url = @base_url + path
 
+      # 如果没有指定 timeout，使用默认超时
+      actual_timeout = timeout || @default_timeout
+
+      # 调试输出：请求信息
+      if ENV['JPS_CLIENT_DEBUG']
+        puts "[JPS_CLIENT_DEBUG] HTTP #{method.upcase} #{url}"
+        puts "[JPS_CLIENT_DEBUG] Params: #{params.inspect}" if params
+        puts "[JPS_CLIENT_DEBUG] Timeout: #{actual_timeout}s" if actual_timeout
+      end
+
       begin
         response = connection.send(method) do |req|
           req.url url
@@ -42,11 +62,24 @@ module JPSClient
           req.headers['token'] = @token if @token
           req.params = params if params
           req.body = body.to_json if body && method == :post
-          req.options.timeout = timeout if timeout
+          req.options.timeout = actual_timeout if actual_timeout
         end
 
-        parse_response(response)
+        result = parse_response(response)
+
+        # 调试输出：响应信息
+        if ENV['JPS_CLIENT_DEBUG']
+          puts "[JPS_CLIENT_DEBUG] HTTP Response: code=#{result[:code]}, success=#{result[:success]}"
+          puts "[JPS_CLIENT_DEBUG] Response body: #{result[:body].inspect}" if result[:body]
+        end
+
+        result
       rescue Faraday::Error => e
+        # 调试输出：错误信息
+        if ENV['JPS_CLIENT_DEBUG']
+          puts "[JPS_CLIENT_DEBUG] HTTP Error: #{e.class} - #{e.message}"
+        end
+
         # 处理网络错误
         {
           code: 0,
@@ -62,7 +95,7 @@ module JPSClient
       @connection ||= Faraday.new do |config|
         # 重试配置
         config.request :retry, {
-          max: 3,
+          max: @max_retry_times,
           interval: 0.5,
           backoff_factor: 2,
           interval_randomness: 0.5,

data/lib/jpsclient/upload/upload_config.rb

@@ -9,11 +9,14 @@ module JPSClient
     attr_accessor :access_key_secret
     attr_accessor :default_url
     attr_accessor :attach_url
-    attr_accessor :upload_type         # 新增：上传类型
-    attr_accessor :concurrent_workers   # 新增：并发上传工作线程数
-    attr_accessor :chunk_size_mb       # 新增：分片大小（MB）
-    attr_accessor :max_retry_times     # 新增：每个分片的最大重试次数
-    attr_accessor :timeout_seconds     # 新增：单个分片的超时时间（秒）
+    attr_accessor :upload_type         # 上传类型
+    attr_accessor :concurrent_workers   # 并发上传工作线程数
+    attr_accessor :chunk_size_mb       # 分片大小（MB）
+    attr_accessor :max_retry_times     # 每个分片的最大重试次数
+    attr_accessor :timeout_seconds     # 单个分片的超时时间（秒）
+    attr_accessor :media_region        # 媒体文件上传区域
+    attr_accessor :media_bucket_name   # 媒体文件存储桶
+    attr_accessor :media_default_url   # 媒体文件默认路径
 
     def initialize(
       region: nil,
@@ -26,7 +29,10 @@ module JPSClient
       concurrent_workers: nil,
       chunk_size_mb: nil,
       max_retry_times: nil,
-      timeout_seconds: nil
+      timeout_seconds: nil,
+      media_region: nil,
+      media_bucket_name: nil,
+      media_default_url: nil
     )
       @region = region
       @bucket_name = bucket_name
@@ -39,6 +45,9 @@ module JPSClient
       @chunk_size_mb = chunk_size_mb
       @max_retry_times = max_retry_times
       @timeout_seconds = timeout_seconds
+      @media_region = media_region
+      @media_bucket_name = media_bucket_name
+      @media_default_url = media_default_url
     end
 
     # 从 JSON 配置创建实例
@@ -59,7 +68,10 @@ module JPSClient
         concurrent_workers: concurrent_workers,
         chunk_size_mb: json_config['chunk_size_mb'] || 5,
         max_retry_times: json_config['max_retry_times'] || 6,  # 每个分片重试6次
-        timeout_seconds: json_config['timeout_seconds'] || 600  # 单个分片超时10分钟
+        timeout_seconds: json_config['timeout_seconds'] || 600,  # 单个分片超时10分钟
+        media_region: json_config['media_region'] || "ap-east-1",
+        media_bucket_name: json_config['media_bucket_name'] || "jps-resource",
+        media_default_url: json_config['media_default_url'] || "resource/"
       )
     end
 
@@ -126,7 +138,10 @@ module JPSClient
         'concurrent_workers' => @concurrent_workers,
         'chunk_size_mb' => @chunk_size_mb,
         'max_retry_times' => @max_retry_times,
-        'timeout_seconds' => @timeout_seconds
+        'timeout_seconds' => @timeout_seconds,
+        'media_region' => @media_region,
+        'media_bucket_name' => @media_bucket_name,
+        'media_default_url' => @media_default_url
       }
     end
   end

data/lib/jpsclient/upload/upload_media_client.rb

@@ -0,0 +1,374 @@
+require 'securerandom'
+require 'typhoeus'
+require 'thread'
+require 'jpsclient/base/exception'
+require 'jpsclient/upload/upload_config'
+require 'jpsclient/utils/logger'
+
+module JPSClient
+  # Media 文件上传客户端
+  # 用于并发上传多个小文件（图片、视频等）到 S3
+  # 与 UploadClient 的区别：
+  #   - UploadClient: 单个大文件 → 分片 → 并发上传分片
+  #   - UploadMediaClient: 多个小文件 → 并发上传文件
+  class UploadMediaClient
+    attr_reader :jps_client
+
+    def initialize(jps_client)
+      raise ExceptionError, "必须提供 Client 实例" unless jps_client
+
+      @jps_client = jps_client
+
+      # 从 Client 获取配置
+      config_json = @jps_client.config_json
+
+      # 加载上传配置
+      @upload_config = UploadConfig.from_json(config_json["upload_config"])
+      unless @upload_config
+        raise ExceptionError, "上传配置无效或不完整"
+      end
+
+      # 线程安全的互斥锁
+      @results_mutex = Mutex.new
+      @tasks_queue_mutex = Mutex.new
+      @active_tasks_mutex = Mutex.new
+      @upload_failed_mutex = Mutex.new
+      @upload_failed = false
+    end
+
+    # 并发上传多个 media 文件
+    #
+    # @param file_paths [Array<String>] 要上传的文件路径列表
+    # @return [Hash] 上传结果
+    #   - results: 每个文件的上传结果数组
+    #   - success_urls: 成功上传的 URL 列表
+    #   - failed_files: 上传失败的文件路径列表
+    #   - total: 总文件数
+    #   - success_count: 成功数
+    #   - failed_count: 失败数
+    def upload_files(file_paths:)
+      result = {
+        "results" => [],
+        "success_urls" => [],
+        "failed_files" => [],
+        "total" => 0,
+        "success_count" => 0,
+        "failed_count" => 0
+      }
+
+      # 验证参数
+      if file_paths.nil? || file_paths.empty?
+        Logger.instance.fancyinfo_error("未提供要上传的文件")
+        return result
+      end
+
+      # 过滤有效文件
+      valid_files = file_paths.select { |f| File.exist?(f) }
+      invalid_files = file_paths - valid_files
+
+      # 记录无效文件
+      invalid_files.each do |f|
+        result["results"] << {
+          "file_path" => f,
+          "url" => nil,
+          "success" => false,
+          "error" => "文件不存在"
+        }
+        result["failed_files"] << f
+      end
+
+      if valid_files.empty?
+        result["total"] = file_paths.size
+        result["failed_count"] = invalid_files.size
+        Logger.instance.fancyinfo_error("没有有效的文件可上传")
+        return result
+      end
+
+      result["total"] = file_paths.size
+
+      # 重置状态
+      @upload_failed = false
+      @upload_results = []
+
+      # 准备任务队列
+      @tasks_queue = Queue.new
+      @worker_threads = []
+      @expected_files = valid_files.size
+      @active_tasks = 0
+
+      # 获取并发和重试配置
+      concurrent_workers = [@upload_config.concurrent_workers, valid_files.size].min
+      retry_count = @upload_config.max_retry_times
+
+      puts "准备上传 #{valid_files.size} 个文件"
+      puts "并发上传线程数: #{concurrent_workers}"
+      puts "失败重试次数: #{retry_count}"
+      puts
+
+      # 创建文件上传任务
+      valid_files.each do |file_path|
+        task_item = {
+          "file_path" => file_path,
+          "retry_count" => retry_count
+        }
+        @tasks_queue.push(task_item)
+      end
+
+      # 开始并发上传
+      Logger.instance.fancyinfo_start("开始上传...")
+
+      begin
+        concurrent_upload(concurrency: concurrent_workers)
+      ensure
+        cleanup_worker_threads
+      end
+
+      # 收集结果
+      @upload_results.each do |item|
+        result["results"] << item
+        if item["success"]
+          result["success_urls"] << item["url"]
+          result["success_count"] += 1
+        else
+          result["failed_files"] << item["file_path"]
+          result["failed_count"] += 1
+        end
+      end
+
+      # 加上之前的无效文件
+      result["failed_count"] += invalid_files.size
+
+      # 输出统计
+      if result["success_count"] > 0
+        Logger.instance.fancyinfo_success("上传完成! 成功: #{result["success_count"]}, 失败: #{result["failed_count"]}")
+      else
+        Logger.instance.fancyinfo_error("上传失败! 成功: #{result["success_count"]}, 失败: #{result["failed_count"]}")
+      end
+
+      return result
+    end
+
+    # 上传单个文件（便捷方法）
+    #
+    # @param file_path [String] 文件路径
+    # @return [String, nil] 成功返回 URL，失败返回 nil
+    def upload_file(file_path:)
+      result = upload_files(file_paths: [file_path])
+      result["success_urls"].first
+    end
+
+    private
+
+    # 并发上传控制
+    def concurrent_upload(concurrency: 1)
+      @worker_threads = []
+      @active_tasks = 0
+      @stop_workers = false
+      @task_complete_cv = ConditionVariable.new
+
+      # 创建工作线程
+      concurrency.times do
+        @worker_threads << Thread.new { worker_loop }
+      end
+
+      # 等待所有任务完成
+      @tasks_queue_mutex.synchronize do
+        while (@active_tasks > 0 || !@tasks_queue.empty?) && !upload_failed?
+          @task_complete_cv.wait(@tasks_queue_mutex, 30)
+        end
+      end
+
+      # 停止工作线程
+      @stop_workers = true
+      @tasks_queue_mutex.synchronize { @task_complete_cv.broadcast }
+
+      # 等待线程结束
+      @worker_threads.each do |t|
+        t.join(5)
+        t.kill if t.alive?
+      end
+    end
+
+    # 工作线程循环
+    def worker_loop
+      loop do
+        task_item = nil
+
+        # 从队列获取任务
+        @tasks_queue_mutex.synchronize do
+          return if @stop_workers || (upload_failed? && @tasks_queue.empty?)
+
+          if @tasks_queue.empty?
+            @task_complete_cv.wait(@tasks_queue_mutex, 1)
+            next
+          end
+
+          task_item = @tasks_queue.pop
+        end
+
+        # 增加活跃任务计数
+        @active_tasks_mutex.synchronize { @active_tasks += 1 } if task_item
+
+        # 处理任务
+        if task_item
+          begin
+            process_upload_task(task_item)
+          rescue => e
+            handle_task_error(task_item, e.message)
+          ensure
+            @active_tasks_mutex.synchronize { @active_tasks -= 1 }
+            @tasks_queue_mutex.synchronize { @task_complete_cv.broadcast }
+          end
+        end
+
+        break if upload_failed?
+      end
+    end
+
+    # 处理单个文件上传任务
+    def process_upload_task(task_item)
+      file_path = task_item["file_path"]
+      file_name = File.basename(file_path)
+
+      # 生成 S3 Key
+      file_uuid = SecureRandom.uuid
+      extension = File.extname(file_path)
+      s3_key = "#{@upload_config.media_default_url}#{file_uuid}#{extension}"
+
+      # 获取预签名 URL
+      sign_result = @jps_client.get_simple_sign_url(
+        s3_key: s3_key,
+        upload_config: @upload_config
+      )
+
+      unless sign_result && sign_result.dig("data", "url")
+        handle_retry(task_item, "获取预签名 URL 失败")
+        return
+      end
+
+      upload_url = sign_result["data"]["url"]
+
+      # 读取文件
+      begin
+        file_content = File.binread(file_path)
+        file_size = file_content.bytesize
+      rescue => e
+        handle_retry(task_item, "读取文件失败: #{e.message}")
+        return
+      end
+
+      # 计算超时时间（基于文件大小，最小 30 秒，最大 300 秒）
+      timeout = calculate_timeout(file_size)
+
+      # 上传文件
+      request = Typhoeus::Request.new(
+        upload_url,
+        method: :put,
+        body: file_content,
+        headers: {
+          'Content-Type' => 'application/octet-stream',
+          'Content-Length' => file_size.to_s
+        },
+        timeout: timeout,
+        connecttimeout: 30
+      )
+
+      response = request.run
+
+      if response.success?
+        # 构建文件访问 URL
+        file_url = "https://#{@upload_config.media_bucket_name}.s3.#{@upload_config.media_region}.amazonaws.com/#{s3_key}"
+
+        # 记录成功结果
+        @results_mutex.synchronize do
+          @upload_results << {
+            "file_path" => file_path,
+            "url" => file_url,
+            "success" => true,
+            "error" => nil
+          }
+        end
+
+        puts "  ✅ #{file_name}"
+      elsif response.timed_out?
+        handle_retry(task_item, "上传超时")
+      elsif response.code == 0
+        error_msg = response.return_message || "网络错误"
+        handle_retry(task_item, error_msg)
+      else
+        handle_retry(task_item, "HTTP #{response.code}")
+      end
+    end
+
+    # 处理重试
+    def handle_retry(task_item, error_reason)
+      file_path = task_item["file_path"]
+      file_name = File.basename(file_path)
+
+      task_item["retry_count"] -= 1
+
+      if task_item["retry_count"] > 0
+        # 放回队列重试
+        puts "  ⚠️  #{file_name} 失败: #{error_reason}，准备重试..."
+        @tasks_queue_mutex.synchronize { @tasks_queue.push(task_item) }
+      else
+        # 达到最大重试次数，记录失败
+        puts "  ❌ #{file_name} 失败: #{error_reason}"
+        @results_mutex.synchronize do
+          @upload_results << {
+            "file_path" => file_path,
+            "url" => nil,
+            "success" => false,
+            "error" => error_reason
+          }
+        end
+      end
+    end
+
+    # 处理任务异常
+    def handle_task_error(task_item, error_message)
+      file_path = task_item["file_path"]
+      @results_mutex.synchronize do
+        @upload_results << {
+          "file_path" => file_path,
+          "url" => nil,
+          "success" => false,
+          "error" => error_message
+        }
+      end
+    end
+
+    # 计算上传超时时间
+    def calculate_timeout(file_size)
+      # 假设最低速度 100KB/s
+      min_speed = 100 * 1024
+      calculated = (file_size.to_f / min_speed).ceil + 10
+
+      # 限制在 30-300 秒之间
+      [[calculated, 30].max, 300].min
+    end
+
+    # 检查是否上传失败
+    def upload_failed?
+      @upload_failed_mutex.synchronize { @upload_failed }
+    end
+
+    # 设置上传失败状态
+    def set_upload_failed(error_msg = nil)
+      @upload_failed_mutex.synchronize do
+        @upload_failed = true
+        Logger.instance.fancyinfo_error("上传失败: #{error_msg}") if error_msg
+      end
+    end
+
+    # 清理工作线程
+    def cleanup_worker_threads
+      return unless @worker_threads
+
+      @worker_threads.each do |thread|
+        thread.exit if thread.alive?
+      end
+      @worker_threads.clear
+    end
+  end
+end

data/lib/jpsclient/version.rb

@@ -1,3 +1,3 @@
 module JPSClient
-  VERSION = "1.5.0"
+  VERSION = "1.7.0"
 end

data/lib/jpsclient.rb

@@ -4,9 +4,7 @@ require 'jpsclient/version'
 # 基础模块
 require 'jpsclient/base/exception'
 require 'jpsclient/base/api_config'
-
-# API 客户端
-require 'jpsclient/api/client'
+require 'jpsclient/base/client'
 
 # 工具模块
 require 'jpsclient/utils/logger'
@@ -23,6 +21,7 @@ require 'jpsclient/auth/auth'
 require 'jpsclient/upload/upload_config'
 require 'jpsclient/upload/upload_progress'
 require 'jpsclient/upload/upload_client'
+require 'jpsclient/upload/upload_media_client'
 
 module JPSClient
   class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpsclient
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Your Name
@@ -211,7 +211,6 @@ files:
 - lib/jpsclient/api/bug.rb
 - lib/jpsclient/api/category.rb
 - lib/jpsclient/api/cert.rb
-- lib/jpsclient/api/client.rb
 - lib/jpsclient/api/collect.rb
 - lib/jpsclient/api/collection.rb
 - lib/jpsclient/api/commit_log.rb
@@ -273,10 +272,12 @@ files:
 - lib/jpsclient/auth/auth.rb
 - lib/jpsclient/auth/token.rb
 - lib/jpsclient/base/api_config.rb
+- lib/jpsclient/base/client.rb
 - lib/jpsclient/base/exception.rb
 - lib/jpsclient/http/http_client.rb
 - lib/jpsclient/upload/upload_client.rb
 - lib/jpsclient/upload/upload_config.rb
+- lib/jpsclient/upload/upload_media_client.rb
 - lib/jpsclient/upload/upload_progress.rb
 - lib/jpsclient/utils/aes.rb
 - lib/jpsclient/utils/logger.rb