pindo 5.13.1 → 5.13.2

data/lib/pindo/module/build/swark_helper.rb

@@ -2,94 +2,133 @@ require 'highline/import'
 require 'xcodeproj'
 require 'json'
 require 'yaml'
-
+require 'pindo/base/git_handler'
 
 module Pindo
-    module SwarkHelper
-    
-                def check_swark_authorize(config_json:nil, buid_type:nil)
-                    if !config_json.nil? && config_json['project_info']['xcode_build_type'] && config_json["project_info"]["xcode_build_type"].include?("swark")
-
-                        app_config_dir = File.join(File::expand_path(pindo_single_config.pindo_dir), @deploy_identifier)
-                        swark_authorize_file = File.join(app_config_dir, "swark_authorize.json")
-                        if File.exist?(swark_authorize_file)
-                            swark_authorize_json=JSON.parse(File.read(swark_authorize_file))
-                            unless swark_authorize_json && swark_authorize_json['swark_authorize_status']
-                                show_swark_authorize_error(swark_authorize_json:swark_authorize_json , buid_type:buid_type)
-                            end
-                        end
-                    end
-                end
+    # Swark 授权辅助类
+    # 负责 Swark 授权检查、权限配置等操作
+    class SwarkHelper
+
+        # 检查 Swark 授权状态
+        # @param config_json [Hash] 配置 JSON 对象
+        # @param buid_type [String] 构建类型（dev/adhoc/appstore）
+        # @param deploy_identifier [String] 部署标识符
+        def self.check_swark_authorize(config_json:, buid_type:, deploy_identifier:)
+            return unless config_json &&
+                         config_json['project_info'] &&
+                         config_json['project_info']['xcode_build_type'] &&
+                         config_json['project_info']['xcode_build_type'].include?("swark")
 
-                def show_swark_authorize_error(swark_authorize_json:nil, buid_type:nil)
-
-                    puts  "++++ +++ Need authorize !!! ++++"
-                    puts  "+++ Need authorize !!! ++++"
-                    puts  "+++ Need authorize !!! +++++"
-                    puts  " =========================="
-                    puts
-
-                    puts "方法一："
-                    command = "     1. swark authorize "
-                    command = command + swark_authorize_json["swark_authorize_teamid"] + "." + swark_authorize_json["swark_authorize_bundleid"]
-                    puts  command
-                    command = "     2. 修改swark_authorize.json 中的 swark_authorize_status = true 并且提交"
-                    puts
-
-                    puts "方法二："
-                    puts "      pindo deploy quswark"
-                    if buid_type.downcase.to_s.include?("appstore")
-                        raise Informative, "Need  swark authorize !!!"
-                    end
+            require 'pindo/config/pindoconfig'
+            app_config_dir = File.join(File.expand_path(Pindoconfig.instance.pindo_dir), deploy_identifier)
+            swark_authorize_file = File.join(app_config_dir, "swark_authorize.json")
+
+            if File.exist?(swark_authorize_file)
+                swark_authorize_json = JSON.parse(File.read(swark_authorize_file))
+                unless swark_authorize_json && swark_authorize_json['swark_authorize_status']
+                    show_swark_authorize_error(
+                        swark_authorize_json: swark_authorize_json,
+                        buid_type: buid_type
+                    )
                 end
+            end
+        end
 
+        # 显示 Swark 授权错误信息
+        # @param swark_authorize_json [Hash] Swark 授权配置 JSON
+        # @param buid_type [String] 构建类型
+        def self.show_swark_authorize_error(swark_authorize_json:, buid_type:)
+            puts "++++ +++ Need authorize !!! ++++"
+            puts "+++ Need authorize !!! ++++"
+            puts "+++ Need authorize !!! +++++"
+            puts " =========================="
+            puts
 
-            def add_swark_entitlement(entitlements_plist_path:nil, bundle_id_dict:nil)
-              if @config_json['project_info']['xcode_build_type'] && @config_json["project_info"]["xcode_build_type"].include?("swark")
-                if File.exist?(entitlements_plist_path)
-                  entitlements_plist_dict = Xcodeproj::Plist.read_from_path(entitlements_plist_path)
+            puts "方法一："
+            command = "     1. swark authorize "
+            command += swark_authorize_json["swark_authorize_teamid"] + "." + swark_authorize_json["swark_authorize_bundleid"]
+            puts command
+            puts "     2. 修改swark_authorize.json 中的 swark_authorize_status = true 并且提交"
+            puts
 
-                  key_value = @team_id_vaule 
-                  key_value = key_value + "." +  @bundle_id
-                  entitlements_plist_dict['keychain-access-groups'] = [key_value]
+            puts "方法二："
+            puts "      pindo deploy quswark"
 
-                  Xcodeproj::Plist.write_to_path(entitlements_plist_dict, entitlements_plist_path)
-                end
-              end
+            if buid_type.downcase.to_s.include?("appstore")
+                raise Informative, "Need swark authorize !!!"
             end
+        end
+
+        # 添加 Swark 权限配置到 entitlements
+        # @param entitlements_plist_path [String] entitlements.plist 文件路径
+        # @param bundle_id_dict [Hash] Bundle ID 字典
+        # @param config_json [Hash] 配置 JSON 对象
+        # @param team_id [String] Team ID
+        # @param bundle_id [String] Bundle ID
+        def self.add_swark_entitlement(
+            entitlements_plist_path:,
+            bundle_id_dict:,
+            config_json:,
+            team_id:,
+            bundle_id:
+        )
+            return unless config_json &&
+                         config_json['project_info'] &&
+                         config_json['project_info']['xcode_build_type'] &&
+                         config_json['project_info']['xcode_build_type'].include?("swark")
+
+            return unless File.exist?(entitlements_plist_path)
+
+            entitlements_plist_dict = Xcodeproj::Plist.read_from_path(entitlements_plist_path)
 
-            def add_swark_authorize_json
-              if @build_type == "appstore" && @config_json['project_info']['xcode_build_type'] && @config_json["project_info"]["xcode_build_type"].include?("swark")
-                      
-                app_config_dir = clong_buildconfig_repo(repo_name: @deploy_repo_name)
-                swark_authorize_file = File.join(app_config_dir, "swark_authorize.json")
-                if File.exist?(swark_authorize_file)
-                    swark_authorize_json=JSON.parse(File.read(swark_authorize_file))
-                    if swark_authorize_json && swark_authorize_json['swark_authorize_status']
-                        puts "swark already authorize success !!! "
-                    else
-                        swark_authorize_json = swark_authorize_json || {}
-                        swark_authorize_json['swark_authorize_teamid'] = @team_id_vaule
-                        swark_authorize_json['swark_authorize_bundleid'] = @bundle_id
-                        swark_authorize_json['swark_authorize_status'] = false
-                        File.open(swark_authorize_file, "w") do |f|
-                          f.write(JSON.pretty_generate(swark_authorize_json))
-                        end
-                        git_addpush_repo(path:app_config_dir, message:"add swark authorize json")
-                    end
-                else
-                  swark_authorize_json = swark_authorize_json || {}
-                  swark_authorize_json['swark_authorize_teamid'] = @team_id_vaule
-                  swark_authorize_json['swark_authorize_bundleid'] = @bundle_id
-                  swark_authorize_json['swark_authorize_status'] = false
-                  File.open(swark_authorize_file, "w") do |f|
-                    f.write(JSON.pretty_generate(swark_authorize_json))
-                  end
-                  git_addpush_repo(path:app_config_dir, message:"add swark authorize json")
+            key_value = team_id + "." + bundle_id
+            entitlements_plist_dict['keychain-access-groups'] = [key_value]
+
+            Xcodeproj::Plist.write_to_path(entitlements_plist_dict, entitlements_plist_path)
+        end
+
+        # 添加 Swark 授权配置文件
+        # @param build_type [String] 构建类型（dev/adhoc/appstore）
+        # @param config_json [Hash] 配置 JSON 对象
+        # @param team_id [String] Team ID
+        # @param bundle_id [String] Bundle ID
+        # @param deploy_repo_name [String] 部署仓库名称
+        def self.add_swark_authorize_json(
+            build_type:,
+            config_json:,
+            team_id:,
+            bundle_id:,
+            deploy_repo_name:
+        )
+            return unless build_type == "appstore" &&
+                         config_json &&
+                         config_json['project_info'] &&
+                         config_json['project_info']['xcode_build_type'] &&
+                         config_json['project_info']['xcode_build_type'].include?("swark")
+
+            app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: deploy_repo_name)
+            swark_authorize_file = File.join(app_config_dir, "swark_authorize.json")
+
+            if File.exist?(swark_authorize_file)
+                swark_authorize_json = JSON.parse(File.read(swark_authorize_file))
+                if swark_authorize_json && swark_authorize_json['swark_authorize_status']
+                    puts "swark already authorize success !!! "
+                    return
                 end
-                
-              end
             end
 
+            # 创建或更新授权文件
+            swark_authorize_json = {}
+            swark_authorize_json['swark_authorize_teamid'] = team_id
+            swark_authorize_json['swark_authorize_bundleid'] = bundle_id
+            swark_authorize_json['swark_authorize_status'] = false
+
+            File.open(swark_authorize_file, "w") do |f|
+                f.write(JSON.pretty_generate(swark_authorize_json))
+            end
+
+            Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "add swark authorize json")
+        end
+
     end
-end
+end

data/lib/pindo/module/cert/cert_helper.rb

@@ -2,6 +2,8 @@
 
 require 'match'
 require 'openssl'
+require 'open3'
+require 'fileutils'
 require 'pindo/base/aeshelper'
 require 'pindo/module/cert/keychain_helper'
 require 'pindo/module/cert/provisioning_helper'
@@ -14,6 +16,78 @@ module Pindo
     @@password_cache = {}
 
     class << self
+      # 清理 Git 仓库中的证书
+      # @param apple_id [String] Apple ID
+      # @param pindo_dir [String] Pindo 目录路径
+      # @param deploy_cert_giturl [String] 部署证书 Git URL
+      # @param dev_cert_giturl [String] 开发证书 Git URL
+      # @param demo_apple_id [String] Demo Apple ID
+      def clean_git_certs(apple_id:, pindo_dir:, deploy_cert_giturl:, dev_cert_giturl:, demo_apple_id:)
+        require_relative '../../base/git_handler'
+
+        # 确定使用哪个 Git URL
+        git_url = apple_id.eql?(demo_apple_id) ? dev_cert_giturl : deploy_cert_giturl
+
+        puts "正在清理 Git 仓库中的证书..."
+        puts "Apple ID: #{apple_id}"
+        puts "Git URL: #{git_url}"
+
+        # 克隆或更新证书仓库
+        cert_repo_dir = Pindo::GitHandler.getcode_to_dir(
+          reponame: Pindo::GitHandler.get_repo_base_name(repo_url: git_url),
+          remote_url: git_url,
+          path: pindo_dir,
+          new_branch: apple_id
+        )
+
+        # 删除 certs 和 profiles 目录
+        certs_dir = File.join(cert_repo_dir, "certs")
+        profiles_dir = File.join(cert_repo_dir, "profiles")
+
+        FileUtils.rm_rf(certs_dir) if File.exist?(certs_dir)
+        FileUtils.rm_rf(profiles_dir) if File.exist?(profiles_dir)
+
+        puts "✓ 已删除 certs 和 profiles 目录"
+
+        # 提交并推送到远程仓库
+        Pindo::GitHandler.prepare_gitenv()
+        Pindo::GitHandler.git_addpush_repo(path: cert_repo_dir, message: "remove #{apple_id} certs")
+
+        puts "✓ Git 仓库证书清理完成"
+      end
+
+      # 清理本地证书
+      # 删除系统中所有的 Apple Development 和 Apple Distribution 证书
+      # 清理 Provisioning Profiles 文件夹
+      def clean_local_certs
+        puts "正在清理本地证书..."
+
+        # 获取所有代码签名证书
+        output, _ = Open3.capture2('security find-identity -p codesigning')
+        identity_ids_0 = []
+        identity_ids_1 = output.split("\n").map { |line| line.split(' ')[1] if line.include?('Apple Development') }.compact
+        identity_ids_2 = output.split("\n").map { |line| line.split(' ')[1] if line.include?('Apple Distribution') }.compact
+        identity_ids = identity_ids_0 + identity_ids_1 + identity_ids_2
+        identity_ids = identity_ids.uniq
+
+        puts "找到 #{identity_ids.size} 个证书:"
+        puts identity_ids
+
+        # 删除证书
+        identity_ids.each do |identity_id|
+          system "security delete-certificate -Z #{identity_id}"
+        end
+
+        # 清理 Provisioning Profiles
+        profile_file_dir = File.expand_path("~/Library/MobileDevice")
+        profile_file_path = File.join(profile_file_dir, "Provisioning Profiles")
+        if File.exist?(profile_file_path)
+          FileUtils.rm_rf(profile_file_path)
+          puts "✓ 已清理 Provisioning Profiles 文件夹"
+        end
+
+        puts "✓ 本地证书清理完成"
+      end
       # 获取密码的辅助方法，使用缓存避免重复获取
       def get_cached_password(cert_url)
         unless @@password_cache[cert_url]

data/lib/pindo/module/cert/pem_helper.rb

@@ -4,6 +4,78 @@ module Pindo
   class PemHelper
     class << self
 
+      # 从配置文件中提取所有必要的信息
+      # @param config_json [Hash] 配置 JSON 对象
+      # @return [Hash] 提取的配置信息
+      def extract_config_info(config_json)
+        config_info = {}
+
+        # 提取 Apple ID
+        if config_json['account_info'] && config_json['account_info']['apple_acount_id']
+          config_info[:apple_id] = config_json['account_info']['apple_acount_id']
+        end
+
+        # 提取 Bundle ID
+        if config_json['app_info'] && config_json['app_info']['app_identifier']
+          config_info[:bundle_id] = config_json['app_info']['app_identifier']
+        end
+
+        config_info
+      end
+
+      # 执行 Push 证书创建流程
+      # @param config_json [Hash] 配置 JSON 对象
+      # @param dev_flag [Boolean] 是否为开发证书
+      # @param deploy_repo_name [String, nil] 部署仓库名称
+      def execute_pem_creation(config_json:, dev_flag: false, deploy_repo_name: nil)
+        require_relative '../../base/githelper'
+        include Pindo::Githelper
+
+        # 提取配置信息
+        config_info = extract_config_info(config_json)
+
+        # 验证必需字段
+        raise "配置文件中缺少 Apple ID" if config_info[:apple_id].nil? || config_info[:apple_id].empty?
+        raise "配置文件中缺少 Bundle ID" if config_info[:bundle_id].nil? || config_info[:bundle_id].empty?
+
+        # 登录 Apple 开发者中心
+        puts config_info[:apple_id]
+        puts "Login #{config_info[:apple_id]}..."
+        login(apple_id: config_info[:apple_id])
+
+        # 确定证书类型
+        pem_type = dev_flag ? "dev" : "prod"
+
+        # 创建输出目录
+        temp_dir = "push_" + Time.now.to_i.to_s
+        push_path = File.join(File.expand_path('~/Desktop/'), temp_dir)
+        FileUtils.mkdir_p(push_path) unless File.exist?(push_path)
+        puts "证书输出路径: #{push_path}"
+
+        # 创建证书
+        x509_cert_path = create_certificate(
+          bundle_id: config_info[:bundle_id],
+          type: pem_type,
+          output_path: push_path
+        )
+
+        # 如果提供了部署仓库名称，则上传到 Git 仓库
+        if !deploy_repo_name.nil? && !deploy_repo_name.empty? && File.exist?(x509_cert_path) && File.exist?(push_path)
+          app_config_dir = clong_buildconfig_repo(repo_name: deploy_repo_name)
+          push_repo_dir = File.join(app_config_dir, "push")
+
+          FileUtils.mkdir_p(push_repo_dir) unless File.exist?(push_repo_dir)
+          FileUtils.cp_r(File.join(push_path, "."), push_repo_dir)
+
+          prepare_gitenv()
+          git_addpush_repo(path: app_config_dir, message: "add push cert")
+
+          puts "✓ 证书已上传到配置仓库: #{push_repo_dir}"
+        end
+
+        x509_cert_path
+      end
+
       def create_certificate(bundle_id:nil, type:"prod", output_path:"")
 
         if bundle_id.empty? || output_path.empty?

data/lib/pindo/module/cert/{xcodecerthelper.rb → xcode_cert_helper.rb}

@@ -4,8 +4,139 @@ require 'pindo/base/aeshelper'
 
 module Pindo
 
-    module XcodeCertHelper
-        
+    class XcodeCertHelper
+
+        class << self
+
+        # 标准化构建类型
+        # @param build_type [String, Symbol] 构建类型 ('dev', 'adhoc', 'release', 'development', 'appstore')
+        # @return [String] 标准化后的证书类型 ('development', 'adhoc', 'appstore')
+        def normalize_build_type(build_type)
+            case build_type.to_s.downcase
+            when 'dev', 'development'
+                'development'
+            when 'adhoc'
+                'adhoc'
+            when 'release', 'appstore'
+                'appstore'
+            else
+                raise ArgumentError, "无效的构建类型: #{build_type}，支持的类型: dev/development, adhoc, release/appstore"
+            end
+        end
+
+        # 安装证书并配置 Xcode 工程
+        # @param build_type [String, Symbol] 构建类型 ('dev', 'adhoc', 'release' 或 'development', 'adhoc', 'appstore')
+        # @param platform_type [String] 平台类型 ('ios', 'macos')
+        # @param project_dir [String] 项目目录
+        # @param config_file [String, nil] 配置文件路径（可选，默认从 project_dir 加载）
+        # @param skip_xcode_config [Boolean] 是否跳过 Xcode 配置
+        # @return [Hash] 返回证书信息 { provisioning_info_array:, team_id: }
+        def install_and_config_certs(
+            build_type:,
+            platform_type: 'ios',
+            project_dir: Dir.pwd,
+            config_file: nil,
+            skip_xcode_config: false
+        )
+            # 标准化构建类型
+            cert_type = normalize_build_type(build_type)
+
+            # 配置加载
+            require 'pindo/config/ios_config_parser'
+            config_parser = Pindo::IosConfigParser.instance
+            config_path = config_file || File.join(project_dir, 'config.json')
+            config_parser.load_config(config_file: config_path)
+
+            apple_id = config_parser.apple_id
+            bundle_id_map = config_parser.get_bundle_id_map
+
+            # 安装证书
+            require 'pindo/config/pindoconfig'
+            require 'pindo/base/git_handler'
+            require 'pindo/module/cert/cert_helper'
+
+            pindo_config = Pindoconfig.instance
+
+            cert_git_url = apple_id.eql?(pindo_config.demo_apple_id) ?
+                          pindo_config.dev_cert_giturl :
+                          pindo_config.deploy_cert_giturl
+
+            cert_reponame = cert_git_url.split("/").last.chomp(".git")
+            certs_dir = Pindo::GitHandler.getcode_to_dir(
+                reponame: cert_reponame,
+                remote_url: cert_git_url,
+                path: pindo_config.pindo_dir,
+                new_branch: apple_id
+            )
+
+            # 安装证书和配置文件
+            Pindo::CertHelper.install_certs(
+                cert_url: cert_git_url,
+                certs_dir: certs_dir,
+                cert_type: cert_type,
+                platform_type: platform_type
+            )
+
+            provisioning_info_array = Pindo::CertHelper.install_provisionfiles(
+                cert_url: cert_git_url,
+                certs_dir: certs_dir,
+                bundle_id_map: bundle_id_map,
+                cert_type: cert_type,
+                platform_type: platform_type
+            )
+
+            pindo_config.set_cert_info(dict: provisioning_info_array)
+
+            raise Informative, "未找到证书信息" if provisioning_info_array.nil? || provisioning_info_array.empty?
+
+            team_id = provisioning_info_array.first["team_id"]
+
+            # Swark 授权检查
+            main_bundle_id = config_parser.bundle_id
+            if config_parser.config_json && main_bundle_id
+                require 'pindo/module/build/swark_helper'
+                Pindo::SwarkHelper.add_swark_authorize_json(
+                    build_type: cert_type,
+                    config_json: config_parser.config_json,
+                    team_id: team_id,
+                    bundle_id: main_bundle_id,
+                    deploy_repo_name: main_bundle_id
+                )
+            end
+
+            # 配置 Xcode 工程 (如果需要)
+            unless skip_xcode_config
+                project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
+                if project_fullname && File.exist?(project_fullname)
+                    proj_name = File.basename(project_fullname, ".xcodeproj")
+
+                    Funlog.instance.fancyinfo_start("正在给Xcode配置证书...")
+                    config_project_cert(
+                        new_proj_name: proj_name,
+                        new_project_dir: project_dir,
+                        cert_type: cert_type,
+                        platform_type: platform_type,
+                        team_id_vaule: team_id,
+                        provisioning_info_array: provisioning_info_array
+                    )
+
+                    config_infoplist_cert(
+                        new_proj_name: proj_name,
+                        new_project_dir: project_dir,
+                        icloud_id: config_parser.icloud_id,
+                        group_id: config_parser.group_id,
+                        provisioning_info_array: provisioning_info_array
+                    )
+                    Funlog.instance.fancyinfo_success("Xcode配置证书完成！")
+                end
+            end
+
+            {
+                provisioning_info_array: provisioning_info_array,
+                team_id: team_id
+            }
+        end
+
         def get_target_name_map
             return {
                 "MainTarget" => "bundle_id",
@@ -28,7 +159,9 @@ module Pindo
 
           provisioning_info_array = []
 
-          bundle_id_map = get_bundle_id_map
+          # 使用 IosConfigParser 单例获取 bundle_id_map
+          config_parser = Pindo::IosConfigParser.instance
+          bundle_id_map = config_parser.get_bundle_id_map
           
           bundle_id_map.each do |type, bundle_id_temp|
             provisioning_info = {}
@@ -224,7 +357,29 @@ module Pindo
                         end
 
                         if target.product_type.to_s.eql?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) then
-                            add_swark_entitlement(entitlements_plist_path:entitlements_plist_path, bundle_id_dict:provisioning_info_array)
+                            # 调用 SwarkHelper 添加权限配置
+                            # 读取 config.json（如果存在）
+                            config_json = nil
+                            config_json_file = File.join(new_project_dir, "config.json")
+                            if File.exist?(config_json_file)
+                              config_json = JSON.parse(File.read(config_json_file))
+                            end
+
+                            # 获取 team_id 和 bundle_id
+                            team_id = provisioning_info_array.first["team_id"] if provisioning_info_array && provisioning_info_array.any?
+                            bundle_id = provisioning_info_array.first["bundle_id"] if provisioning_info_array && provisioning_info_array.any?
+
+                            if config_json && team_id && bundle_id
+                              require 'pindo/module/build/swark_helper'
+                              Pindo::SwarkHelper.add_swark_entitlement(
+                                entitlements_plist_path: entitlements_plist_path,
+                                bundle_id_dict: provisioning_info_array,
+                                config_json: config_json,
+                                team_id: team_id,
+                                bundle_id: bundle_id
+                              )
+                            end
+
                             if !icloud_id.nil?
                               modify_entitlements_plist(entitlements_plist_path:entitlements_plist_path, icloud_id:icloud_id)
                             end
@@ -315,6 +470,7 @@ module Pindo
         end
 
         def create_upload_cert_info(apple_id:nil, cert_type:nil, platform_type:nil)
+            pindo_single_config = Pindoconfig.instance
 
             cert_dest_dir = File.join(Dir.pwd, "cert")
             if !File.exist?(cert_dest_dir)
@@ -483,6 +639,52 @@ module Pindo
             return account_cert_set
         end
 
+        def get_create_cert_match_values(apple_id:nil, bundle_id_array:nil, build_type:nil, platform_type:nil, renew_flag:false)
+            pindo_single_config = Pindoconfig.instance
+
+            if build_type.eql?("appstore") && (apple_id.eql?(pindo_single_config.demo_apple_id))
+              raise Informative, "#{apple_id} 是测试账号，不能创建appstore证书!!!"
+            end
+            if !build_type.eql?("appstore") && !apple_id.eql?(pindo_single_config.demo_apple_id)
+              raise Informative, "账号#{apple_id} 不能创建dev或者adhoc证书!!!"
+            end
+
+            git_url = pindo_single_config.deploy_cert_giturl
+            if apple_id.eql?(pindo_single_config.demo_apple_id)
+              git_url = pindo_single_config.dev_cert_giturl
+            end
+
+            force_for_new_devices_flag = true
+            if build_type.eql?("appstore")
+              force_for_new_devices_flag = false
+            end
+
+            if platform_type.downcase.include?("macos") && build_type.eql?("adhoc")
+              build_type = "developer_id"
+            end
+
+            values = {
+              username:apple_id,
+              app_identifier: bundle_id_array,
+              type: build_type,
+              keychain_password:"goodcert1",
+              git_url: git_url,
+              readonly:!renew_flag,
+              force:renew_flag,
+              clone_branch_directly:!renew_flag,
+              include_mac_in_profiles:true,
+              include_all_certificates:true,
+              generate_apple_certs:true,
+              shallow_clone:!renew_flag,
+              git_branch: apple_id,
+              platform:platform_type,
+              force_for_new_devices:force_for_new_devices_flag
+            }
+            return values
+
+        end
+
+        end  # class << self
 
-    end
-end
+    end  # class XcodeCertHelper
+end  # module Pindo

data/lib/pindo/module/task/model/appstore/appstore_task.rb

@@ -0,0 +1,18 @@
+require_relative '../pindo_task'
+
+module Pindo
+  module TaskSystem
+    # App Store 任务基类
+    # 所有 App Store 相关任务的抽象基类
+    # 子类包括：AppStoreUploadIpaTask、AppStoreUploadMetadataTask、AppStoreUploadScreenshotTask
+    class AppStoreTask < PindoTask
+      # 空基类，仅用于类型标识
+      # 所有具体实现由子类完成
+
+      # 任务类型
+      def self.task_type
+        :appstore
+      end
+    end
+  end
+end