lhj-tools 0.1.45 → 0.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fad00b53bac9c95b946a8ef6a87632b0b0f7d2be620b2112332460b891a08a62
-  data.tar.gz: 8a846f51f4cd67c437e4d8b16f693cd81f68216bae542d97932d1c0440259087
+  metadata.gz: 7d7518e273318146bfc0d2f735c25826d778c77ce9bd594c07caef20a666a413
+  data.tar.gz: 0c10a6f9df643fe2c7eba3c167eb19a08eac57569134e69288d8df62ae578552
 SHA512:
-  metadata.gz: 2ac614b5f510059e17f143cfadf91d7003da0a8178e9e64793ef0ae971d92946a7c1ba05311db3ec917dfac933ed83ce7fcaf46c4d4307ec5dc5e1693709b00a
-  data.tar.gz: da907ab9b3ee43e9dfcb6fd2013ef9a9967e88e1a2f193ef464e9b918c18c2e2161913715cade5328d1c181a2d0f8d20add0a7005ee873d8df755f388216650a
+  metadata.gz: 32799cc62fdc694c03859a7a047186848ae4d1fb6b4d2684806191f405ff10ce9501481d631d62c227cfa9047ba980e19023730321c58246aa003b5459ac438a
+  data.tar.gz: 9401529e2375db05d724d377697d0e315b9d72aaf4203a7ee308c07914d0347ea2260fbad9a9cfe4db295956b24f89a414a08ba3f330b2601539c85f2785d8fa

data/lib/lhj/command/reverse_import.rb

@@ -39,7 +39,7 @@ module Lhj
       end
 
       def pod_folder_name
-        File.join(@current_path, 'MacauLife', 'CustomPods')
+        File.join(@current_path, 'CustomPods')
       end
 
       def child_dir

data/lib/lhj/helper/log_helper.rb

@@ -52,6 +52,7 @@ module Lhj
         message = message.gsub('seconds ', '秒')
         message = message.gsub('minutes ', '分钟')
         message = message.gsub('hours ', '小时')
+        message = message.gsub('weeks ', '周')
         message = message.gsub('days ', '天')
         message = message.gsub('ago ', '前')
         Lhj::TeamMemberConfig.config.each do |key, value|

data/lib/lhj/helper/pgyer_config.rb

@@ -42,6 +42,19 @@ module Lhj
       end
     end
 
+    def self.shortcut_url(env = :uat)
+      case env
+      when :release
+        config['release_shortcut_url']
+      when :gray
+        config['gray_shortcut_url']
+      when :uat
+        config['uat_shortcut_url']
+      else
+        config['shortcut_url']
+      end
+    end
+
     def self.password(env = :uat)
       config['password']
     end

data/lib/lhj/helper/pgyer_helper.rb

@@ -80,12 +80,13 @@ module Lhj
       # step 1
       folder_path_dir = path
       rand_key = rand(100) % 3
-      zipped_path = "Life_i_#{rand_key}.zip"
-      zipped_path = "Life_a_#{rand_key}.zip" unless file.end_with?('.ipa')
-      Actions.sh(%(cd "#{folder_path_dir}" && zip -r "#{zipped_path}" "#{folder_path_dir}"/* -x="#{folder_path_dir}"/Code/MacauLife.ipa), log: false)
+      zipped_name = "archive_#{rand_key}.zip"
+      zipped_name = "archive_a_#{rand_key}.zip" unless file.end_with?('.ipa')
+      command = %(cd #{folder_path_dir} && zip -r #{zipped_name} ./* -x "*.ipa" -x "*.dSYM.zip")
+      Actions.sh(command, log: false)
       # step 2
-      oss_key = "code/#{zipped_path}"
-      oss_file = File.join(folder_path_dir, zipped_path)
+      oss_key = "code/#{zipped_name}"
+      oss_file = File.join(folder_path_dir, zipped_name)
       file_exists = File.exist?(oss_file)
       return unless file_exists
 

data/lib/lhj/helper/pgyer_shortcut_helper.rb

@@ -0,0 +1,67 @@
+
+# frozen_string_literal: true
+require "uri"
+require "net/http"
+require 'lhj/helper/pgyer_config'
+
+module Lhj
+  # pgyer upload
+  class PgyerShortcut
+    API_SHORTCUT_HOST = 'https://www.pgyer.com/apiv2/app/getByShortcut'
+
+    attr_reader :api_key, :user_key, :password, :shortcut_url
+
+    def initialize(env = :uat)
+      @api_key = Lhj::PgyerConfig.api_key(env)
+      @user_key = Lhj::PgyerConfig.user_key(env)
+      @shortcut_url = Lhj::PgyerConfig.shortcut_url(env)
+    end
+
+    def request_shortcut_body
+      url = URI(API_SHORTCUT_HOST)
+
+      https = Net::HTTP.new(url.host, url.port)
+      https.use_ssl = true
+
+      request = Net::HTTP::Post.new(url)
+      request['Content-Type'] = 'application/x-www-form-urlencoded'
+      request.body = "_api_key=#{@api_key}&buildShortcutUrl=#{@shortcut_url}"
+
+      response = https.request(request)
+      response.read_body
+    end
+
+    def res_body
+      body = request_shortcut_body unless @res_body
+      @res_body ||= JSON.parse(body)
+    end
+
+    def build_version
+      res_json = res_body
+      res = ''
+      res = res_json['data']['buildBuildVersion'] if res_json['code'].to_i.zero?
+      res
+    end
+
+    def build_updated
+      res_json = res_body
+      res = ''
+      res = res_json['data']['buildUpdated'] if res_json['code'].to_i.zero?
+      res
+    end
+
+    def build_app_version
+      res_json = res_body
+      res = ''
+      res = res_json['data']['buildVersion'] if res_json['code'].to_i.zero?
+      res
+    end
+
+    def build_app_version_no
+      res_json = res_body
+      res = ''
+      res = res_json['data']['buildVersionNo'] if res_json['code'].to_i.zero?
+      res
+    end
+  end
+end

data/lib/lhj/helper/vika_helper.rb

@@ -16,10 +16,12 @@ module Lhj
 
     QUERY_RECORDS_API_URL = 'https://api.vika.cn/fusion/v1/datasheets/dstid/records?viewId=viwid'.freeze
 
-    QUERY_RECORDS_FIELD_KEY_API_URL = 'https://api.vika.cn/fusion/v1/datasheets/dstid/records?viewId=viwid&fieldKey=id&pageSize=500'.freeze
+    QUERY_RECORDS_FIELD_KEY_API_URL = 'https://api.vika.cn/fusion/v1/datasheets/dstid/records?viewId=viwid&fieldKey=id&pageSize=page_size&pageNum=page_num'.freeze
 
     RECORD_LINK_URL = 'https://vika.cn/workbench/dstid/viwid/recid'.freeze
 
+    QUERY_RECORDS_PAGE_SIZE = 100
+
     def self.trans_vika(note)
       str = note.dup
       if /#.+#/ =~ str
@@ -120,13 +122,17 @@ module Lhj
 
       res['data']['views'].each do |viw|
         viw_id = viw['id']
-        request_records(dst_id, viw_id)
+        request_records(1, dst_id, viw_id)
       end
     end
 
-    def self.request_records(dst_id, viw_id)
-      response = fetch_result(:records_key, dst_id, viw_id)
-      handle_records_response(dst_id, viw_id, response)
+    def self.request_records(page_num, dst_id, viw_id)
+      url = url_with_kind(:records_key, dst_id, viw_id)
+      url = url.gsub('page_size', QUERY_RECORDS_PAGE_SIZE.to_s)
+      url = url.gsub('page_num', page_num.to_s)
+      response = get_with_url(url)
+      page_size = handle_records_response(dst_id, viw_id, response)
+      request_records(page_num + 1, dst_id, viw_id) if page_size == QUERY_RECORDS_PAGE_SIZE
     end
 
     def self.handle_records_response(dst_id, viw_id, res)
@@ -146,6 +152,7 @@ module Lhj
           data_source[ds_key] = ds_value
         end
       end
+      res['data']['pageSize'].to_i
     end
 
     def self.link_url(dst_id, viw_id, rec_id)

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.45"
+    VERSION = "0.1.49"
   end
 end

data/lib/lhj/tools.rb

@@ -14,6 +14,7 @@ module Lhj
   require 'lhj/helper/pod_repo_config'
   require 'lhj/helper/git_branch_feature_config'
   require 'lhj/helper/pgyer_helper'
+  require 'lhj/helper/pgyer_shortcut_helper'
   require 'lhj/helper/dingtalk_helper'
   require 'lhj/helper/tb_helper'
   require 'lhj/action/sh_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.45
+  version: 0.1.49
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -344,6 +344,7 @@ files:
 - lib/lhj/helper/oss_helper.rb
 - lib/lhj/helper/pgyer_config.rb
 - lib/lhj/helper/pgyer_helper.rb
+- lib/lhj/helper/pgyer_shortcut_helper.rb
 - lib/lhj/helper/pod_repo_config.rb
 - lib/lhj/helper/tb_config.rb
 - lib/lhj/helper/tb_helper.rb