pindo 5.14.8 → 5.15.1

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

@@ -114,7 +114,7 @@ module Pindo
                         git_app_info_obj, git_workflow_info = pgyer_helper.prepare_upload(
                             working_directory: project_path,
                             proj_name: @args_proj_name,
-                            package_type: "",
+                            package_type: nil,
                             manage_type: "git"
                         )
 

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

@@ -57,6 +57,9 @@ module Pindo
                     # Task 参数
                     @args_select_flag = @options[:select] || false
 
+                    # Git 参数
+                    @args_git_commit = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit])
+
                     super(argv)
                 end
 
@@ -91,7 +94,7 @@ module Pindo
                     app_info_obj, git_workflow_info = pgyer_helper.prepare_upload(
                         working_directory: project_path,
                         proj_name: @args_proj_name,
-                        package_type: "",
+                        package_type: nil,
                         manage_type: "git"
                     )
 
@@ -127,7 +130,8 @@ module Pindo
                     # Git 提交任务
                     process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
                         project_dir: project_path,
-                        interactive: true
+                        interactive: @args_git_commit.nil?,
+                        default_process_type: @args_git_commit
                     )
 
                     git_commit_task = Pindo::TaskSystem::GitCommitTask.new(

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

@@ -70,6 +70,9 @@ module Pindo
                     # Task 参数
                     @args_select_flag = @options[:select] || false
 
+                    # Git 参数
+                    @args_git_commit = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit])
+
                     super(argv)
                 end
 
@@ -102,7 +105,7 @@ module Pindo
                     app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: project_path,
                         proj_name: @args_proj_name,
-                        package_type: "",  # package_type 在 manage_type=git 时会被忽略
+                        package_type: nil,  # package_type 在 manage_type=git 时会被忽略
                         manage_type: "git"
                     )
 
@@ -119,7 +122,8 @@ module Pindo
                     # 1. 提前询问用户如何处理未提交的文件
                     process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
                         project_dir: project_path,
-                        interactive: true
+                        interactive: @args_git_commit.nil?,
+                        default_process_type: @args_git_commit
                     )
 
                     # 2. 创建 Git 提交任务

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

@@ -59,7 +59,7 @@ module Pindo
                 # 定义此命令使用的参数项
                 def self.option_items
                   @option_items ||= Pindo::Options::OptionGroup.merge(
-                    Pindo::Options::JPSOptions.except(:upload),  # 排除 upload 参数（本命令就是上传）
+                    Pindo::Options::JPSOptions.select(:proj, :send, :desc, :resign),
                     Pindo::Options::GitOptions.all
                   )
                 end
@@ -103,9 +103,10 @@ module Pindo
 
                     # Git 参数
                     @args_release_branch = @options[:release_branch] || 'master'
-                    @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc] || 'mini')
-                    @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type] || 'new')
+                    @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc])
+                    @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type])
                     @args_tag_pre = @options[:tag_pre] || 'v'
+                    @args_git_commit = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit])
 
                     if !@args_cert_id.nil? && !@args_cert_id.empty?
                         @args_resign_flag = true
@@ -169,7 +170,8 @@ module Pindo
                     # 1.0 提前询问用户如何处理未提交的文件
                     process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
                         project_dir: project_dir,
-                        interactive: true
+                        interactive: @args_git_commit.nil?,
+                        default_process_type: @args_git_commit
                     )
                     
                     git_options_with_process = git_options.merge({

data/lib/pindo/command/repo/clone.rb

@@ -14,72 +14,150 @@ module Pindo
                 self.summary = '下载仓库到本地'
 
                 self.description = <<-DESC
-下载仓库到本地，支持从配置文件自动获取仓库信息或手动指定仓库名称进行下载。
+下载仓库到本地，支持从配置文件自动获取仓库信息或手动指定仓库 URL 进行下载。
 
 支持功能：
-    • 手动指定仓库名称进行下载
-    • 自动从当前目录config.json文件读取仓库信息
-    • 支持指定分支下载（默认master分支）
+    • 手动指定仓库 URL 进行下载
+    • 自动从当前目录 config.json 文件读取仓库信息
+    • 支持指定分支或标签下载
+    • 自动初始化子模块
     • 下载到当前工作目录
 
 使用示例：
-    pindo repo clone my-repo                    # 下载指定仓库
-    pindo repo clone                            # 从config.json自动获取仓库信息下载
+    pindo repo clone https://gitee.com/xxx/repo.git              # 下载 master 分支
+    pindo repo clone https://gitee.com/xxx/repo.git --branch=dev # 指定分支
+    pindo repo clone https://gitee.com/xxx/repo.git --tag=1.0.0  # 指定标签
+    pindo repo clone                                             # 从 config.json 自动获取
                 DESC
 
                 self.arguments = [
-                    CLAide::Argument.new('仓库名称', true),
+                    CLAide::Argument.new('仓库URL', false),
                 ]
 
                 def self.options
                   [
-
+                    ['--branch=NAME', '指定分支名称（默认：master）'],
+                    ['--tag=NAME', '指定标签名称（与 --branch 互斥）'],
                   ].concat(super)
                 end
 
 
                 def initialize(argv)
-
-                    @args_repo_name = argv.shift_argument
+                    @args_repo_url = argv.shift_argument
+                    @args_branch = argv.option('branch')
+                    @args_tag = argv.option('tag')
                     super(argv)
                     @additional_args = argv.remainder!
-
                 end
 
-
-
                 def validate!
                     super
-                    temp_config_file = "./config.json"
-                    @repo_name = @args_repo_name if @args_repo_name
-                    if @args_repo_name.nil? && @repo_name.nil?
-                        if File::exist?(temp_config_file)
-                            temp_config_file_fullname=File::expand_path(temp_config_file)
-                            temp_config_json=JSON.parse(File.read(temp_config_file_fullname))
-                            if temp_config_json['project_info'] && temp_config_json['project_info']['launch_project'] && temp_config_json['project_info']['launch_project']['project_git_url']
+
+                    # 验证 --branch 和 --tag 互斥
+                    if @args_branch && @args_tag
+                        raise Informative, "--branch 和 --tag 参数不能同时使用！\n" \
+                                           "请选择其中一个参数。"
+                    end
+
+                    # 设置默认值
+                    # 注意：即使使用 --tag，也需要一个默认分支用于 getcode_to_dir 的逻辑
+                    @args_branch = 'master' if @args_branch.nil?
+
+                    # 1. 优先使用命令行参数
+                    if @args_repo_url
+                        @code_git_url = @args_repo_url
+                        @repo_name = extract_repo_name(@code_git_url)
+                    # 2. 否则从 config.json 读取
+                    else
+                        temp_config_file = "./config.json"
+                        if File.exist?(temp_config_file)
+                            temp_config_file_fullname = File.expand_path(temp_config_file)
+                            temp_config_json = JSON.parse(File.read(temp_config_file_fullname))
+                            if temp_config_json['project_info'] &&
+                               temp_config_json['project_info']['launch_project'] &&
+                               temp_config_json['project_info']['launch_project']['project_git_url']
                                 @code_git_url = temp_config_json['project_info']['launch_project']['project_git_url']
-                                temp_url = String.new(@code_git_url)
-                                index = temp_url.rindex('/')
-                                temp_url = temp_url.slice(index + 1, temp_url.length)
-                                @repo_name = temp_url.gsub!(/\.git/, "")
+                                @repo_name = extract_repo_name(@code_git_url)
                             end
                         end
                     end
+
+                    # 验证是否获取到仓库 URL
+                    if @code_git_url.nil? || @repo_name.nil?
+                        raise Informative, "请提供仓库 URL 或在当前目录创建 config.json 文件！\n" \
+                                           "使用示例：pindo repo clone https://gitee.com/xxx/repo.git"
+                    end
                 end
 
+                # 从 Git URL 提取仓库名称
+                def extract_repo_name(git_url)
+                    return nil if git_url.nil? || git_url.empty?
 
-                def run
+                    # 提取最后一个 / 后面的部分
+                    temp_url = git_url.dup
+                    index = temp_url.rindex('/')
+                    return nil unless index
 
-                    new_branch = "master"
-                    if !@code_git_url.nil? && !@repo_name.nil?
-                        puts
-                        puts "Repo Name: #{@repo_name}"
-                        puts "Repo Url: #{@code_git_url}"
-                        puts "New Branch: #{new_branch}"
+                    repo_name = temp_url.slice(index + 1, temp_url.length)
+                    # 移除 .git 后缀
+                    repo_name.gsub(/\.git$/, '')
+                end
 
-                        Pindo::GitHandler.getcode_to_dir(reponame:@repo_name, remote_url:@code_git_url, path:Dir.pwd, new_branch:new_branch, new_tag:nil)
 
+                def run
+                    puts "\n"
+                    puts "=" * 60
+                    puts "克隆仓库".center(60)
+                    puts "=" * 60
+                    puts "仓库名称: #{@repo_name}"
+                    puts "仓库 URL: #{@code_git_url}"
+                    if @args_tag
+                        puts "目标标签: #{@args_tag}"
+                    else
+                        puts "目标分支: #{@args_branch}"
+                    end
+                    puts "目标目录: #{Dir.pwd}/#{@repo_name}"
+                    puts "=" * 60
+                    puts "\n"
+
+                    # 1. 克隆仓库
+                    Pindo::GitHandler.getcode_to_dir(
+                        reponame: @repo_name,
+                        remote_url: @code_git_url,
+                        path: Dir.pwd,
+                        new_branch: @args_branch,
+                        new_tag: @args_tag
+                    )
+
+                    # 2. 检查是否有子模块
+                    repo_path = File.join(Dir.pwd, @repo_name)
+                    gitmodules_path = File.join(repo_path, '.gitmodules')
+
+                    if File.exist?(gitmodules_path)
+                        puts "\n"
+                        Funlog.instance.fancyinfo_start("检测到子模块配置，正在初始化...")
+
+                        begin
+                            # 调用 update_submodules 方法初始化子模块
+                            Pindo::GitHandler.update_submodules(
+                                local_repo_dir: repo_path,
+                                force: false
+                            )
+                            Funlog.instance.fancyinfo_success("子模块初始化完成！")
+                        rescue => e
+                            Funlog.instance.fancyinfo_warning("子模块初始化失败: #{e.message}")
+                            puts "你可以手动执行以下命令初始化子模块：".yellow
+                            puts "  cd #{@repo_name}".yellow
+                            puts "  pindo repo subgit".yellow
+                        end
+                    else
+                        puts "\n"
+                        Funlog.instance.fancyinfo_success("仓库克隆完成！（无子模块）")
                     end
+
+                    puts "\n"
+                    puts "✅ 完成！仓库已克隆到: #{repo_path}".green
+                    puts "\n"
                 end
 
             end

data/lib/pindo/command/repo/subgit.rb

@@ -0,0 +1,91 @@
+
+
+require 'highline/import'
+require 'fileutils'
+require 'json'
+
+
+module Pindo
+    class Command
+        class Repo < Command
+
+            class Subgit < Repo
+
+                self.summary = '初始化和更新所有 Git 子模块'
+
+                self.description = <<-DESC
+初始化并递归更新当前仓库的所有 Git 子模块。
+
+支持功能：
+    • 自动读取 .gitmodules 配置文件
+    • 递归初始化和更新所有层级的子模块
+    • 支持强制重新初始化（清除现有子模块状态）
+    • 显示详细的子模块状态信息
+
+使用示例：
+    pindo repo subgit                           # 基本用法
+    pindo repo subgit --force                   # 强制重新初始化子模块
+                DESC
+
+                self.arguments = [
+
+                ]
+
+                def self.options
+                  [
+                    ['--force', '强制重新初始化子模块（覆盖本地修改）'],
+                  ].concat(super)
+                end
+
+
+
+                def initialize(argv)
+
+                    @force = argv.flag?('force', false)
+
+                    super(argv)
+                    @additional_args = argv.remainder!
+                end
+
+                def validate!
+                    super
+
+                    # 验证当前目录是否是 Git 仓库
+                    unless Pindo::GitHandler.is_git_directory?(local_repo_dir: Dir.pwd)
+                      raise Informative, "当前目录不是有效的 Git 仓库！请在 Git 仓库根目录下执行此命令。"
+                    end
+                end
+
+                def run
+
+                    puts "\n"
+                    puts "=" * 60
+                    puts "Git 子模块更新".center(60)
+                    puts "=" * 60
+                    puts "当前目录: #{Dir.pwd}"
+                    puts "强制模式: #{@force ? '是' : '否'}"
+                    puts "=" * 60
+                    puts "\n"
+
+                    # 调用 GitHandler 的子模块更新方法
+                    result = Pindo::GitHandler.update_submodules(
+                      local_repo_dir: Dir.pwd,
+                      force: @force
+                    )
+
+                    if result
+                      puts "\n"
+                      puts "✅ 子模块更新成功完成！".green
+                      puts "\n"
+                    else
+                      puts "\n"
+                      puts "⚠️  当前仓库没有配置子模块".yellow
+                      puts "\n"
+                    end
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/repo.rb

@@ -3,6 +3,7 @@ require 'pindo/command/repo/login'
 require 'pindo/command/repo/clone'
 require 'pindo/command/repo/create'
 require 'pindo/command/repo/search'
+require 'pindo/command/repo/subgit'
 
 module Pindo
   class Command

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

@@ -150,9 +150,10 @@ module Pindo
 
                     # Git 参数
                     @args_release_branch = @options[:release_branch] || 'master'
-                    @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc] || 'mini')
-                    @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type] || 'new')
+                    @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc])
+                    @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type])
                     @args_tag_pre = @options[:tag_pre] || 'v'
+                    @args_git_commit = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit])
 
                     super
                 end
@@ -242,7 +243,8 @@ module Pindo
                     # 提前询问用户如何处理未提交的文件
                     process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
                         project_dir: Dir.pwd,
-                        interactive: true # 允许交互，因为这是在任务执行前的主线程中
+                        interactive: @args_git_commit.nil?,
+                        default_process_type: @args_git_commit
                     )
 
                     git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
@@ -359,7 +361,7 @@ module Pindo
                         git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
                             working_directory: Dir.pwd,
                             proj_name: all_platform_configs["project_name"],
-                            package_type: "",  # package_type 在 manage_type=git 时会被忽略
+                            package_type: nil,  # package_type 在 manage_type=git 时会被忽略
                             manage_type: "git"
                         )
                     end

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

@@ -8,6 +8,7 @@ require 'pindo/module/task/model/git/git_commit_task'
 require 'pindo/module/task/model/git/git_tag_task'
 require 'pindo/module/task/model/nuget/nuget_build_task'
 require 'pindo/options/options'
+require 'pindo/options/helpers/git_constants'
 
 module Pindo
   class Command
@@ -57,8 +58,8 @@ module Pindo
             
             # Git 参数
             @args_release_branch = @options[:release_branch] || 'master'
-            @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc] || 'mini')
-            @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type] || 'new')
+            @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc])
+            @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type])
             @args_tag_pre = @options[:tag_pre] || 'v'
 
             super
@@ -67,13 +68,19 @@ module Pindo
         def run
           package_dir = Dir.pwd
           # 1. Git 提交任务 (确保工作区干净，或提交预构建更改)
-          # 交互式询问用户如何处理未提交文件
+          # 默认自动提交（packbuild 场景需要确保代码已提交）
+          git_commit_opt = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit]) || Pindo::UncommittedFilesProcessType::COMMIT
+
           process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
-            project_dir: package_dir,
-            interactive: true,
-            default_process_type: 'commit'
+              project_dir: package_dir,
+              interactive: false,
+              default_process_type: git_commit_opt
           )
-          
+
+          # packbuild 场景强制提交：如果返回 NONE（无未提交文件），改为 COMMIT 以确保执行提交流程
+          if process_type == Pindo::UncommittedFilesProcessType::NONE
+            process_type = Pindo::UncommittedFilesProcessType::COMMIT
+          end
 
           Funlog.instance.fancyinfo_start("Unity Package 打包流程")
 

data/lib/pindo/command/utils/tag.rb

@@ -57,9 +57,10 @@ module Pindo
 
           # Git 参数
           @args_release_branch = @options[:release_branch] || 'master'
-          @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc] || 'mini')
-          @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type] || 'new')
+          @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc])
+          @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type])
           @args_tag_pre = @options[:tag_pre] || 'v'
+          @args_git_commit = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit])
 
           super
           @additional_args = argv.remainder!
@@ -79,7 +80,8 @@ module Pindo
           # 0. 提前询问用户如何处理未提交的文件
           process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
               project_dir: pindo_project_dir,
-              interactive: true
+              interactive: @args_git_commit.nil?,
+              default_process_type: @args_git_commit
           )
 
           # 1. Git 提交任务

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

@@ -137,9 +137,10 @@ module Pindo
 
                     # Git 参数
                     @args_release_branch = @options[:release_branch] || 'master'
-                    @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc] || 'mini')
-                    @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type] || 'new')
+                    @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc])
+                    @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type])
                     @args_tag_pre = @options[:tag_pre] || 'v'
+                    @args_git_commit = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit])
 
                     super
                     @additional_args = argv.remainder!
@@ -254,7 +255,8 @@ module Pindo
                     # 提前询问用户如何处理未提交的文件
                     process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
                         project_dir: config[:project_path],
-                        interactive: true
+                        interactive: @args_git_commit.nil?,
+                        default_process_type: @args_git_commit
                     )
 
                     git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
@@ -363,7 +365,7 @@ module Pindo
                       git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: config[:project_path],
                         proj_name: @args_proj_name,
-                        package_type: "",  # package_type 在 manage_type=git 时会被忽略
+                        package_type: nil,  # package_type 在 manage_type=git 时会被忽略
                         manage_type: "git"
                       )
 
@@ -401,7 +403,7 @@ module Pindo
                       git_app_info_obj, git_workflow_info = PgyerHelper.share_instace.prepare_upload(
                         working_directory: config[:project_path],
                         proj_name: @args_proj_name,
-                        package_type: "",
+                        package_type: nil,
                         manage_type: "git"
                       )
 

data/lib/pindo/command.rb

@@ -46,7 +46,7 @@ module Pindo
         require 'pindo/command/utils'
         require 'pindo/command/jps'
         require 'pindo/command/setup'
-        # require 'pindo/command/repo'
+        require 'pindo/command/repo'
         require 'pindo/command/appstore'
         require 'pindo/command/gplay'
         require 'pindo/command/unity'

data/lib/pindo/config/build_info_manager.rb

@@ -31,7 +31,7 @@ module Pindo
       begin
         app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: normalized_repo_name)
       rescue StandardError => e
-        puts "拉取配置仓库失败: #{e.message}"
+        Funlog.instance.fancyinfo_error("拉取配置仓库失败: #{e.message}")
         return false
       end
 
@@ -42,17 +42,17 @@ module Pindo
       if !app_config_dir.eql?(target_dir) && File.exist?(File.join(app_config_dir, 'config.json'))
         begin
           FileUtils.cp_r(File.join(app_config_dir, "config.json"), target_dir)
-          puts "✓ 配置文件已复制到: #{target_dir}"
+          Funlog.instance.fancyinfo_success("配置文件已复制到: #{target_dir}")
           return true
         rescue StandardError => e
-          puts "复制配置文件失败: #{e.message}"
+          Funlog.instance.fancyinfo_error("复制配置文件失败: #{e.message}")
           return false
         end
       elsif app_config_dir.eql?(target_dir)
-        puts "✓ 配置文件已存在于目标目录"
+        Funlog.instance.fancyinfo_success("配置文件已存在于目标目录")
         return true
       else
-        puts "⚠ 配置仓库中未找到 config.json"
+        Funlog.instance.fancyinfo_error("配置仓库中未找到 config.json")
         return false
       end
     end
@@ -95,28 +95,51 @@ module Pindo
           modify_repo_setting(repo_name: repo_name, owner_org: owner_org)
         end
 
-        # 克隆配置仓库
-        app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: repo_name)
-        system "open #{app_config_dir}"
+        # Gitee 仓库创建后需要短暂延迟，等待仓库完全初始化
+        Funlog.instance.fancyinfo_update("等待 Gitee 仓库初始化...")
+        sleep 2
+
+        # 克隆配置仓库，带重试机制
+        app_config_dir = nil
+        max_retries = 3
+        retry_count = 0
+
+        while retry_count < max_retries
+          begin
+            app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: repo_name)
+            break if app_config_dir && File.exist?(app_config_dir)
+          rescue StandardError => e
+            retry_count += 1
+            if retry_count < max_retries
+              Funlog.instance.fancyinfo_update("克隆失败 (#{retry_count}/#{max_retries})，#{3}秒后重试...")
+              sleep 3
+            else
+              Funlog.instance.fancyinfo_error("克隆仓库失败: #{e.message}")
+              return nil
+            end
+          end
+        end
+
+        system "open #{app_config_dir}" if app_config_dir
 
-        if File.exist?(app_config_dir)
+        if app_config_dir && File.exist?(app_config_dir)
           # 从模板仓库复制配置文件
           update_appconfig_repo(
             bundle_id: bundle_id,
             demo_dir: demo_dir,
             app_config_dir: app_config_dir
           )
-          puts "✓ 配置仓库创建成功: #{app_config_dir}"
+          Funlog.instance.fancyinfo_success("配置仓库创建成功: #{app_config_dir}")
           return app_config_dir
         else
-          puts "❌ 创建应用配置仓库失败"
+          Funlog.instance.fancyinfo_error("创建应用配置仓库失败")
           return nil
         end
       else
         # 仓库已存在，直接打开
         app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: repo_name)
         system "open #{app_config_dir}"
-        puts "⚠ 配置仓库已存在: #{app_config_dir}"
+        Funlog.instance.fancyinfo_update("配置仓库已存在: #{app_config_dir}")
         return app_config_dir
       end
     end
@@ -130,7 +153,7 @@ module Pindo
       # 读取 deploy_build_setting.json
       setting_file = File.join(pindo_single_config.pindo_env_configdir, 'deploy_build_setting.json')
       unless File.exist?(setting_file)
-        puts "⚠ deploy_build_setting.json 不存在: #{setting_file}"
+        Funlog.instance.fancyinfo_error("deploy_build_setting.json 不存在: #{setting_file}")
         return nil
       end
 
@@ -144,7 +167,7 @@ module Pindo
 
         return repo_name
       rescue JSON::ParserError => e
-        puts "⚠ 解析 deploy_build_setting.json 失败: #{e.message}"
+        Funlog.instance.fancyinfo_error("解析 deploy_build_setting.json 失败: #{e.message}")
         return nil
       rescue => e
         raise Informative, "config.json app_type is error!!!"