pindo 5.4.1 → 5.5.1

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

@@ -4,9 +4,12 @@ require 'fileutils'
 require 'json'
 require 'faraday'
 require "rqrcode"
-require 'pindo/client/pgyerclient'
-# require 'pindo/client/aws3sclient'
-require 'pindo/client/pgyeruploadclient'
+require 'jpsclient'
+require 'pindo/config/pindoconfig'
+require 'pindo/config/pindouserlocalconfig'
+require 'pindo/base/pindocontext'
+require 'pindo/base/funlog'
+require 'pindo/base/githelper'
 
 
 module Pindo
@@ -25,9 +28,11 @@ module Pindo
         end
 
 
-        def initialize()
+        def initialize(config_file: nil)
             @force_login = false
             @has_login = false
+            # PgyerHelper 提供默认配置路径
+            @config_file = config_file || File.join(File::expand_path(Pindoconfig.instance.pindo_common_configdir), "jps_client_config.json")
         end
 
         def setForeLogin(beforeLogin:nil)
@@ -35,7 +40,7 @@ module Pindo
         end
 
         def login
-            @pgyer_client = PgyerClient.new
+            @pgyer_client = JPSClient::Client.new(config_file: @config_file)
             if @force_login || !@has_login
                 @has_login = @pgyer_client.do_login(force_login:@force_login)
                 @force_login = false
@@ -152,7 +157,7 @@ module Pindo
                     raise Informative, "#{upload_proj_name} 名称错误, 请输入正确的App代号,Pgyer网站没有该App!!!"
                 else
                     # 记录上次上传的项目
-                    PindoUserLocalConfig.instance.write_last_work_project(proj_name:app_info_obj["appName"])
+                    PindoUserLocalConfig.instance.write_last_work_project(proj_name:app_info_obj["projectName"])
                 end
 
 
@@ -165,6 +170,22 @@ module Pindo
 
         def start_upload(app_info_obj:nil, ipa_file_upload:nil, description:nil)
 
+                # 根据文件扩展名判断包类型
+                package_type = nil
+                if ipa_file_upload
+                    ext = File.extname(ipa_file_upload).downcase
+                    case ext
+                    when '.ipa'
+                        package_type = 'ipa'
+                    when '.apk'
+                        package_type = 'apk'
+                    when '.aab'
+                        package_type = 'apk'  # AAB也归类为apk类型
+                    when '.zip', '.html', '.app'
+                        package_type = 'zip'
+                    end
+                end
+
                 if !ipa_file_upload.nil? &&
                     File.extname(ipa_file_upload).eql?(".app") &&
                     File.extname(ipa_file_upload).eql?(".apk")
@@ -254,13 +275,13 @@ module Pindo
                 end
 
                 puts
-                puts "上传项目: #{app_info_obj["appName"]}"
+                puts "上传项目: #{app_info_obj["projectName"]}"
                 print "上传备注: "
                 puts description
 
 
                 # aws_client = AWSS3Client.new
-                aws_client = PgyerUploadClient.new
+                aws_client = JPSClient::UploadClient.new(@pgyer_client)
                 upload_res = aws_client.upload_file(binary_file:ipa_file_upload)
                 puts upload_res
                 attach_key_url = nil
@@ -284,12 +305,17 @@ module Pindo
 
                     puts attachFileUrls
 
-                    result_data = @pgyer_client.post_app_update_binary(appId:app_info_obj["appId"], params:{
+                    result_data = @pgyer_client.upload_project_package(projectId:app_info_obj["id"], params:{
                         description: description,
-                        s3Url: upload_res,
+                        packageUrl: upload_res,
                         attachFileUrls:attachFileUrls
                     })
 
+                    # 将package_type信息附加到返回结果中
+                    if result_data && result_data["data"]
+                        result_data["package_type"] = package_type
+                    end
+
                     return result_data
                 else
                     raise Informative, "上传失败!"
@@ -314,45 +340,106 @@ module Pindo
             wechat_msg_url
         end
 
-        def send_apptest_msg(appId:nil, appVersionId:nil, chatEnv: nil, receiveType:nil)
+        def send_apptest_msg(app_info_obj:nil, app_version_info_obj:nil, receiveType:"self", chatEnv:nil)
+            # 发送飞书测试消息
+            # 参数：
+            # - app_info_obj: 项目信息对象
+            # - app_version_info_obj: 版本信息对象
+            # - receiveType: 接收类型 ("self" 或 "chat")
+            # - chatEnv: 聊天环境
 
-            Funlog.instance.fancyinfo_start("正在发送飞书消息...")
-            result =  @pgyer_client.post_message(appId:appId, appVersionId:appVersionId, chatEnv: chatEnv, receiveType:receiveType)
+            return false if app_info_obj.nil? || app_version_info_obj.nil?
 
-            if !result.nil? && result["code"] == 200 && result["data"] == "success"
-                Funlog.instance.fancyinfo_success("测试信息已经发送飞书!")
+            projectId = app_info_obj["id"]
+            packageId = app_version_info_obj["id"]
+            indexNo = app_version_info_obj["incId"]
+
+            if projectId.nil? || packageId.nil?
+                Funlog.instance.fancyinfo_error("缺少必要的项目ID或包ID")
+                return false
+            end
+
+            # 根据接收类型显示不同的提示信息
+            if receiveType == "self"
+                Funlog.instance.fancyinfo_start("正在发送飞书消息给个人...")
+            elsif receiveType == "chat"
+                if chatEnv == "DevTest"
+                    Funlog.instance.fancyinfo_start("正在发送飞书消息到开发测试群组...")
+                elsif chatEnv == "PreFavTest"
+                    Funlog.instance.fancyinfo_start("正在发送飞书消息到预发布群组...")
+                else
+                    Funlog.instance.fancyinfo_start("正在发送飞书消息到项目群组...")
+                end
+            else
+                Funlog.instance.fancyinfo_start("正在发送飞书消息到项目群组...")
+            end
+
+            # 注意：当前版本的 jpsclient 可能不支持 indexNo 参数
+            result =  @pgyer_client.send_project_package_message(
+                projectId: projectId,
+                packageId: packageId,
+                chatEnv: chatEnv,
+                receiveType: receiveType,
+                indexNo: indexNo
+            )
+
+            if !result.nil? && (result["code"] == 200 || result["code"].to_s == "200")
+                # 如果返回码是200，无论data是什么都认为成功
+                if receiveType == "self"
+                    Funlog.instance.fancyinfo_success("测试信息已发送到飞书（个人）!")
+                elsif receiveType == "chat"
+                    if chatEnv == "DevTest"
+                        Funlog.instance.fancyinfo_success("测试信息已发送到飞书开发测试群组!")
+                    elsif chatEnv == "PreFavTest"
+                        Funlog.instance.fancyinfo_success("测试信息已发送到飞书预发布群组!")
+                    else
+                        Funlog.instance.fancyinfo_success("测试信息已发送到飞书项目群组!")
+                    end
+                else
+                    Funlog.instance.fancyinfo_success("测试信息已发送到飞书项目群组!")
+                end
                 return true
             else
-                Funlog.instance.fancyinfo_error("未发送飞书测试信息！")
+                if result.nil?
+                    Funlog.instance.fancyinfo_error("未发送飞书测试信息！错误: 请求失败")
+                elsif result["msg"] && !result["msg"].empty?
+                    Funlog.instance.fancyinfo_error("未发送飞书测试信息！错误: #{result["msg"]}")
+                elsif result["message"] && !result["message"].empty?
+                    Funlog.instance.fancyinfo_error("未发送飞书测试信息！错误: #{result["message"]}")
+                else
+                    Funlog.instance.fancyinfo_error("未发送飞书测试信息！错误: 响应码 #{result["code"]}")
+                end
                 return false
             end
 
         end
 
-        def send_apptest_wechat_msg(msg_data:nil, wechat_url:nil)
+        def send_apptest_wechat_msg(app_info_obj:nil, app_version_info_obj:nil, wechat_url:nil)
+
+                # 发送企业微信消息
+                return false if app_info_obj.nil? || app_version_info_obj.nil?
 
                 wechat_msg_url = wechat_url
                 if wechat_msg_url.nil? || wechat_msg_url.empty?
                     wechat_msg_url = get_user_local_wechat_url()
                 end
 
-                if !wechat_msg_url.nil? && wechat_msg_url.length >1
-
-                else
+                if wechat_msg_url.nil? || wechat_msg_url.empty?
                     puts "企业微信Wechat Url无效"
+                    return false
                 end
 
                 begin
-
-                        download_url = msg_data[:download_url]
-                        app_name = msg_data[:app_name]
-                        download_password = msg_data[:download_password]
-                        bundle_id = msg_data[:bundle_id]
-                        app_version = msg_data[:app_version]
-                        index_num = msg_data[:index_num]
-                        upload_time = msg_data[:time]
-                        description = msg_data[:description]
-                        msg_from = msg_data[:msg_from]
+                        # 从对象提取信息
+                        app_name = app_info_obj["projectName"]
+                        download_password = app_info_obj["password"]
+                        download_url = "#{app_info_obj["downloadUrl"]}?id=#{app_version_info_obj["id"]}"
+                        bundle_id = app_version_info_obj["bundleId"]
+                        app_version = app_version_info_obj["projectVersion"]
+                        index_num = app_version_info_obj["incId"]
+                        upload_time = app_version_info_obj["updateTime"]
+                        description = app_version_info_obj["description"]
+                        msg_from = @pgyer_client.token["username"] || " "
 
 
                         # current_dir = current_dir = Dir.pwd
@@ -418,9 +505,44 @@ module Pindo
 
         end
 
-        def print_app_version_info(msg_data:nil)
+        def print_app_version_info(app_info_obj:nil, app_version_info_obj:nil)
+            # 打印应用版本信息和二维码
+            return if app_info_obj.nil? || app_version_info_obj.nil?
 
-            qrcode = RQRCode::QRCode.new(msg_data[:download_url])
+            # 从对象提取信息
+            app_name = app_info_obj["projectName"]
+            download_password = app_info_obj["password"]
+            download_url = "#{app_info_obj["downloadUrl"]}?id=#{app_version_info_obj["id"]}"
+            bundle_id = app_version_info_obj["bundleId"]
+            project_version = app_version_info_obj["projectVersion"]
+            build_version = app_version_info_obj["build"]
+            index_no = app_version_info_obj["indexNo"] || app_version_info_obj["incId"]
+            update_time = app_version_info_obj["updateTime"]
+            description = app_version_info_obj["description"]
+            app_size = app_version_info_obj["appSize"]
+
+            # 格式化上传时间（时间戳转换为可读格式）
+            if update_time
+                if update_time.is_a?(String) && update_time =~ /^\d+$/
+                    # 如果是字符串格式的时间戳
+                    update_time = update_time.to_i
+                end
+                if update_time.is_a?(Integer)
+                    # 将毫秒时间戳转换为秒
+                    update_time = update_time / 1000 if update_time > 9999999999
+                    formatted_time = Time.at(update_time).strftime("%Y-%m-%d %H:%M:%S")
+                else
+                    formatted_time = update_time
+                end
+            else
+                formatted_time = "未知"
+            end
+
+            # appSize已经是格式化后的字符串，直接使用
+            formatted_size = app_size
+
+            # 生成二维码
+            qrcode = RQRCode::QRCode.new(download_url)
             svg = qrcode.as_ansi(
               light: "\033[47m", dark: "\033[40m",
               fill_character: "  ",
@@ -430,13 +552,15 @@ module Pindo
             puts "\r\n\r\n\r\n\r\n"
             puts svg
             puts
-            puts "#{msg_data[:app_name]} 测试"
-            puts "Bundle Id:  #{msg_data[:bundle_id]}"
-            puts "版本号:    #{msg_data[:app_version]}  build: #{msg_data[:index_num]}"
-            puts "安装密码:  #{msg_data[:download_password]}"
-            puts "上传时间:  #{msg_data[:time]}"
-            puts "链接:     #{msg_data[:download_url]}"
-            puts "说明:     #{msg_data[:description]}"
+            puts "#{app_name} 测试"
+            puts "Bundle Id:  #{bundle_id}"
+            puts "版本号:    #{project_version} (Build #{build_version})"
+            puts "序号:      #{index_no}"
+            puts "包大小:    #{formatted_size}" if formatted_size
+            puts "安装密码:  #{download_password}"
+            puts "上传时间:  #{formatted_time}"
+            puts "链接:     #{download_url}"
+            puts "说明:     #{description}"
             puts "\r\n\r\n\r\n\r\n"
 
         end
@@ -455,7 +579,8 @@ module Pindo
 
             app_info_list = Pindoconfig.instance.get_pgyerapps_info_list()
             app_info_obj = app_info_list&.find do |app_info_item|
-                app_info_item_name = app_info_item["appName"].to_s.downcase.strip.gsub(/[\s\-_]/, '')
+                # 新 API 使用 projectName 字段
+                app_info_item_name = app_info_item["projectName"].to_s.downcase.strip.gsub(/[\s\-_]/, '')
                 app_info_item_name.eql?(key_proj_name)
             end
 
@@ -464,9 +589,12 @@ module Pindo
             app_info_obj
         end
 
-        def get_app_version(appId:nil, app_version_index:nil, latest_version:true)
+        def get_app_version(projectId:nil, app_version_index:nil, latest_version:true, package_type:nil)
 
-            version_data = @pgyer_client.get_app_version_list_req(appId:appId)
+            params = {}
+            params[:nativePackageType] = package_type if package_type
+
+            version_data = @pgyer_client.get_project_package_list(projectId:projectId, params:params)
 
             version_item_obj = nil
             if latest_version
@@ -492,7 +620,7 @@ module Pindo
 
             app_info_list = Pindoconfig.instance.get_pgyerapps_info_list()
             if app_info_list.nil?
-                res_data = @pgyer_client.get_app_list_req(params:params)
+                res_data = @pgyer_client.get_project_list(params:params)
                 # puts JSON.pretty_generate(res_data)
                 if !res_data["data"].nil? && res_data["data"].size > 0
                     app_info_list = res_data["data"]
@@ -501,7 +629,7 @@ module Pindo
             end
 
             if app_info_list.nil?
-                res_data = @pgyer_client.get_app_list_req(params:params)
+                res_data = @pgyer_client.get_project_list(params:params)
                 # puts JSON.pretty_generate(res_data)
                 if !res_data["data"].nil? && res_data["data"].size > 0
                     app_info_list = res_data["data"]
@@ -518,13 +646,18 @@ module Pindo
             return app_info_list
         end
 
-        def get_versioon_history_item(app_info_obj:nil, list_select_flat:false)
+        def get_versioon_history_item(app_info_obj:nil, list_select_flat:false, package_type:nil)
 
                 Funlog.instance.fancyinfo_start("正在拉取app上传记录...")
 
-                appId = app_info_obj["appId"]
-                # puts "appId #{appId}"
-                version_data = @pgyer_client.get_app_version_list_req(appId:appId) || {}
+                projectId = app_info_obj["id"]
+                # puts "projectId #{projectId}"
+
+                params = {}
+                params[:nativePackageType] = package_type if package_type
+                params[:pageSize] = 25  # 增加默认返回数量
+
+                version_data = @pgyer_client.get_project_package_list(projectId:projectId, params:params) || {}
 
                 Funlog.instance.fancyinfo_success("拉取app上传记录完成!")
 
@@ -540,7 +673,7 @@ module Pindo
                     #获取version_data 最后10个的incId， bundleId, updateTime组成新数组
                     version_array_temp = version_data["data"].take(list_num).map do |item|
                         {
-                          "appVersion" => item["appVersion"] + "(build " + item["build"] + " )",
+                          "appVersion" => item["projectVersion"] + "(build " + item["build"] + " )",
                           "incId" => item["incId"],
                           "bundleId" => item["bundleId"],
                           "updateTime" => item["updateTime"]
@@ -677,7 +810,7 @@ module Pindo
                 Funlog.instance.fancyinfo_error("没有找到git备注信息，无法修改pgyer备注！")
             else
                 Funlog.instance.fancyinfo_start("开始修复pgyer备注...")
-                @pgyer_client.post_update_upload_comment(appId:app_info_obj["appId"], id:version_item_obj["id"], comment:comment_str.strip)
+                @pgyer_client.update_project_package(projectId:app_info_obj["id"], id:version_item_obj["id"], comment:comment_str.strip)
                 Funlog.instance.fancyinfo_start("pgyer备注已经修改！")
             end
 
@@ -697,10 +830,10 @@ module Pindo
 
         end
 
-        def resign(version_id:nil, cert_id:nil)
+        def resign(package_id:nil, cert_id:nil)
 
             Funlog.instance.fancyinfo_start("正在重签名...")
-            result =  @pgyer_client.post_resign(appVersionId:version_id, certId:cert_id)
+            result =  @pgyer_client.sign_project_package(packageId:package_id, certId:cert_id)
             if !result.nil? && result["code"] == 200 && result["data"] == "success"
                 Funlog.instance.fancyinfo_success("重签名成功!")
                 return true
@@ -710,39 +843,6 @@ module Pindo
             end
 
         end
-
-
-
-        def make_msg_data(app_info_obj:nil, app_version_info_obj:nil)
-
-            msg_from =  @pgyer_client.token["username"]
-
-            app_name = app_info_obj["appName"]
-            download_password = app_info_obj["password"]
-            download_url = app_info_obj["downloadUrl"] + "?" + "id=" + app_version_info_obj["id"]
-            bundle_id = app_version_info_obj["bundleId"]
-            app_version = app_version_info_obj["appVersion"]
-            index_num = app_version_info_obj["incId"]
-            time = app_version_info_obj["updateTime"]
-            description = app_version_info_obj["description"]
-            msg_from = msg_from || " "
-            msg_data  ={
-                app_name: app_name,
-                download_password: download_password,
-                download_url: download_url,
-                bundle_id: bundle_id,
-                app_version: app_version,
-                index_num: index_num,
-                time: time,
-                description: description,
-                msg_from:msg_from
-            }
-
-            return msg_data
-
-        end
-
-
     end
 
 end

data/lib/pindo/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.5.1
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-09-19 00:00:00.000000000 Z
+date: 2025-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -109,6 +109,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.9
+- !ruby/object:Gem::Dependency
+  name: jpsclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -291,9 +311,6 @@ files:
 - lib/pindo/client/feishuclient.rb
 - lib/pindo/client/giteeclient.rb
 - lib/pindo/client/httpclient.rb
-- lib/pindo/client/pgyer_feishu_oauth_cli.rb
-- lib/pindo/client/pgyerclient.rb
-- lib/pindo/client/pgyeruploadclient.rb
 - lib/pindo/client/tgateclient.rb
 - lib/pindo/command.rb
 - lib/pindo/command/android.rb
@@ -361,18 +378,19 @@ files:
 - lib/pindo/command/ipa/autoresign.rb
 - lib/pindo/command/ipa/import.rb
 - lib/pindo/command/ipa/output.rb
+- lib/pindo/command/jps.rb
+- lib/pindo/command/jps/apptest.rb
+- lib/pindo/command/jps/bind.rb
+- lib/pindo/command/jps/comment.rb
+- lib/pindo/command/jps/download.rb
+- lib/pindo/command/jps/login.rb
+- lib/pindo/command/jps/resign.rb
+- lib/pindo/command/jps/upload.rb
 - lib/pindo/command/lib.rb
 - lib/pindo/command/lib/forcepush.rb
 - lib/pindo/command/lib/lint.rb
 - lib/pindo/command/lib/push.rb
 - lib/pindo/command/lib/update.rb
-- lib/pindo/command/pgyer.rb
-- lib/pindo/command/pgyer/apptest.rb
-- lib/pindo/command/pgyer/comment.rb
-- lib/pindo/command/pgyer/download.rb
-- lib/pindo/command/pgyer/login.rb
-- lib/pindo/command/pgyer/resign.rb
-- lib/pindo/command/pgyer/upload.rb
 - lib/pindo/command/repo.rb
 - lib/pindo/command/repo/clone.rb
 - lib/pindo/command/repo/create.rb