lhj-tools 0.1.10 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1d71c98366bbad8074af38f9c4381db08fb138457a61cd119ff3f3405ac9ba7
-  data.tar.gz: 37d5b49a7403e202dea0c557bcbe17e35e4d3483b2e4a8fa4868d58527d5d545
+  metadata.gz: 17511d36f2ccbd99a885442c54373a7a032cc014552855a33b2c326dccf34688
+  data.tar.gz: ba65a5faa5f83e351935bdb7a7f0b221bd8ea405f1788acd2c29e85d2d0d6fe6
 SHA512:
-  metadata.gz: 5a190d0b7d8adf62726401fac4c550acf6b70eb08c0a1775e18df2a724e2156b0c9b4a0b04bd009a8c9b2a3be2b44bb571344058ad5590115088203e13b4f417
-  data.tar.gz: dc1ac168f906f8a0db1675ae3dc6ec93dbec6424a7edcfbabe80c3308031f969f4db91057e0783057e4d1e04922fbb70bf3aa326ceec210a75eab3fc23d1f9e1
+  metadata.gz: 4396cb85f10adeb732be7038d061b3188536e4a47113d5426ee9e2c02a35f4271562a2c6655c3c8773ec7633a976c9f51310a9640fca0a37b79848749cc9cf7a
+  data.tar.gz: b401b9f5e196b7ed835bce7bb363876203b3f987b6314517b5f168b15d20d25cf64082b7b18ab3c2c1c10bffd12fa45100678234975a07f4160c1b5bbd476ed3

data/lib/lhj/command/config/info.rb

@@ -3,29 +3,44 @@ require 'lhj/config'
 
 module Lhj
   class Command
+    # config
     class Config < Command
+      def initialize(argv)
+        @cli = HighLine.new
+        super
+      end
+
+      def show_config
+        config_arr = Dir.glob("#{config_dir}/**/*.yml")
+        config_arr.each_index { |i| puts "#{i}.#{File.basename(config_arr[i])}".yellow }
+        idx = ask_which_one
+        config_file = config_arr[idx]
+        handle_yaml(config_file)
+      end
+
+      def handle_yaml(file)
+        '子类实现'
+      end
+
+      def handle
+        show_config
+      end
+
+      def config_dir
+        Lhj::Config.instance.home_dir
+      end
+
+      def print_table(title, table_rows)
+        table = Terminal::Table.new title: title, headings: %w[键 值], rows: table_rows
+        puts table
+      end
+
       # show config info
       class Info < Config
         self.summary = '查看配置信息'
 
-        def initialize(argv)
-          @cli = HighLine.new
-          super
-        end
-
-        def handle
-          show_config
-        end
-
-        def show_config
-          config_arr = Dir.glob("#{config_dir}/**/*.yml")
-          config_arr.each_index { |i| puts "#{i}.#{File.basename(config_arr[i])}".yellow }
-          idx = ask_which_one
-          config_file = config_arr[idx]
-          show_yaml(config_file)
-        end
 
-        def show_yaml(file)
+        def handle_yaml(file)
           table_rows = []
           content = YAML.load_file(file)
 
@@ -49,17 +64,33 @@ module Lhj
           print_table(title, table_rows) if table_rows.count.positive?
         end
 
-        def print_table(title, table_rows)
-          table = Terminal::Table.new title: title, headings: %w[键 值], rows: table_rows
-          puts table
+        def ask_which_one
+          @cli.ask('查看哪个配置: '.green).strip.to_i
         end
+      end
+
+      class Update < Config
 
         def ask_which_one
-          @cli.ask('查看哪个配置: '.green).strip.to_i
+          @cli.ask('更新哪个配置: '.green).strip.to_i
         end
 
-        def config_dir
-          Lhj::Config.instance.home_dir
+        def handle_yaml(file)
+          table_rows = []
+          content = YAML.load_file(file)
+
+          if content.is_a?(Hash)
+            content.each do |key, value|
+              table_rows << [key, value]
+            end
+          end
+
+          title = File.basename(file).to_s
+          print_table(title, table_rows) if table_rows.count.positive?
+
+          cmd = ['open']
+          cmd << file
+          Actions.sh(cmd.join(' '))
         end
       end
     end

data/lib/lhj/command/init.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'faraday'
 require 'faraday_middleware'
 require 'net/http'
@@ -23,7 +24,10 @@ module Lhj
 
       def validate!
         super
-        help! '配置url必须输入' unless @url
+        unless @url
+          path = File.join(target_folder, 'config_file.yml')
+          help! '配置url必须输入' unless File.exist?(path)
+        end
       end
 
       def initialize(argv)
@@ -33,8 +37,13 @@ module Lhj
 
       def handle
         FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
-        file_path = file_name_from_url(@url)
-        save_url_to_file(@url, file_path)
+        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')
+        end
         content = YAML.load_file(file_path)
         download_file(content) if content.is_a?(Array)
       end

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

@@ -47,102 +47,118 @@ module Lhj
         print_value
       end
 
+      def puts_d(str)
+        puts str.blue
+      end
+
+      def puts_i(str)
+        puts str.blue
+      end
+
+      def puts_l(str)
+        puts str.blue
+      end
+
+      def puts_v(str)
+        puts str.blue
+      end
+
       def print_declare
         names.each do |name|
-          puts '///'
-          puts "@property (nonatomic, strong) #{type} *#{name};"
+          puts_d '///'
+          puts_d "@property (nonatomic, strong) #{type} *#{name};"
         end
       end
 
       def print_instance
         names.each do |name|
-          puts "-(#{type} *)#{name}"
-          puts '{'
-          puts "    if(!_#{name}){"
+          puts_i "-(#{type} *)#{name}"
+          puts_i '{'
+          puts_i "    if(!_#{name}){"
           print_alloc(name)
-          puts "        _#{name}.translatesAutoresizingMaskIntoConstraints = NO;"
+          puts_i "        _#{name}.translatesAutoresizingMaskIntoConstraints = NO;"
           print_property(name)
-          puts '    }'
-          puts "    return _#{name};"
-          puts '}'
-          puts "\n"
+          puts_i '    }'
+          puts_i "    return _#{name};"
+          puts_i '}'
+          puts_i "\n"
         end
       end
 
       def print_alloc(name)
         case type
         when 'UIImageView'
-          puts "        _#{name} = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@\"xxxx\"]];"
+          puts_i "        _#{name} = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@\"xxxx\"]];"
         when 'UIButton'
-          puts "        _#{name} = [UIButton buttonWithType:UIButtonTypeCustom];"
+          puts_i "        _#{name} = [UIButton buttonWithType:UIButtonTypeCustom];"
         when 'UITableView'
-          puts "        _#{name} = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];"
+          puts_i "        _#{name} = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];"
         else
-          puts "        _#{name} = [[#{type} alloc] init];"
+          puts_i "        _#{name} = [[#{type} alloc] init];"
         end
       end
 
       def print_property(name)
         case type
         when 'UILabel'
-          puts "        _#{name}.textColor = kSetCOLOR(0x333333);"
-          puts "        _#{name}.text = @\"xxxxxxxx\";"
-          puts "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
-          puts "        _#{name}.textAlignment = NSTextAlignmentCenter;"
+          puts_i "        _#{name}.textColor = kSetCOLOR(0x333333);"
+          puts_i "        _#{name}.text = @\"xxxxxxxx\";"
+          puts_i "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
+          puts_i "        _#{name}.textAlignment = NSTextAlignmentCenter;"
         when 'UIImageView'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
-          puts "        _#{name}.contentMode = UIViewContentModeScaleAspectFit;"
-          puts "        _#{name}.clipsToBounds = YES;"
-          puts "        _#{name}.layer.cornerRadius = 6.0f;"
-          puts "        _#{name}.layer.borderColor = kLineColor.CGColor;"
-          puts "        _#{name}.layer.borderWidth = 0.5;"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        _#{name}.contentMode = UIViewContentModeScaleAspectFit;"
+          puts_i "        _#{name}.clipsToBounds = YES;"
+          puts_i "        _#{name}.layer.cornerRadius = 6.0f;"
+          puts_i "        _#{name}.layer.borderColor = kLineColor.CGColor;"
+          puts_i "        _#{name}.layer.borderWidth = 0.5;"
         when 'UITextField'
-          puts "        _#{name}.textColor = kSetCOLOR(0x333333);"
-          puts "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
+          puts_i "        _#{name}.textColor = kSetCOLOR(0x333333);"
+          puts_i "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
         when 'UIView'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
         when 'UIStackView'
-          puts "        _#{name}.axis = UILayoutConstraintAxisHorizontal;"
-          puts "        _#{name}.distribution = UIStackViewDistributionFillEqually;"
+          puts_i "        _#{name}.axis = UILayoutConstraintAxisHorizontal;"
+          puts_i "        _#{name}.distribution = UIStackViewDistributionFillEqually;"
         when 'UITableView'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
-          puts "        _#{name}.delegate = self;"
-          puts "        _#{name}.delegate = self;"
-          puts "        _#{name}.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
-          puts "        _#{name}.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
-          puts "        _#{name}.separatorStyle = UITableViewCellSeparatorStyleNone;"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        _#{name}.delegate = self;"
+          puts_i "        _#{name}.delegate = self;"
+          puts_i "        _#{name}.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
+          puts_i "        _#{name}.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
+          puts_i "        _#{name}.separatorStyle = UITableViewCellSeparatorStyleNone;"
         when 'UIButton'
-          puts "        _#{name}.backgroundColor = kBackgroundColor;"
-          puts "        [_#{name} setTitle:@\"xxx\" forState:UIControlStateNormal];"
-          puts "        [_#{name} setTitleColor:kSetCOLOR(0x999999) forState:UIControlStateNormal];"
-          puts "        _#{name}.titleLabel.font = [UIFont systemFontOfSize:14.0 weight:UIFontWeightRegular];"
-          puts "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateNormal];"
-          puts "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateSelected];"
-          puts "        [_#{name} addTarget:self action:@selector(actionHandler:) forControlEvents:UIControlEventTouchUpInside];"
+          puts_i "        _#{name}.backgroundColor = kBackgroundColor;"
+          puts_i "        [_#{name} setTitle:@\"xxx\" forState:UIControlStateNormal];"
+          puts_i "        [_#{name} setTitleColor:kSetCOLOR(0x999999) forState:UIControlStateNormal];"
+          puts_i "        _#{name}.titleLabel.font = [UIFont systemFontOfSize:14.0 weight:UIFontWeightRegular];"
+          puts_i "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateNormal];"
+          puts_i "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateSelected];"
+          puts_i "        [_#{name} addTarget:self action:@selector(actionHandler:) forControlEvents:UIControlEventTouchUpInside];"
         end
       end
 
       def print_layout
         names.each do |name|
-          puts "[contentView addSubview:self.#{name}];"
-          puts "[self.#{name}.leadingAnchor constraintEqualToAnchor:contentView.leadingAnchor constant:0].active = YES;"
-          puts "[self.#{name}.trailingAnchor constraintEqualToAnchor:contentView.trailingAnchor constant:0].active = YES;"
-          puts "[self.#{name}.topAnchor constraintEqualToAnchor:contentView.topAnchor].active = YES;"
-          puts "[self.#{name}.bottomAnchor constraintEqualToAnchor:contentView.bottomAnchor].active = YES;"
-          puts "[self.#{name}.widthAnchor constraintEqualToConstant:80].active = YES;"
-          puts "[self.#{name}.heightAnchor constraintEqualToConstant:80].active = YES;"
+          puts_l "[contentView addSubview:self.#{name}];"
+          puts_l "[self.#{name}.leadingAnchor constraintEqualToAnchor:contentView.leadingAnchor constant:0].active = YES;"
+          puts_l "[self.#{name}.trailingAnchor constraintEqualToAnchor:contentView.trailingAnchor constant:0].active = YES;"
+          puts_l "[self.#{name}.topAnchor constraintEqualToAnchor:contentView.topAnchor].active = YES;"
+          puts_l "[self.#{name}.bottomAnchor constraintEqualToAnchor:contentView.bottomAnchor].active = YES;"
+          puts_l "[self.#{name}.widthAnchor constraintEqualToConstant:80].active = YES;"
+          puts_l "[self.#{name}.heightAnchor constraintEqualToConstant:80].active = YES;"
           if type.eql?('UILabel')
-            puts "[self.#{name} setContentHuggingPriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
-            puts "[self.#{name} setContentCompressionResistancePriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
+            puts_l "[self.#{name} setContentHuggingPriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
+            puts_l "[self.#{name} setContentCompressionResistancePriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
           end
-          puts "\n\n"
+          puts_l "\n\n"
         end
       end
 
       def print_value
         names.each do |name|
           if type.eql?('UILabel')
-            puts "self.#{name}.text = @\"xxxxx\";"
+            puts_v "self.#{name}.text = @\"xxxxx\";"
           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/model.erb

@@ -0,0 +1,10 @@
+<% if @result_model_name %>
+          if (responseMessage.resultCode == 0 && responseMessage.error == nil) {
+              if ([responseMessage.detailMsg isKindOfClass:[NSDictionary class]]) {
+                  <%= @result_model_name %> *info = <%= @result_model_name %> yy_modelWithDictionary:responseMessage.detailMsg];
+                  callback(info,responseMessage);
+              }
+          } else {
+              callback(nil,responseMessage);
+          }
+<% 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/formatters/template/yapi.erb

@@ -0,0 +1,28 @@
+/**
+*  <%= @title %> -- <%= @username %>
+*  <%= @desc %>
+*/
+static NSString * const <%= @path_key %> = @"<%= @path %>";
+
+<% if @method == 'GET' -%>
++(void)get<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<% unless @result_model_name.empty? -%><%= @result_model_name %> *model, <% end -%>MLResponseMessage *response))callback
+{
+    [MLNetworkingManager getWithUrl:<%= @path_key %> params:params response:^(MLResponseMessage *responseMessage) {
+          <%= @model_template %>
+    }];
+}
+<% elsif @method == 'JSON' -%>
++(void)postJson<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<% unless @result_model_name.empty? -%><%= @result_model_name %> *model, <% end -%>MLResponseMessage *response))callback
+{
+    [MLNetworkingManager requestJsonWithUrl:<%= @path_key %> httpMedth:kRequestMethodPOST params:param response:^(MLResponseMessage *responseMessage) {
+          <%= @model_template %>
+    }];
+}
+<% else -%>
++(void)post<%= @path_name %>:(<%= @param_model_name %> *)param callback:(void (^)(<% unless @result_model_name.empty? -%><%= @result_model_name %> *model, <% end -%>MLResponseMessage *response))callback
+{
+    [MLNetworkingManager postWithUrl:<%= @path_key %> params:params response:^(MLResponseMessage *response) {
+          <%= @model_template %>
+    }];
+}
+<% end -%>

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 = ''
@@ -59,7 +60,11 @@ module Lhj
       def process(config_file)
         load_config(config_file)
         res_body = req_api_model
-        return unless res_body && res_body['errcode'].to_i.zero? && !res_body.empty?
+        unless res_body['errcode'].to_i.zero?
+          puts '请修改 ~/.lhj/yapi.yml文件的对应的__wpkreporterwid_,_yapi_token,_yapi_uid这三个值'.red
+          return
+        end
+        return unless res_body && !res_body.empty?
 
         # 1.print request result
         print_res_body_model(res_body)
@@ -163,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
@@ -178,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
@@ -260,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 '}'
@@ -310,18 +337,54 @@ 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
 
       def print_http_method(data)
@@ -335,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/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,62 @@
+require 'faraday'
+require 'faraday_middleware'
+require 'lhj/helper/pgyer_config'
+require 'lhj/command/yapi/formatters/service'
+require 'lhj/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 ''
+      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,7 @@
+require 'lhj/helper/tb_config'
+
+module Lhj
+  # pgyer upload
+  class Tb
+  end
+end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.10"
+    VERSION = "0.1.16"
   end
 end

data/lib/lhj/tools.rb

@@ -4,6 +4,9 @@ require 'colored'
 
 module Lhj
   require 'lhj/config'
+  require 'lhj/helper/pgyer_helper'
+  require 'lhj/helper/dingtalk_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.10
+  version: 0.1.16
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -289,6 +289,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
@@ -300,10 +301,19 @@ files:
 - lib/lhj/command/yapi/formatters/base.rb
 - 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