lhj-tools 0.2.44 → 0.2.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b326669a6ec75b15b5032ab6570bdeb87458d778bfb0df9a27f3ff358a3f580
-  data.tar.gz: e785ad7ca166a3a32475f311dd58b16a1101d3a9f0a8551025149c2e4f247274
+  metadata.gz: 63aa0004363c8a1ac4367c2fb048389c88e0d638391a62d3dc340cf5f4a73e87
+  data.tar.gz: 24dff6d49f4a4220b73679886de7ee771cf9fcc3b0748658e06cdc467a754285
 SHA512:
-  metadata.gz: ebf2b737686e68174ba58afdccc258e92290d7fd177862c35afa9c33a46b9f43213f6a6e2583277574675766da94aab4607a0afcc0658a2d59a81d4cba34a89c
-  data.tar.gz: 10f56170ecf0f63d4bc1177ea06a7163b9244b384fc8b1fcc97bf956c70bd946621983d6045f61e764d6bedb95763c606f7c9b0ecea35afd4053498088c7fbb4
+  metadata.gz: 2ff466e10cdd2b5648553c2f06a4ad37f47173dacc58ade9d07d5bcefab2c71d58313c551787b9ed45537f801899cf7462de3a6d806c3197734d2801d156fd70
+  data.tar.gz: b2ed90c292a2dabbe42eff7320a54d08096f93966e6f62252e2b1c7a4c0bfaa8c78e7bd79701c9f50cf669389f4c428380c83ca4e7e8c31222482774186f2e6e

data/lib/lhj/command/jenkins/jenkins_build.rb

@@ -57,11 +57,11 @@ module Lhj
         #   end
         # end
 
-        path = '/xxxx'
-        Lhj::TraditionalCheckHelper.check_ignore(path)
+        # path = '/xxxx'
+        # Lhj::TraditionalCheckHelper.check_ignore(path)
 
-        # api = Lhj::YapiHelper.new(project_id: 694, interface_id: 70595, model_name: 'Order', model_pre: 'AA')
-        # api.process
+        api = Lhj::YapiHelper.new(project_id: 449, interface_id: 103638, model_name: 'OrderDetail', model_pre: 'PT')
+        api.process
         # file_list = api.save_to_file
         # key = Lhj::IOSRobotConfig.app_key
         # secret = Lhj::IOSRobotConfig.app_secret

data/lib/lhj/command/sync_pod_repo.rb

@@ -121,9 +121,9 @@ module Lhj
         cmd << "--sources=#{pod_repo_name},aliyun,trunk"
         cmd << '--allow-warnings'
         cmd << '--use-libraries'
-        cmd << '--skip-import-validation'
-        cmd << '--skip-tests'
-        cmd << '--validation-dir'
+        # cmd << '--skip-import-validation'
+        # cmd << '--skip-tests'
+        # cmd << '--validation-dir'
         cmd << '--verbose'
         Actions.sh(cmd.join(' '), log: true, error_callback: nil)
       end

data/lib/lhj/helper/yapi/yapi_helper.rb

@@ -48,7 +48,9 @@ module Lhj
       # 4.print request method
       print_http_method(res_body['data'], project_info)
       # print request mock data
-      print_mock_request_data(req_models) if !req_models.nil? && !req_models.empty?
+      print_mock_data(req_models) if !req_models.nil? && !req_models.empty?
+      # print response mock data
+      print_mock_data(res_models) if !res_models.nil? && !res_models.empty?
       model_result
     end
 
@@ -262,7 +264,7 @@ module Lhj
             o = v['items'] || v
             o['name'] = gen_model_name(k, type)
             if v['type'].eql?('array') && v['items']['type'].eql?('string')
-              c_model[:type_name] = 'String'
+              c_model[:type_name] = language == :oc ? 'NSString' : 'String'
             else
               c_model[:type_name] = o['name']
               handle_model(o, type, &block)
@@ -295,7 +297,7 @@ module Lhj
       models.each do |model|
         model_name = model[:name] || ''
         model_properties = model[:properties]
-        puts_h "public class #{model_name} extends BaseModel implements BusinessEvent.ProductDataCollect {"
+        puts_h "public class #{model_name} extends BaseModel {"
         model_properties.each do |m|
           print_model_for_java(m)
         end
@@ -615,7 +617,7 @@ module Lhj
 
     end
 
-    def print_mock_request_data(req_models)
+    def print_mock_data(req_models)
       puts "\n<===============打印Mock Data-Begin=====================>\n".green
       req_models.each do |model|
         model_name = model[:name] || ''

data/lib/lhj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lhj
-  VERSION = '0.2.44'
+  VERSION = '0.2.46'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.44
+  version: 0.2.46
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj