lhj-tools 0.1.72 → 0.1.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1414ebd1811cbc9f773ed21506171acd5aa5399a5b9a9d3a74634ff8ef93e882
-  data.tar.gz: e0b5c1dab6b128c8e8a8518f8b38c4d0e3c3b4de8cd4c61746591fc602878c5d
+  metadata.gz: ec999ed3fcb4f5fff34b2dc483b5932c77bfd34c59cee78dfcebd7ea1a10fc54
+  data.tar.gz: c0a438db4402ef344ddf83f3acd4f3bca228c9335aa8e8d240bab02ba4745269
 SHA512:
-  metadata.gz: d0c41abe42ed5812635dc7c9a235efb9c2bce06054aba7c977ab82f7693d04e38151e91f68b8e78f22efb1d7d69ba502cca7c5024a74ca1f3364e089d4e1cf0d
-  data.tar.gz: 989dd03e74941a8b10623179c785367db74d8b615bac7e84d564718c0cacffb5b545ceb8d565a63687c440153e5a5493c0f8e6e1821b19e959f97da0b1f8f65e
+  metadata.gz: 9201f7d556c51665acb83d63cbe4978eb6507d99d00b1da5ab92fa064557298242845fec4484d2cf327fc41a6bf1663c3648573627ecb3098338d5c591aa1d04
+  data.tar.gz: 217cc7ee797ee78ab6a074715bf346fc3e044779e2553a20a1b813a63239a3e72611d17e439477912415ba600325ed4f1d597446e213833c6146651419a22a67

data/lib/lhj/command/yapi.rb

@@ -66,7 +66,6 @@ module Lhj
         service_code = print_http_method(res_body['data'], result_model_name, param_model_name)
         # 5.save to file
         file_map = save_to_file(service_code) if @save
-        puts file_map
         # 6.push to git
         push_to_git if @sync
         # 7.notify robot
@@ -101,7 +100,7 @@ module Lhj
 
       def save_to_file(service_code)
         name = model_name
-        file_name = gen_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
@@ -162,6 +161,10 @@ module Lhj
         @model_result_name || @config_model_name
       end
 
+      def req_model_name
+        'Param'
+      end
+
       def model_suffix
         @config_model_suffix || @model_default_suffix
       end
@@ -228,7 +231,7 @@ module Lhj
         result = res_body['properties']['detailMsg']
         return unless result['type'] == 'object' || result['type'] == 'array'
 
-        result['name'] = gen_model_name('')
+        result['name'] = gen_model_name
         result
       end
 
@@ -236,14 +239,18 @@ module Lhj
         return if !res_json || !res_json['data'] || !res_json['data']['req_body_other']
 
         result = JSON.parse(res_json['data']['req_body_other'])
-        result['name'] = gen_model_name('')
+        result['name'] = gen_model_name(nil, :req)
         result
       end
 
-      def gen_model_name(name)
-        n = name.gsub(/vo|model|list/i, '').gsub(/(.*)s$/, '\1').gsub(/^\w/) { Regexp.last_match(0).upcase }
-        n = model_name if n.length <= 0
-        "#{model_pre}#{n}#{model_suffix}"
+      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}"
       end
 
       def handle_model(model, &block)
@@ -398,7 +405,9 @@ module Lhj
         return unless data
 
         path = data['path']
-        path_name = path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { Regexp.last_match(0).upcase } }.join('') if path
+        if path
+          path_name = path.split('/').map { |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/) { Regexp.last_match(0).upcase } }.join('')
+        end
         path_key = "k#{path_name}URL"
         mth = data['method']
         mth = 'JSON' if data['req_body_is_json_schema']

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.72"
+    VERSION = "0.1.73"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.72
+  version: 0.1.73
 platform: ruby
 authors:
 - lihaijian