lhj-tools 0.1.12 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d53d84a79a0bde89e0f6f4299cd74bec6f34b50bb4ae9534047a1981e8ecf481
-  data.tar.gz: 5c11e01ef959b491a5bd03e8f737de5a68cd0b6dffba586015291717c71a1b39
+  metadata.gz: d246c747ed42f7359b79c279b864539a2d318b744f68994a015960d9abff5d20
+  data.tar.gz: 58f16be0521a715eb2c8d16928f3f7818009272b1150e58fbad3ee56ca62388b
 SHA512:
-  metadata.gz: 60619bab6cafe45d4717c97d70fba34921dd79f2e21327bcfcdc155a76cc86a2341cef50c7506ed65980c610a2d97eb1b8d79c82641dd01faf077f581ac2d2e5
-  data.tar.gz: 95b1acbb95b7342da7bb4c946b7506c7572d619374f39906b0c6804e691f38e2388ed567c37b06b4c451e4aeb382d48fd13c5a90ae1fa6bcde9253104b092e94
+  metadata.gz: 8e71dbbe12bd70a4a42323d30ef9c40cee0c7cab5834273ca1359241df01fd3875a63a06419a398e91625184e93cb62893567fc5ecdbbb9f021acb95536eef62
+  data.tar.gz: 5f6514ecff7d90d4e4e0d5132abde517fdcd8bb36dc800fcd9eda7ea74e5da5ac0be6f1b04cd97321fc62974a3bc27079b2eaaaad0d55e9ba041294953b2d2f2

data/lib/lhj/command/init.rb

@@ -39,6 +39,7 @@ module Lhj
         FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
         if @url
           file_path = file_name_from_url(@url)
+          File.delete(file_path) if File.exist?(file_path)
           save_url_to_file(@url, file_path)
         else
           file_path = File.join(target_folder, 'config_file.yml')

data/lib/lhj/command/pgyer_upload.rb

@@ -0,0 +1,20 @@
+require 'lhj/helper/pgyer_helper'
+require 'lhj/helper/dingtalk_config'
+require 'lhj/helper/pgyer_config'
+require 'lhj/helper/tb_config'
+
+
+module Lhj
+  class Command
+    class Pgyer < Command
+
+      def handle
+        client = Lhj::Pgyer.new
+        file = File.expand_path('/Users/lihaijian/**/*.ipa')
+        client.upload_file(file, 'test....')
+        output = client.render_template
+        puts output.blue
+      end
+    end
+  end
+end

data/lib/lhj/command/yapi/formatters/service.rb

@@ -8,14 +8,23 @@ module Lhj
     class Service < Base
       # @param [String] name
       def render(name = 'yapi')
-        template(name).result(Context.new(@runner).fetch_binding)
+        temp_str = template_str(name)
+        render_template(temp_str)
       end
 
-      def template(name)
+      def render_template(temp_str)
+        template(temp_str).result(Context.new(@runner).fetch_binding)
+      end
+
+      def template_str(name)
+        File.read(File.join(File.dirname(__FILE__), 'template', "#{name}.erb"))
+      end
+
+      def template(template_str)
         if RUBY_VERSION < '2.6'
-          ERB.new(File.read(File.join(File.dirname(__FILE__), 'template', "#{name}.erb")), nil, '-')
+          ERB.new(template_str, nil, '-')
         else
-          ERB.new(File.read(File.join(File.dirname(__FILE__), 'template', "#{name}.erb")), trim_mode: '-')
+          ERB.new(template_str, trim_mode: '-')
         end
       end
     end

data/lib/lhj/command/yapi/formatters/template/pgyer.erb

@@ -0,0 +1,6 @@
+#### 应用名称：<%= @result['data']['appName'] %>
+#### 版本信息：<%= @result['data']['appVersion'] %>(Build <%= @result['data']['appBuildVersion'] %>)
+#### 更新时间：<%= @result['data']['appCreated'] %>
+#### 更新内容：<%= @result['data']['appUpdateDescription'] %>
+> ![screenshot](<%= @result['data']['appQRCodeURL'] %>)
+> [下载](https://www.pgyer.com/<%= @result['data']['appShortcutUrl'] %>)

data/lib/lhj/command/yapi.rb

@@ -24,6 +24,7 @@ module Lhj
         @model_pre_name = argv.option('model-pre')
         @save = argv.flag?('save', false)
         @debug = argv.flag?('debug', false)
+        @language = argv.option('lan', 'oc')
         @http_url = ''
         @http_headers = []
         @config_id = ''
@@ -167,8 +168,13 @@ module Lhj
         handle_model(res_body) do |model|
           models << model
         end
-        print_models(models)
-        print_models_impl(models)
+        case @language
+        when 'oc'
+          print_models(models)
+          print_models_impl(models)
+        when 'java'
+          print_models_for_java(models)
+        end
         @result_model_name = models.last[:name]
         puts "\n<===============打印返回数据模型-End=====================>\n".green
       end
@@ -182,8 +188,13 @@ module Lhj
         handle_model(req_body) do |model|
           models << model
         end
-        print_models(models)
-        print_models_impl(models)
+        case @language
+        when 'oc'
+          print_models(models)
+          print_models_impl(models)
+        when 'java'
+          print_models_for_java(models)
+        end
         @param_model_name = models.last[:name]
         puts "\n<===============打印请求模型-End=====================>\n".green
       end
@@ -264,11 +275,23 @@ module Lhj
         end
       end
 
+      def print_models_for_java(models)
+        models.each do |model|
+          model_name = model[:name] || ''
+          model_properties = model[:properties]
+          puts_h "public class #{model_name} extends BaseModel implements BusinessEvent.ProductDataCollect {"
+          model_properties.each do |m|
+            print_model_for_java(m)
+          end
+          puts_h "}\n\n\n"
+        end
+      end
+
       def print_models_impl(models)
         models.each do |model|
           puts_m "@implementation #{model[:name]}"
           str = model[:properties].filter { |p| p[:type].eql?('array') && !p[:type_name].eql?('NSString') }.map { |p| "@\"#{p[:key]}\": #{p[:type_name]}.class" }.join(', ')
-          if str && str.length.positive?
+          if str&.length&.positive?
             puts_m '+(NSDictionary *)modelContainerPropertyGenericClass {'
             puts_m "  return @{#{str}};"
             puts_m '}'
@@ -314,19 +337,53 @@ module Lhj
         end
       end
 
+      def print_model_for_java(m)
+        key = m[:key]
+        type_name = m[:type_name]
+        type = m[:type]
+        des = m[:description] || ''
+        des.gsub!(/\n/, '  ')
+        default = m[:default]
+        case type
+        when 'integer'
+          puts_h "int #{key};//#{des} #{default}"
+        when 'cent'
+          puts_h "int #{key};//#{des} #{default}"
+        when 'string'
+          puts_h "String #{key};//#{des} #{default}"
+        when 'number'
+          puts_h "double #{key};//#{des} #{default}"
+        when 'float'
+          puts_h "double #{key};//#{des} #{default}"
+        when 'double'
+          puts_h "double #{key};//#{des} #{default}"
+        when 'boolean'
+          puts_h "boolean #{key};//#{des} #{default}"
+        when 'object'
+          puts_h "#{type_name} #{key};//#{des} #{default}"
+        when 'array'
+          puts_h "#{type_name}[] #{key};//#{des} #{default}"
+        else
+          puts_h "String #{key};//#{des} #{default}"
+        end
+      end
+
       # @param [Object] data
       def print_req_query(data)
         return unless data && data['req_query']
 
-        puts_h '@interface MLParamModel : NSObject'
-        data['req_query'].each do |h|
-          des = h['desc']
-          puts_h "///#{des}  #{h['example']}"
-          puts_h "@property (nonatomic, copy) NSString *#{h['name']};"
+        case @language
+        when 'oc'
+          puts_h '@interface MLParamModel : NSObject'
+          data['req_query'].each do |h|
+            des = h['desc']
+            puts_h "///#{des}  #{h['example']}"
+            puts_h "@property (nonatomic, copy) NSString *#{h['name']};"
+          end
+          puts_h '@end'
+          puts "\n\n"
+        when 'java'
         end
-        puts_h '@end'
-        puts "\n\n"
-
         @param_model_name = 'MLParamModel' if @param_model_name.empty?
       end
 
@@ -341,9 +398,13 @@ module Lhj
         @method = 'JSON' if data['req_body_is_json_schema']
         @path_name = @path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { $&.upcase } }.join('') if @path
         @path_key = "k#{@path_name}URL"
-        puts "\n<===============方法调用=====================>\n".green
-        @model_template = Lhj::ErbFormatter::Service.new(self).render('model')
-        puts Lhj::ErbFormatter::Service.new(self).render('yapi').blue
+        case @language
+        when 'oc'
+          puts "\n<===============方法调用=====================>\n".green
+          @model_template = Lhj::ErbFormatter::Service.new(self).render('model')
+          puts Lhj::ErbFormatter::Service.new(self).render('yapi').blue
+        when 'java'
+        end
       end
     end
   end

data/lib/lhj/command.rb

@@ -26,6 +26,7 @@ module Lhj
     require 'lhj/command/file_path'
     require 'lhj/command/http'
     require 'lhj/command/sync_pod_repo'
+    require 'lhj/command/pgyer_upload'
 
     self.abstract_command = true
     self.command = 'lhj'

data/lib/lhj/config.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Lhj
   # config
   class Config

data/lib/lhj/helper/dingtalk_config.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # Ding Talk Config
+  class DingTalkConfig
+
+    CONFIG_NAME = 'dingtalk_config.yml'
+
+    def self.config_file
+      File.join(Lhj::Config.instance.home_dir, CONFIG_NAME)
+    end
+
+    def self.config
+      @yaml ||= YAML.load_file(config_file)
+    end
+
+    def self.dingtalk_robot
+      config['dingtalk_robot']
+    end
+  end
+end

data/lib/lhj/helper/dingtalk_helper.rb

@@ -0,0 +1,14 @@
+require 'lhj/helper/dingtalk_config'
+require 'json'
+
+module Lhj
+  # pgyer upload
+  class Dingtalk
+
+    def self.post_message(title, message)
+      robot_url = Lhj::DingTalkConfig.dingtalk_robot
+      http_body = { 'msgtype' => 'markdown', 'markdown' => { 'title' => title, 'text' => message } }.to_json
+      Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
+    end
+  end
+end

data/lib/lhj/helper/pgyer_config.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # pgyer config
+  class PgyerConfig
+
+    CONFIG_NAME = 'pgyer_config.yml'
+
+    def self.config_file
+      File.join(Lhj::Config.instance.home_dir, CONFIG_NAME)
+    end
+
+    def self.config
+      @yaml ||= YAML.load_file(config_file)
+    end
+
+    def self.api_key
+      config['api_key']
+    end
+
+    def self.user_key
+      config['user_key']
+    end
+
+    def self.password
+      config['password']
+    end
+  end
+end

data/lib/lhj/helper/pgyer_helper.rb

@@ -0,0 +1,66 @@
+require 'faraday'
+require 'faraday_middleware'
+require 'lhj/helper/pgyer_config'
+require 'lhj/command/yapi/formatters/service'
+require 'lhj/config'
+require_relative 'tb_config'
+
+module Lhj
+  # pgyer upload
+  class Pgyer
+
+    API_HOST = 'https://upload.pgyer.com/apiv1/app/upload'.freeze
+
+    attr_reader :api_key, :user_key, :password, :result
+
+    def initialize
+      @api_key = Lhj::PgyerConfig.api_key
+      @user_key = Lhj::PgyerConfig.user_key
+      @password = Lhj::PgyerConfig.password
+      @result = { 'data' => {} }
+    end
+
+    # @return [Faraday::Connection]
+    def http_client
+      conn_options = {
+        request: {
+          timeout: 1000,
+          open_timeout: 300
+        }
+      }
+      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
+    end
+
+    def upload_file(file, des)
+      params = {
+        '_api_key' => @api_key,
+        'uKey' => @user_key,
+        'password' => @password,
+        'updateDescription' => des,
+        'installType' => 2,
+        'file' => Faraday::UploadIO.new(file, 'application/octet-stream')
+      }
+      begin
+        puts 'begin upload'
+        response = http_client.post API_HOST, params
+        @result = response.body
+        puts @result
+        if @result['data'] && @result['data']['appUpdateDescription']
+          @result['data']['appUpdateDescription'] = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])
+        end
+      rescue Faraday::TimeoutError
+        puts 'upload fail'
+      end
+    end
+
+    def render_template
+      temp_str = File.read(File.join(Lhj::Config.instance.home_dir, 'pgyer.erb'))
+      Lhj::ErbFormatter::Service.new(self).render_template(temp_str)
+    end
+  end
+end

data/lib/lhj/helper/tb_config.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # tb config
+  class TBConfig
+
+    CONFIG_NAME = 'tb_config.yml'
+
+    def self.config_file
+      File.join(Lhj::Config.instance.home_dir, CONFIG_NAME)
+    end
+
+    def self.config
+      @yaml ||= YAML.load_file(config_file)
+    end
+
+    def self.tb_app_id
+      config['tb_app_id']
+    end
+
+    def self.tb_app_key
+      config['tb_app_key']
+    end
+
+    def self.tb_tenant_id
+      config['tb_tenant_id']
+    end
+
+    def self.projectId
+      config['projectId']
+    end
+
+  end
+end

data/lib/lhj/helper/tb_helper.rb

@@ -0,0 +1,54 @@
+require 'lhj/helper/tb_config'
+require 'jwt'
+require 'net/http'
+require 'uri'
+require 'json'
+
+module Lhj
+  # tb upload
+  class TbHelper
+
+    SEARCH_API_URL = 'https://open.teambition.com/api/task/tqlsearch'.freeze
+
+    def self.trans_tb(note)
+      str = note
+      if /#.+#/ =~ note
+        note.scan(/#[^#]+#/) do |m|
+          res_body = req_with_task(m.match(/\d+/)[0])
+          if res_body['code'].to_i == 200
+            url_str = "[#{res_body['result'][0]['content']}](https://www.teambition.com/task/#{res_body['result'][0]['taskId']})"
+            str = str.gsub(m, url_str)
+          end
+        end
+      end
+      str
+    end
+
+    def self.req_with_task(id)
+      now = Time.now.to_i
+      payload = {
+        _appId: Lhj::TBConfig.tb_app_id,
+        iat: now,
+        exp: now + 3600
+      }
+      token = JWT.encode(payload, Lhj::TBConfig.tb_app_key)
+
+      url = URI(SEARCH_API_URL)
+      https = Net::HTTP.new(url.host, url.port)
+      https.use_ssl = true
+
+      request = Net::HTTP::Post.new(url)
+      request['authorization'] = "Bearer #{token}"
+      request['x-tenant-id'] = Lhj::TBConfig.tb_tenant_id
+      request['x-tenant-type'] = 'organization'
+      request['Content-Type'] = 'application/json'
+      req_body = {
+        "tql": "projectId=#{Lhj::TBConfig.projectId} AND uniqueId=#{id}"
+      }
+      request.body = JSON.dump(req_body)
+
+      response = https.request(request)
+      JSON.parse(response.read_body)
+    end
+  end
+end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.12"
+    VERSION = "0.1.18"
   end
 end

data/lib/lhj/tools.rb

@@ -4,6 +4,10 @@ require 'colored'
 
 module Lhj
   require 'lhj/config'
+  require 'lhj/helper/pgyer_helper'
+  require 'lhj/helper/dingtalk_helper'
+  require 'lhj/helper/tb_helper'
+
   class Error < StandardError; end
 
   autoload :Command, 'lhj/command'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.18
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -262,6 +262,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: lhj tools.
 email:
 - sanan.li@qq.com
@@ -289,6 +309,7 @@ files:
 - lib/lhj/command/oss/del.rb
 - lib/lhj/command/oss/list.rb
 - lib/lhj/command/oss/upload.rb
+- lib/lhj/command/pgyer_upload.rb
 - lib/lhj/command/refactor_rename.rb
 - lib/lhj/command/rename_image.rb
 - lib/lhj/command/reverse_import.rb
@@ -301,11 +322,18 @@ files:
 - lib/lhj/command/yapi/formatters/command_context.rb
 - lib/lhj/command/yapi/formatters/service.rb
 - lib/lhj/command/yapi/formatters/template/model.erb
+- lib/lhj/command/yapi/formatters/template/pgyer.erb
 - lib/lhj/command/yapi/formatters/template/yapi.erb
 - lib/lhj/config.rb
+- lib/lhj/helper/dingtalk_config.rb
+- lib/lhj/helper/dingtalk_helper.rb
 - lib/lhj/helper/local_config.rb
 - lib/lhj/helper/oss_config.rb
 - lib/lhj/helper/oss_helper.rb
+- lib/lhj/helper/pgyer_config.rb
+- lib/lhj/helper/pgyer_helper.rb
+- lib/lhj/helper/tb_config.rb
+- lib/lhj/helper/tb_helper.rb
 - lib/lhj/helper/trans_helper.rb
 - lib/lhj/tools.rb
 - lib/lhj/tools/version.rb