lhj-tools 0.1.85 → 0.1.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85027c228917f15bde50036e543a1f1009f13419d7fef3d7ccaca6fecff03960
-  data.tar.gz: 917639bf7426a52fde22c93816a1d33fdc5079075fb07bb96a93788bea2c7b0e
+  metadata.gz: 88a12084e737e12b3a0e10a428407cc1e83dfd29a6831709b40bbc330ce2c183
+  data.tar.gz: fb31614816bf573b70f2fd03fbdab218f8ce215b512e5d63acaf29001a357893
 SHA512:
-  metadata.gz: c4cd7b9be22ec7347eb2f4f0f88633d4af91d79dd9dd7ba566ed478ec93008e45217061074d76333780859fb67187f44d3ea969820136b887c4b953a86449ebf
-  data.tar.gz: 84865eb597d31ccf9e781656a60c671417ed024a38f49c0d5484fc3379e130ed328332a79487894168753b119b7d76cf934896a280e0644b261f59d0165aa389
+  metadata.gz: 344983fb4d1b4f9d60bf94f85279a17db67a1e12ee5dd5d20c1efd000d5f37ec472aec6d4a93dbd786d7cb84a033d83a96f02cc612894cf3142f5fa3169c7088
+  data.tar.gz: 4936c0a4f26d79e879737447ec9c7ca408925b007624a1eb7e78187021ad7069d2b1d9f7dc65130202609356e87a7f4975c41f7826ebea20cb2a6da77c3909b7

data/lib/lhj/command/yapi.rb

@@ -67,7 +67,7 @@ module Lhj
         # 2.print request json body
         req_models = 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']) unless res_body['data']['req_body_is_json_schema']
+        req_models ||= 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)
         # print request mock data
@@ -124,7 +124,7 @@ module Lhj
         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
-        File.write(req_mock_file, @req_mock_array.join("\n")) if @req_mock_array.count.positive?
+        File.write(req_mock_file, @req_mock_array.join("\n")) if @req_mock_array&.count&.positive?
 
         puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}".green if @save && !@notify
         {
@@ -462,19 +462,17 @@ module Lhj
       def print_req_query(data)
         return unless data && data['req_query']
 
-        case @language
-        when 'oc'
-          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']}"
-            puts_h "@property (nonatomic, copy) NSString *#{h['name']};"
-          end
-          puts_h '@end'
-          puts "\n\n"
-        when 'java'
+        properties = []
+        data['req_query'].each do |h|
+          properties << { key: h['name'], type: 'string', description: h['desc'], default: '' }
         end
+        param_model_name = gen_model_name(nil, :req)
+        req_model = { name: param_model_name, properties: properties }
+
+        models = [req_model]
+        print_models(models)
+        print_models_impl(models)
+        models
       end
 
       def print_http_method(data, project_info)

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.85"
+    VERSION = "0.1.87"
   end
 end

metadata

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