lhj-tools 0.1.47 → 0.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a3d83868ea1e59da60c81e44b61120054d3896c805f438a9cc72c3a9e70621b
-  data.tar.gz: e394c3618917bbd9e0e543bd00fefa181c49f91ebd7d08f0cd7e19ef34e2b9f1
+  metadata.gz: 810851bc3251dbf4888b5a976596d4dcd1ed87ec170d78732642990d7b3d67b8
+  data.tar.gz: 5e8601cac6d629695d822bbf42faf5b79cd306dd9f3042306d8600ab944dbeb3
 SHA512:
-  metadata.gz: c70d7668d27d807eecfbd30c99ac00d0c5da06b3d6695b4e200b848eaaa0a5b85d26598afbc65f1cd0299f6de4dbe70ed29c06c97226f6ab5c6911bbcbebd9cc
-  data.tar.gz: 8dc428ed99bc90d6da940fd4bdaa9e130f0e37e4c6ae64e1636612f4651692a671bcfd32ca6660a47788cbb45cdd7f2397c2f7f97d0d214aa521b44841b9fca9
+  metadata.gz: e3286d019af2bc6c21af68112692762a39cee02086103ddcd203661fd7e4f94902f0940d6b7c28b8193d747409e96e3b74f32c1bcf32497ebafbf924275ff95c
+  data.tar.gz: e0455f6b52cc94bedd96fd23ecd07118265d610eb5269ec3c4ecff183382e0196be21a3f74d43845d13514673764dc6acef042a9fe7d7053085830cbe312e1e1

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/pgyer_helper.rb

@@ -64,7 +64,7 @@ module Lhj
         @result = response.body
         puts @result
         puts 'upload success'
-        if @result['data'] && @result['data']['appUpdateDescription']
+        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
@@ -76,17 +76,18 @@ module Lhj
 
     def upload_with_type(path, file)
       return unless @env == :release
+      return unless /hai/ =~ path
 
       # 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} #{folder_path_dir}/* -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

@@ -31,12 +31,37 @@ module Lhj
       response.read_body
     end
 
+    def res_body
+      body = request_shortcut_body unless @res_body
+      @res_body ||= JSON.parse(body)
+    end
+
     def build_version
-      body = request_shortcut_body
-      res_json = JSON.parse(body)
+      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.47"
+    VERSION = "0.1.50"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.50
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-11 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide