lhj-tools 0.2.31 → 0.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 076d5ec66856ced7568622e7e19e173d6d7f08dd6d51de147719aca07a78948a
-  data.tar.gz: d9a323338b67946d2c507964aa7de067b23ae25a9ed95b4b66335cc8dafa8a4b
+  metadata.gz: 23e4b1ca63b9edadde731a0fba99ad2815029e3a65fca292d80d5ded572f0cca
+  data.tar.gz: 01606d47b8191a85c0cd44b9ec15fa069fa0936da3287325abb72ebf90370ac6
 SHA512:
-  metadata.gz: f78f99f701be41cef12335157d335a4173362b76c232cdd2f5200799e71ddb4e3ceae6ad6d3a8e022e6852b6a9ee72fe7c519a02cf2d12bcb774da8384b9557a
-  data.tar.gz: af1b07e7bf8f7f059f9044e78514155d5ba8916ac801a3f0d9dd3baaacbc70187b202a00ed053ea9a41790d6da6eaee2ea4378da6eddc9c1bb3dd3e569d39da7
+  metadata.gz: c11804e3e40eb39886babf9347106e959d0bf1366f4f89ab0c62174b844fd7e38656f954c658402944a01e110e14506a9cda195952a6e61e144e313ed78f0038
+  data.tar.gz: aff83c9066ee3975ad45d7ccfa29db7f5cc7bfbe09f8481dd07c5d9d477d67ba2b4e965919935c6f6457e20e9b02af1dfa03637b6318ffc4f501164b1e7442c5

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

@@ -46,16 +46,22 @@ module Lhj
       end
 
       def handle
-        file = File.join(Lhj::Config.instance.home_dir, 'all_device.txt')
-        File.open(file, 'r+') do |f|
-          f.each_line do |line|
-            ma = line.match(/(?<device>[^\s]*)(\s*)(?<name>.*)/)
-            device = ma[:device]
-            name = ma[:name].gsub(/(\S*)\s(\S*)\s(.*)/, '\\1-\\2-\\3')
-            name = name.gsub(/\s/, '')
-            add_device(device, name)
-          end
-        end
+        # file = File.join(Lhj::Config.instance.home_dir, 'all_device.txt')
+        # File.open(file, 'r+') do |f|
+        #   f.each_line do |line|
+        #     ma = line.match(/(?<device>[^\s]*)(\s*)(?<name>.*)/)
+        #     device = ma[:device]
+        #     name = ma[:name].gsub(/(\S*)\s(\S*)\s(.*)/, '\\1-\\2-\\3')
+        #     name = name.gsub(/\s/, '')
+        #     add_device(device, name)
+        #   end
+        # end
+        #
+        api = Lhj::YapiHelper.new(project_id: 694, interface_id: 71426, model_name: 'Result', model_pre: 'ML', language: :java)
+        api_result = api.process
+        ss = api_result.reject { |k, v| v.nil? }
+        # //.map { |key, v| { "#{key}": "```sss #{v}```" } }
+        puts ss
         
         # api = Lhj::YapiHelper.new(project_id: 694, interface_id: 70595, model_name: 'Order', model_pre: 'AA')
         # api.process

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

@@ -53,12 +53,15 @@ module Lhj
     end
 
     def model_result
+      interface_content = @h_file_array.join("\n") if @h_file_array
+      implement_content = @m_file_array.join("\n") if @m_file_array
+      mock_content = @req_mock_array.join("\n") if @req_mock_array
       {
-        interface: @h_file_array.join("\n"),
-        implement: @m_file_array.join("\n"),
+        interface: interface_content,
+        implement: implement_content,
         service: @service_content,
-        mock: @req_mock_array.join("\n")
-      }
+        mock: mock_content
+      }.reject { |k, v| v.nil? }
     end
 
     def save_to_file
@@ -109,9 +112,13 @@ module Lhj
     end
 
     def puts_mock(str)
-      puts str.green
-      @req_mock_array ||= []
-      @req_mock_array << str
+      case language
+      when :oc
+        puts str.green
+        @req_mock_array ||= []
+        @req_mock_array << str
+      when :java
+      end
     end
 
     def sub_folder_name
@@ -349,23 +356,23 @@ module Lhj
       default = m[:default]
       case type
       when 'integer'
-        puts_h "int #{key};//#{des} #{default}"
+        puts_h "    int #{key};//#{des} #{default}"
       when 'string'
-        puts_h "String #{key};//#{des} #{default}"
+        puts_h "    String #{key};//#{des} #{default}"
       when 'number'
-        puts_h "double #{key};//#{des} #{default}"
+        puts_h "    double #{key};//#{des} #{default}"
       when 'float'
-        puts_h "double #{key};//#{des} #{default}"
+        puts_h "    double #{key};//#{des} #{default}"
       when 'double'
-        puts_h "double #{key};//#{des} #{default}"
+        puts_h "    double #{key};//#{des} #{default}"
       when 'boolean'
-        puts_h "boolean #{key};//#{des} #{default}"
+        puts_h "    boolean #{key};//#{des} #{default}"
       when 'object'
-        puts_h "#{type_name} #{key};//#{des} #{default}"
+        puts_h "    #{type_name} #{key};//#{des} #{default}"
       when 'array'
-        puts_h "#{type_name}[] #{key};//#{des} #{default}"
+        puts_h "    #{type_name}[] #{key};//#{des} #{default}"
       else
-        puts_h "String #{key};//#{des} #{default}"
+        puts_h "    String #{key};//#{des} #{default}"
       end
     end
 
@@ -381,8 +388,13 @@ module Lhj
       req_model = { name: param_model_name, properties: properties }
 
       models = [req_model]
-      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
       models
     end
 

data/lib/lhj/version.rb

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

metadata

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