lhj-tools 0.1.74 → 0.1.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f86764f14d88348e59221a4e339765a6ec4488a815d179a710d15e7c415471a1
-  data.tar.gz: 9f5635a3e149ce527aea1c298fa7a39316c446e75aaed941d23c6010ce0896de
+  metadata.gz: 3573173cffbb9453ae8e205034e2c28e9d7f4bde8600574cb42787f671716f91
+  data.tar.gz: ec7333d4b1078c07846ea533fade87a44ae18cfcbeab5311a078671af14d9904
 SHA512:
-  metadata.gz: 144bfb6d35d9190b81ed1715dd518c2b707971815a3412f279f673faffb4c6dd36768c05c86da1249d9eed7328620a0588fe62a3753b249fd9fd8625726bb0d3
-  data.tar.gz: 6d875c726247374420c5b2856614283a817078e073517a3dc5849b7a9258567eefffc9df76f3d54ec58836f647ef922ea6169c5fe9211d53630ab39a2fe78570
+  metadata.gz: 387b4adaaad5aa277799f85de8a2de6d898adaafee296c33e406b4c6818ef2a14651a4c191eadff85839880357a7a83b6b95cbb7c9827d38d392782303743209
+  data.tar.gz: 0aae4e701adb0b50446bad22b80bb23cc4eb7b55a920514d0f53b7f9a618de781b95fd61b7669d245a88337f3ba18298e72740e0a1b81c924686ef651c663f96

data/lib/lhj/command/yapi.rb

@@ -21,7 +21,9 @@ module Lhj
           %w[--id api的id],
           %w[--model-pre 模型的前缀],
           %w[--model-name 模型的名称],
-          %w[--save 保存生成文件]
+          %w[--save 保存生成文件],
+          %w[--sync 同步到github],
+          %w[--notify 通知到钉钉]
         ]
       end
 
@@ -40,9 +42,8 @@ module Lhj
         @config_id = ''
         @config_model_pre = 'ML'
         @config_model_name = 'Result'
-        @model_default_suffix = 'Model'
+        @config_base_url = 'http://yapi.xx.com'
         @type_trans = {}
-        @base_url = 'http://yapi.xx.com'
         super
       end
 
@@ -63,19 +64,19 @@ module Lhj
         project_id = res_body['data']['project_id']
         project_info = get_project_info(project_id)
         # 1.print request result
-        result_model_name = print_res_body_model(res_body)
+        print_res_body_model(res_body)
         # 2.print request json body
-        param_model_name = print_req_body_model(res_body)
+        print_req_body_model(res_body) if res_body['data']['req_body_is_json_schema']
         # 3.print request param
-        print_req_query(res_body['data'])
+        print_req_query(res_body['data']) unless res_body['data']['req_body_is_json_schema']
         # 4.print request method
-        service_code = print_http_method(res_body['data'], project_info, result_model_name, param_model_name)
+        service_code = print_http_method(res_body['data'], project_info)
         # 5.save to file
         file_map = save_to_file(service_code) if @save
         # 6.push to git
         push_to_git if @sync
         # 7.notify robot
-        notify_robot(file_map) if @notify
+        notify_robot(file_map, res_body, project_info) if @notify
       end
 
       def puts_h(str)
@@ -107,17 +108,19 @@ module Lhj
       def save_to_file(service_code)
         name = model_name
         file_name = gen_model_name
-        unless File.exist?(File.expand_path(sub_folder_name, '.'))
-          FileUtils.mkdir_p(File.expand_path(sub_folder_name, '.'))
-        end
+        FileUtils.mkdir_p(File.expand_path(sub_folder_name, '.')) unless File.exist?(File.expand_path(sub_folder_name, '.'))
         h_file = File.join('.', sub_folder_name, "#{file_name}.h")
         m_file = File.join('.', sub_folder_name, "#{file_name}.m")
         service_file = File.join('.', sub_folder_name, "#{model_pre}#{name}Service.m")
         File.write(h_file, @h_file_array.join("\n")) if @h_file_array.count.positive?
         File.write(m_file, @m_file_array.join("\n")) if @m_file_array.count.positive?
         File.write(service_file, service_code) if service_code
-        puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}".green
-        { h_file: h_file, m_file: m_file, s_file: service_file, api_id: api_id }
+        puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}".green if @save && !@notify
+        {
+          h_file: "#{sub_folder_name}/#{file_name}.h",
+          m_file: "#{sub_folder_name}/#{file_name}.m",
+          s_file: "#{sub_folder_name}/#{model_pre}#{name}Service.m"
+        }
       end
 
       def push_to_git
@@ -127,19 +130,27 @@ module Lhj
         Actions.sh('git push')
       end
 
-      def notify_robot(template_vars)
-        robot_url = 'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
+      def notify_robot(upload_info, interface_info, project_info)
+        i_url = "#{project_info['data']['basepath']}#{interface_info['data']['path']}"
+        username = interface_info['data']['username']
+        title = interface_info['data']['title']
+        temp_vars = upload_info.merge({
+                                        api_id: api_id,
+                                        title: title,
+                                        username: username,
+                                        interface_url: i_url
+                                      })
         template = Lhj::ErbTemplateHelper.load('oc_code_notify')
-        output = Lhj::ErbTemplateHelper.render(template, template_vars, '-')
-        Lhj::Dingtalk.post_message_robot(robot_url, '生成代码', output)
+        output = Lhj::ErbTemplateHelper.render(template, temp_vars, '-')
+        Lhj::Dingtalk.post_message_robot(robot_url, 'yapi generate', output)
       end
 
       def interface_url_str
-        "#{@base_url}/#{API_INTERFACE_URL}#{api_id}"
+        "#{@config_base_url}/#{API_INTERFACE_URL}#{api_id}"
       end
 
       def project_url_str(project_id)
-        "#{@base_url}/#{API_PROJECT_URL}#{project_id}"
+        "#{@config_base_url}/#{API_PROJECT_URL}#{project_id}"
       end
 
       def yml_file
@@ -151,11 +162,12 @@ module Lhj
         config.each do |k, v|
           @http_headers << "#{k}=#{v}" if k.eql?('__wpkreporterwid_') || k.eql?('_yapi_token') || k.eql?('_yapi_uid')
         end
-        @base_url = config['base_url']
+        @config_base_url = config['base_url']
         @config_id = config['id']
         @config_model_pre = config['model_pre']
         @config_model_suffix = config['model_suffix']
         @config_model_name = config['model_name']
+        @config_robot_url = config['dingtalk']
         @type_trans = config['type_trans']
       end
 
@@ -172,11 +184,15 @@ module Lhj
       end
 
       def req_model_name
-        'Param'
+        'RequestParam'
       end
 
       def model_suffix
-        @config_model_suffix || @model_default_suffix
+        @config_model_suffix || 'Model'
+      end
+
+      def robot_url
+        @config_robot_url || 'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
       end
 
       def get_interface_api_model
@@ -220,7 +236,6 @@ module Lhj
           print_models_for_java(models)
         end
         puts "\n<===============打印返回数据模型-End=====================>\n".green
-        models.last[:name]
       end
 
       def print_req_body_model(res_json)
@@ -240,16 +255,16 @@ module Lhj
           print_models_for_java(models)
         end
         puts "\n<===============打印请求模型-End=====================>\n".green
-        models.last[:name]
       end
 
       def fetch_res_boy(res_json)
         return if !res_json || !res_json['data'] || !res_json['data']['res_body']
 
         res_body = JSON.parse(res_json['data']['res_body'])
-        return if !res_body['properties'] || !res_body['properties']['detailMsg']
 
-        result = res_body['properties']['detailMsg']
+        result = res_body
+        result = res_body['properties']['detailMsg'] if res_body['properties'] && res_body['properties']['detailMsg']
+
         return unless result['type'] == 'object' || result['type'] == 'array'
 
         result['name'] = gen_model_name
@@ -266,12 +281,15 @@ module Lhj
 
       def gen_model_name(property_name = nil, type = :res)
         name = model_name
-        name = req_model_name if type == :req
         unless property_name.nil?
           name = property_name.gsub(/vo|model|list/i, '').gsub(/(.*)s$/, '\1').gsub(/^\w/) { Regexp.last_match(0).upcase }
           name = property_name.gsub(/^\w/) { Regexp.last_match(0).upcase } if name.length <= 0
         end
-        "#{model_pre}#{name}#{model_suffix}"
+        if type == :req
+          "#{model_pre}#{name}#{req_model_name}"
+        else
+          "#{model_pre}#{name}#{model_suffix}"
+        end
       end
 
       def handle_model(model, &block)
@@ -410,7 +428,8 @@ module Lhj
 
         case @language
         when 'oc'
-          puts_h '@interface MLParamModel : NSObject'
+          param_model_name = gen_model_name(nil, :req)
+          puts_h "@interface #{param_model_name} : NSObject"
           data['req_query'].each do |h|
             des = h['desc']
             puts_h "///#{des}  #{h['example']}"
@@ -422,14 +441,23 @@ module Lhj
         end
       end
 
-      def print_http_method(data, project_info, result_model_name, param_model_name)
+      def print_http_method(data, project_info)
         return unless data
 
         path = data['path']
         if path
-          path_name = path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { Regexp.last_match(0).upcase } }.join('')
+          arr = path.split('/').map do |s|
+            re = s.gsub(/[^A-Za-z0-9](.)/) { Regexp.last_match(0).upcase }
+            re = re.gsub(/[^A-Za-z0-9]/, '')
+            re.gsub(/^\w/) { Regexp.last_match(0).upcase }
+          end
+          path_name = arr.join('')
         end
         path_key = "k#{path_name}URL"
+        display_path = "#{project_info['data']['basepath']}#{path}"
+        display_path = display_path[1..-1] if display_path.index('/') == 0
+        result_model_name = gen_model_name
+        param_model_name = gen_model_name(nil, :req)
         mth = data['method']
         mth = 'JSON' if data['req_body_is_json_schema']
         case @language
@@ -442,11 +470,11 @@ module Lhj
           yapi_vars = { title: data['title'],
                         desc: data['desc'],
                         username: data['username'],
-                        path: "#{project_info['data']['basepath']}#{path}",
+                        path: display_path,
                         path_key: path_key,
                         path_name: path_name,
                         result_model_name: result_model_name,
-                        param_model_name: param_model_name || 'MLParamModel',
+                        param_model_name: param_model_name,
                         mth: mth,
                         model_template: model_temp_result }
           yapi_temp_result = Lhj::ErbTemplateHelper.render(yapi_temp, yapi_vars, '-')

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.74"
+    VERSION = "0.1.76"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.74
+  version: 0.1.76
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-11 00:00:00.000000000 Z
+date: 2022-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj