lhj-tools 0.2.32 → 0.2.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e4b1ca63b9edadde731a0fba99ad2815029e3a65fca292d80d5ded572f0cca
-  data.tar.gz: 01606d47b8191a85c0cd44b9ec15fa069fa0936da3287325abb72ebf90370ac6
+  metadata.gz: 3cc00706a73b9e787e9d9336da8f7c8e5e787ff6e6192dff2383e65792561ec0
+  data.tar.gz: 83c616ccc6b192910102979f6c091d9e48b36938588391b963a659362dd0604a
 SHA512:
-  metadata.gz: c11804e3e40eb39886babf9347106e959d0bf1366f4f89ab0c62174b844fd7e38656f954c658402944a01e110e14506a9cda195952a6e61e144e313ed78f0038
-  data.tar.gz: aff83c9066ee3975ad45d7ccfa29db7f5cc7bfbe09f8481dd07c5d9d477d67ba2b4e965919935c6f6457e20e9b02af1dfa03637b6318ffc4f501164b1e7442c5
+  metadata.gz: e1062fd7c95362b9c0cac73359276d929fe49b30643522f8fb11f4ef8f311fcc505974d934f703bacf29a16d29213906d80a97d96bacad99a467d9ead2c98943
+  data.tar.gz: 158f1213427ce173a39537f0b8187c7ad3de2992d4b7bdcf643e46a1d0ab04e478ae0aae25c2b0603e49d328522eaa19ef45ef4303e4ccc0e9592a51d57a7276

data/lib/lhj/command/init.rb

@@ -13,7 +13,8 @@ module Lhj
       self.description = '使用工具前先执行`lhj init --url=http://xxx`'
 
       self.arguments = [
-        CLAide::Argument.new('url', true)
+        CLAide::Argument.new('url', false),
+        CLAide::Argument.new('key', false)
       ]
 
       def self.options
@@ -22,16 +23,10 @@ module Lhj
         ]
       end
 
-      def validate!
-        super
-        unless @url
-          path = File.join(target_folder, 'config_file.yml')
-          help! '配置url必须输入' unless File.exist?(path)
-        end
-      end
-
       def initialize(argv)
         @url = argv.option('url')
+        @key = argv.option('key')
+        @url = Lhj::CipherHelper.strict_decode64_encode(@key) if @key
         super
       end
 

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

@@ -46,22 +46,16 @@ 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
-        #
-        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
+        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: 70595, model_name: 'Order', model_pre: 'AA')
         # api.process

data/lib/lhj/helper/cipher_helper.rb

@@ -0,0 +1,56 @@
+require 'openssl'
+require 'base64'
+
+module Lhj
+  class CipherHelper
+    CIPHER_KEY = '1234567890'.freeze
+    CIPHERIV = '456'.freeze
+
+    def self.key
+      key = [CIPHER_KEY].pack('H*')
+      key << ("\x00" * (32 - key.length))
+      key
+    end
+
+    def self.iv
+      iv = [CIPHERIV].pack('H*')
+      iv << ("\x00" * (16 - iv.length))
+      iv
+    end
+
+    def self.strict_encode64_encode(str)
+      encode_str = Base64.strict_encode64(str)
+      encode(encode_str)
+    end
+
+    def self.encode64_encode(str)
+      encode_str = Base64.encode64(str)
+      encode(encode_str)
+    end
+
+    def self.strict_decode64_encode(str)
+      decode_str = decode(str)
+      Base64.strict_decode64(decode_str)
+    end
+
+    def self.decode64_encode(str)
+      decode_str = decode(str)
+      Base64.decode64(decode_str)
+    end
+
+    def self.encode(data)
+      cipher = OpenSSL::Cipher.new('AES-256-CBC').encrypt
+      cipher.key = key
+      cipher.iv = iv
+      encrypted = cipher.update(data) + cipher.final
+      Base64.strict_encode64(encrypted)
+    end
+
+    def self.decode(str)
+      decipher = OpenSSL::Cipher.new('AES-256-CBC').decrypt
+      decipher.key = key
+      decipher.iv = iv
+      decipher.update(Base64.strict_decode64(str)) + decipher.final
+    end
+  end
+end

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

@@ -118,6 +118,8 @@ module Lhj
         @req_mock_array ||= []
         @req_mock_array << str
       when :java
+      when :swift
+      when :dart
       end
     end
 
@@ -176,6 +178,10 @@ module Lhj
         print_models_impl(models)
       when :java
         print_models_for_java(models)
+      when :swift
+        print_models_for_swift(models)
+      when :dart
+        print_models_for_dart(models)
       end
       puts "\n<===============打印返回数据模型-End=====================>\n".green
       models
@@ -196,6 +202,10 @@ module Lhj
         print_models_impl(models)
       when :java
         print_models_for_java(models)
+      when :swift
+        print_models_for_swift(models)
+      when :dart
+        print_models_for_dart(models)
       end
       puts "\n<===============打印请求模型-End=====================>\n".green
       models
@@ -252,7 +262,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] = 'NSString'
+              c_model[:type_name] = 'String'
             else
               c_model[:type_name] = o['name']
               handle_model(o, type, &block)
@@ -293,10 +303,109 @@ module Lhj
       end
     end
 
+    def print_models_for_swift(models)
+      models.each do |model|
+        model_name = model[:name] || ''
+        model_properties = model[:properties]
+        puts_h "class #{model_name}: NSObject {"
+        model_properties.each do |m|
+          print_model_for_swift(m)
+        end
+        puts_h "}\n\n\n"
+      end
+    end
+
+    def print_models_for_dart(models)
+      models.each do |model|
+        model_name = model[:name] || ''
+        model_properties = model[:properties]
+        puts_h "class #{model_name} {"
+        model_properties.each do |m|
+          print_model_for_dart(m)
+        end
+        # init method
+        puts_h "\n"
+        i_content = model_properties.map { |p| "this.#{p[:key]}" }.join(', ')
+        puts_h "    #{model_name}({#{i_content}});"
+        puts_h "\n"
+        # json to model
+        puts_h "    #{model_name}.fromJson(Map<String, dynamic> json) {"
+        puts_h json_to_model_dart(model_properties)
+        puts_h '    }'
+        # model to json
+        puts_h "\n"
+        puts_h '    Map<String, dynamic> toJson() {'
+        puts_h '        final Map<String, dynamic> data = <String, dynamic>{};'
+        puts_h model_to_json_dart(model_properties)
+        puts_h '        return data;'
+        puts_h '    }'
+        puts_h "}\n\n\n"
+      end
+    end
+
+    def json_to_model_dart(properties)
+      p_s = properties.map do |p|
+        case p[:type]
+        when 'object'
+          "        #{p[:key]} = json['#{p[:key]}'] != null ? #{p[:type_name]}.fromJson(json['#{p[:key]}']) : null;"
+        when 'array'
+          if p[:type_name].eql?('String')
+            "        #{p[:key]} = json['#{p[:key]}'].cast<String>();"
+          else
+            json_to_model_array_dart(p)
+          end
+        else
+          "        #{p[:key]} = json['#{p[:key]}'];"
+        end
+      end
+      p_s.join("\n")
+    end
+
+    def json_to_model_array_dart(p)
+      array = []
+      array << "        if (json['#{p[:key]}'] != null) {"
+      array << "            #{p[:key]} = <#{p[:type_name]}>[];"
+      array << "            json['#{p[:key]}'].forEach((v) {"
+      array << "                #{p[:key]}!.add(#{p[:type_name]}.fromJson(v));"
+      array << '            });'
+      array << '        }'
+      array.join("\n")
+    end
+
+    def model_to_json_dart(properties)
+      p_s = properties.map do |p|
+        case p[:type]
+        when 'object'
+          model_to_model_obj_dart(p)
+        when 'array'
+          model_to_model_array_dart(p)
+        else
+          "        data['#{p[:key]}'] = #{p[:key]};"
+        end
+      end
+      p_s.join("\n")
+    end
+
+    def model_to_model_obj_dart(p)
+      array = []
+      array << "        if (#{p[:key]} != null) {"
+      array << "            data['#{p[:key]}'] = #{p[:key]}!.toJson();"
+      array << '        }'
+      array.join("\n")
+    end
+
+    def model_to_model_array_dart(p)
+      array = []
+      array << "        if (#{p[:key]} != null) {"
+      array << "            data['#{p[:key]}'] = #{p[:key]}!.map((v) => v.toJson()).toList();"
+      array << '        }'
+      array.join("\n")
+    end
+
     def print_models_impl(models)
       models.each do |model|
         puts_m "@implementation #{model[:name]}"
-        str = model[:properties].filter { |p| p[:type].eql?('array') && !p[:type_name].eql?('NSString') }.map { |p| "@\"#{p[:key]}\": #{p[:type_name]}.class" }.join(', ')
+        str = model[:properties].filter { |p| p[:type].eql?('array') && !p[:type_name].eql?('String') }.map { |p| "@\"#{p[:key]}\": #{p[:type_name]}.class" }.join(', ')
         if str&.length&.positive?
           puts_m '+(NSDictionary *)modelContainerPropertyGenericClass {'
           puts_m "  return @{#{str}};"
@@ -376,6 +485,65 @@ module Lhj
       end
     end
 
+    def print_model_for_swift(m)
+      key = m[:key]
+      type_name = m[:type_name]
+      type = m[:type]
+      des = m[:description] || ''
+      des.gsub!(/\n/, '  ')
+      default = m[:default]
+      case type
+      when 'integer'
+        puts_h "    @objc var #{key}: Int?//#{des} #{default}"
+      when 'string'
+        puts_h "    @objc var #{key}: String?//#{des} #{default}"
+      when 'number'
+        puts_h "    @objc var #{key}: Float?//#{des} #{default}"
+      when 'float'
+        puts_h "    @objc var #{key}: Float?//#{des} #{default}"
+      when 'double'
+        puts_h "    @objc var #{key}: Double?//#{des} #{default}"
+      when 'boolean'
+        puts_h "    @objc var #{key}: Bool?//#{des} #{default}"
+      when 'object'
+        puts_h "    @objc var #{key}: #{type_name}?//#{des} #{default}"
+      when 'array'
+        puts_h "    @objc var #{key}: Array<#{type_name}>?//#{des} #{default}"
+      else
+        puts_h "    @objc var #{key}: String?//#{des} #{default}"
+      end
+    end
+
+    def print_model_for_dart(m)
+      key = m[:key]
+      type_name = m[:type_name]
+      type = m[:type]
+      des = m[:description] || ''
+      des.gsub!(/\n/, '  ')
+      default = m[:default]
+      puts_h "    //#{des} #{default}"
+      case type
+      when 'integer'
+        puts_h "    int? #{key};"
+      when 'string'
+        puts_h "    String? #{key};"
+      when 'number'
+        puts_h "    int? #{key};"
+      when 'float'
+        puts_h "    float? #{key};"
+      when 'double'
+        puts_h "    double? #{key};"
+      when 'boolean'
+        puts_h "    bool? #{key};"
+      when 'object'
+        puts_h "    #{type_name}? #{key};"
+      when 'array'
+        puts_h "    List<#{type_name}>? #{key};"
+      else
+        puts_h "    String? #{key};"
+      end
+    end
+
     # @param [Object] data
     def print_req_query(data)
       return unless data && data['req_query']
@@ -394,6 +562,10 @@ module Lhj
         print_models_impl(models)
       when :java
         print_models_for_java(models)
+      when :swift
+        print_models_for_swift(models)
+      when :dart
+        print_models_for_dart(models)
       end
       models
     end
@@ -437,6 +609,8 @@ module Lhj
         yapi_temp_result = Lhj::ErbTemplateHelper.render(yapi_temp, yapi_vars, '-')
         puts_s(yapi_temp_result)
       when :java
+      when :swift
+      when :dart
       end
 
     end

data/lib/lhj/lhj.rb

@@ -7,6 +7,7 @@ module Lhj
   require 'lhj/env'
   require 'lhj/ui/ui'
   require 'lhj/config'
+  require 'lhj/helper/cipher_helper'
   require 'lhj/helper/jenkins_config'
   require 'lhj/helper/apple/apple_jwt_config'
   require 'lhj/helper/apple/apple_connect_api'

data/lib/lhj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.32
+  version: 0.2.34
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -386,6 +386,7 @@ files:
 - lib/lhj/helper/apple/apple_jwt_config.rb
 - lib/lhj/helper/bugly_helper.rb
 - lib/lhj/helper/chat_gpt_config.rb
+- lib/lhj/helper/cipher_helper.rb
 - lib/lhj/helper/dingtalk_config.rb
 - lib/lhj/helper/dingtalk_helper.rb
 - lib/lhj/helper/erb_template_helper.rb