lhj-tools 0.2.31 → 0.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 076d5ec66856ced7568622e7e19e173d6d7f08dd6d51de147719aca07a78948a
-  data.tar.gz: d9a323338b67946d2c507964aa7de067b23ae25a9ed95b4b66335cc8dafa8a4b
+  metadata.gz: ff6929383a9eb5b439ba528f359328c1794dea01bbe1716ba5a5561c30d70f22
+  data.tar.gz: f6be4caa44459d4fc44bd0d2b11eef4601ef53df196250f6b20b59dd240be3bb
 SHA512:
-  metadata.gz: f78f99f701be41cef12335157d335a4173362b76c232cdd2f5200799e71ddb4e3ceae6ad6d3a8e022e6852b6a9ee72fe7c519a02cf2d12bcb774da8384b9557a
-  data.tar.gz: af1b07e7bf8f7f059f9044e78514155d5ba8916ac801a3f0d9dd3baaacbc70187b202a00ed053ea9a41790d6da6eaee2ea4378da6eddc9c1bb3dd3e569d39da7
+  metadata.gz: b27ba2d5508724e1b6c3325492cff864cf1243dea0a13d2abf325a0cd77fa8b9fbbdf690b8f1765625fe5ae8e708f62bc1e14e4df8b6e682d25cfc5c68b3df25
+  data.tar.gz: ab0e21f4c76d6bdc9c1c1bcdf1699b4b098044631259a943dd18b963a9210df26518fc767b93e9cd62a2682111ff72b902a72586cd220ac94d4b50e456f299f5

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/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

@@ -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/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.31'
+  VERSION = '0.2.33'
 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.33
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-05 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