lhj-tools 0.2.59 → 0.2.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1d113183468cf58d8ce14ef22990c96a507f33716a2da088f56a4157c3d433
-  data.tar.gz: 8972b208acd3e14c5ebc9a5b208485de017524be9e93fdd5643e1fb0528f3898
+  metadata.gz: 17f381f8a5e810d3d6455d7ffc07c21edb457deca5822d55ec75c49151cf1499
+  data.tar.gz: d12cd89e36ba62322d1f941829fc53ce69c66b3d11e27863a277bf8f767baec4
 SHA512:
-  metadata.gz: b47948cc96591c7b6d717b6f9c755448deac600b113fb31407b72e43d5272d2273a8f79af1b8679abfc3c1a35ba53a680b9ae73a7bb7236c290dcd00283f5724
-  data.tar.gz: 79283d6caab2cdb57db0b0cf80096e7aaf1ad114f198fc40e3ff49a542ed679aa38ef87ab15e457ba3b10783c8f62d4e461fdd5971f5cf5e98dc99e38f85db2a
+  metadata.gz: '091917f41e4d3e47781159cbccc9e9fdec220900a60ca25fc226bdab0c7039dfb7803f113c4d230ef13a85137e895e90b538bc05e8e9d589e51bf5d8153add0b'
+  data.tar.gz: 13394220af4f61305c6e1659cfa040f1129ddb140a9df027750eb17a819aea502b88dfb713b233e86d5a857296e6af398685936f2028c48204694515a8c26fe0

data/lib/lhj/helper/pgyer_helper.rb

@@ -10,7 +10,7 @@ require_relative 'tb_config'
 module Lhj
   # pgyer upload
   class Pgyer
-    API_HOST = 'https://upload.pgyer.com/apiv1/app/upload'
+    API_HOST = 'https://www.xcxwo.com/apiv2/app'
 
     attr_reader :api_key, :user_key, :password, :result
 
@@ -46,30 +46,76 @@ module Lhj
     # @param [upload file] file
     # @param [desc] des
     def upload_with_path(path, file, des)
-      params = {
+      request_params = {
         '_api_key' => @api_key,
-        'uKey' => @user_key,
-        'password' => @password,
-        'updateDescription' => des,
-        'installType' => 2,
-        'file' => Faraday::UploadIO.new(file, 'application/octet-stream')
+        'buildPassword' => @password,
+        'buildUpdateDescription' => des,
+        'buildType' => 'ios',
+        'buildInstallType' => 2
       }
-      begin
-        puts 'begin upload...'
-        upload_with_type(path, file) unless path.empty?
-        response = http_client.post API_HOST, params
-        @result = response.body
-        puts @result
-        Actions.sh('git restore ./', log: false) if File.exist?(File.expand_path('./.git'))
-        puts 'upload success'
-        # if @result['data'] && @result['data']['appUpdateDescription'] && @env == :uat
-        #   str = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])
-        #   str = Lhj::VikaHelper.trans_vika(str)
-        #   @result['data']['appUpdateDescription'] = str
-        # end
-      rescue Faraday::TimeoutError
-        puts 'upload fail'
-        FileUtils.rm_r Dir.glob("#{path}/archive*.zip")
+      conn_options = {
+        request: {
+          timeout: 1000,
+          open_timeout: 300
+        }
+      }
+      pgyer_client = Faraday.new(nil, conn_options) do |builder|
+        builder.request :multipart
+        builder.request :url_encoded
+        builder.response :json, content_type: /\bjson$/
+        builder.adapter :net_http
+      end
+
+      puts 'begin upload...'
+      upload_with_type(path, file) unless path.empty?
+      response = pgyer_client.post "#{API_HOST}/getCOSToken", request_params
+      info = response.body
+
+      if info["code"] != 0
+        UI.user_error!("Get token is failed, info: #{info}")
+      end
+
+      key = info['data']['key']
+      endpoint = info['data']['endpoint']
+      request_params = info['data']['params']
+      if key.nil? || endpoint.nil? || request_params.nil?
+        UI.user_error!('Get token is failed')
+      end
+      request_params['file'] = Faraday::UploadIO.new(file, 'application/octet-stream')
+
+      response = pgyer_client.post endpoint, request_params
+
+      if response.status != 204
+        UI.user_error!("PGYER Plugin Upload Error: #{response.body}")
+      end
+
+      @result = checkPublishStatus(pgyer_client, API_HOST, @api_key, key)
+
+      puts @result
+      Actions.sh('git restore ./', log: false) if File.exist?(File.expand_path('./.git'))
+      puts 'upload success'
+    end
+
+    def checkPublishStatus(client, api_host, api_key, buildKey)
+      url = "#{api_host}/buildInfo"
+      UI.message "checkPublishStatus url: #{url}"
+      response = client.post "#{api_host}/buildInfo", { :_api_key => api_key, :buildKey => buildKey }
+      info = response.body
+      code = info['code']
+      if code == 0
+        UI.success "Upload success. BuildInfo is #{info['data']}."
+        shortUrl = info["data"]["buildShortcutUrl"]
+        if shortUrl.nil? || shortUrl == ""
+          shortUrl = info["data"]["buildKey"]
+        end
+        info["data"]["fastlaneAddedWholeVisitUrl"] = "https://wwww.xcxwo.com/#{shortUrl}"
+        UI.success "Upload success. Visit this URL to see: #{info["data"]["fastlaneAddedWholeVisitUrl"]}"
+        return info["data"]
+      elsif code == 1246 || code == 1247
+        sleep 3
+        checkPublishStatus(client, api_host, api_key, buildKey)
+      else
+        UI.user_error!("PGYER Plugin Published Error: #{info} buildKey: #{buildKey}")
       end
     end
 
@@ -111,7 +157,7 @@ module Lhj
     end
 
     def app_download_url
-      "https://www.pgyer.com/#{@result['data']['appKey']}"
+      "https://www.xcxwo.com/#{@result['data']['appKey']}"
     end
   end
 end

data/lib/lhj/helper/pgyer_shortcut_helper.rb

@@ -7,7 +7,7 @@ require 'lhj/helper/pgyer_config'
 module Lhj
   # pgyer upload
   class PgyerShortcut
-    API_SHORTCUT_HOST = 'https://www.pgyer.com/apiv2/app/getByShortcut'
+    API_SHORTCUT_HOST = 'https://www.xcxwo.com/apiv2/app/getByShortcut'
 
     attr_reader :api_key, :user_key, :password, :shortcut_url
 

data/lib/lhj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lhj
-  VERSION = '0.2.59'
+  VERSION = '0.2.61'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.59
+  version: 0.2.61
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj