lhj-tools 0.1.76 → 0.1.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3573173cffbb9453ae8e205034e2c28e9d7f4bde8600574cb42787f671716f91
-  data.tar.gz: ec7333d4b1078c07846ea533fade87a44ae18cfcbeab5311a078671af14d9904
+  metadata.gz: d531d2b9b34e70a9e6405ae37eb2b21e984aa76c82574bb8ce064e5860405e86
+  data.tar.gz: af844a9316314bc4b05a98d5be81fcc759459abe7dc58bf3ffb88887ece5d044
 SHA512:
-  metadata.gz: 387b4adaaad5aa277799f85de8a2de6d898adaafee296c33e406b4c6818ef2a14651a4c191eadff85839880357a7a83b6b95cbb7c9827d38d392782303743209
-  data.tar.gz: 0aae4e701adb0b50446bad22b80bb23cc4eb7b55a920514d0f53b7f9a618de781b95fd61b7669d245a88337f3ba18298e72740e0a1b81c924686ef651c663f96
+  metadata.gz: df4aebc030070433aa08035fd34eb02737a0255b22c75d3c035a7d510752aad7bd29202833b017dd793b7565689eacae7d376d12b78ee214af9ef00556542fbe
+  data.tar.gz: 55ddb46781f6fb6f723312bdc18702416be3b824ce3e47411fd9b017f921cb11e9111229695a691eb2aa166b6c862f1bcab7be7d9c38f4c70004be4443345c69

data/lib/lhj/command/code/code_template.rb

@@ -25,8 +25,8 @@ module Lhj
       end
 
       def render_template(template_name)
-        temp_str = File.read(File.join(File.dirname(__FILE__), 'template', template_name))
-        Lhj::ErbFormatter::Service.new(self).render_template(temp_str)
+        temp = File.read(File.join(File.dirname(__FILE__), 'template', template_name))
+        Lhj::ErbTemplateHelper.render(temp, nil, nil)
       end
 
     end

data/lib/lhj/command/yapi.rb

@@ -134,11 +134,14 @@ module Lhj
         i_url = "#{project_info['data']['basepath']}#{interface_info['data']['path']}"
         username = interface_info['data']['username']
         title = interface_info['data']['title']
+        p_id = project_info['data']['_id']
+        api_url = api_original_url(p_id)
         temp_vars = upload_info.merge({
                                         api_id: api_id,
                                         title: title,
                                         username: username,
-                                        interface_url: i_url
+                                        interface_url: i_url,
+                                        api_url: api_url
                                       })
         template = Lhj::ErbTemplateHelper.load('oc_code_notify')
         output = Lhj::ErbTemplateHelper.render(template, temp_vars, '-')
@@ -153,6 +156,10 @@ module Lhj
         "#{@config_base_url}/#{API_PROJECT_URL}#{project_id}"
       end
 
+      def api_original_url(project_id)
+        "#{@config_base_url}/project/#{project_id}/interface/api/#{api_id}"
+      end
+
       def yml_file
         File.join(Lhj::Config.instance.home_dir, 'yapi.yml')
       end
@@ -169,6 +176,7 @@ module Lhj
         @config_model_name = config['model_name']
         @config_robot_url = config['dingtalk']
         @type_trans = config['type_trans']
+        @config_property_mapper = config['property_mapper']
       end
 
       def api_id
@@ -195,6 +203,10 @@ module Lhj
         @config_robot_url || 'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
       end
 
+      def property_mapper
+        @config_property_mapper || { 'id' => 'gid' }
+      end
+
       def get_interface_api_model
         uri = URI.parse(interface_url_str)
         req = Net::HTTP::Get.new(uri)
@@ -358,6 +370,15 @@ module Lhj
             puts_m "  return @{#{str}};"
             puts_m '}'
           end
+          properties = model[:properties].filter { |p| property_mapper.keys.include?(p[:key]) }.map do |p|
+            "@\"#{property_mapper[p[:key]]}\": @\"#{p[:key]}\""
+          end
+          property_mapper_str = properties.join(', ') if properties.count.positive?
+          if property_mapper_str&.length&.positive?
+            puts_m '+ (NSDictionary<NSString *, id> *)modelCustomPropertyMapper {'
+            puts_m "  return @{#{property_mapper_str}};"
+            puts_m '}'
+          end
           puts_m "@end\n"
           puts "\n\n"
         end
@@ -365,6 +386,7 @@ module Lhj
 
       def print_model(m)
         key = m[:key]
+        key = property_mapper[key] if property_mapper.keys.include?(key)
         type_name = m[:type_name]
         type = m[:type]
         des = m[:description] || ''

data/lib/lhj/tools/version.rb

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

metadata

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