lhj-tools 0.2.32 → 0.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e4b1ca63b9edadde731a0fba99ad2815029e3a65fca292d80d5ded572f0cca
-  data.tar.gz: 01606d47b8191a85c0cd44b9ec15fa069fa0936da3287325abb72ebf90370ac6
+  metadata.gz: ff6929383a9eb5b439ba528f359328c1794dea01bbe1716ba5a5561c30d70f22
+  data.tar.gz: f6be4caa44459d4fc44bd0d2b11eef4601ef53df196250f6b20b59dd240be3bb
 SHA512:
-  metadata.gz: c11804e3e40eb39886babf9347106e959d0bf1366f4f89ab0c62174b844fd7e38656f954c658402944a01e110e14506a9cda195952a6e61e144e313ed78f0038
-  data.tar.gz: aff83c9066ee3975ad45d7ccfa29db7f5cc7bfbe09f8481dd07c5d9d477d67ba2b4e965919935c6f6457e20e9b02af1dfa03637b6318ffc4f501164b1e7442c5
+  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/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/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.33'
 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.33
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-29 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