lhj-tools 0.1.87 → 0.1.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a12084e737e12b3a0e10a428407cc1e83dfd29a6831709b40bbc330ce2c183
-  data.tar.gz: fb31614816bf573b70f2fd03fbdab218f8ce215b512e5d63acaf29001a357893
+  metadata.gz: 636e87e8f38a49680d589ea0899a05f644debe88926734c8f7a2b0bb707e02a1
+  data.tar.gz: 170851d7bc279275151e72f6098d992aa728f5738f76075ade79b657e7a9ef03
 SHA512:
-  metadata.gz: 344983fb4d1b4f9d60bf94f85279a17db67a1e12ee5dd5d20c1efd000d5f37ec472aec6d4a93dbd786d7cb84a033d83a96f02cc612894cf3142f5fa3169c7088
-  data.tar.gz: 4936c0a4f26d79e879737447ec9c7ca408925b007624a1eb7e78187021ad7069d2b1d9f7dc65130202609356e87a7f4975c41f7826ebea20cb2a6da77c3909b7
+  metadata.gz: 1af599df60ad3ad1a91059d55d13971e52de3f081ed365c5fa66ea3a8f7e438a16cf7dd6ffd7724a29c8166dbc338a00e430e13eb53eb6213639a638034121f7
+  data.tar.gz: ea2ae987669a7a1a1a925c94e53e96db6bf40c553ade5970fcef9f74fba577840a627a76c2d0ae9ed01248612234c455a8e6d063b8f1391f9041279c11aa5902

data/lib/lhj/command/yapi/yapi_init.rb

@@ -7,50 +7,22 @@ module Lhj
       self.summary = '更新yapi请求cookie'
       self.description = '更新 ~/.lhj/yapi.yml 文件配置'
 
-      # @return [String]
-      def interface_url
-        url = []
-        url << 'h'
-        url << 't'
-        url << 't'
-        url << 'p'
-        url << ':'
-        url << '/'
-        url << '/'
-        url << 'y'
-        url << 'a'
-        url << 'p'
-        url << 'i'
-        url << '.'
-        url << 'm'
-        url << 'i'
-        url << 'g'
-        url << 'u'
-        url << 'a'
-        url << 't'
-        url << 'e'
-        url << 'c'
-        url << 'h'
-        url << '.'
-        url << 'c'
-        url << 'o'
-        url << 'm'
-        url.join('')
-      end
-
-      def request_cookie
+      def request_cookie(url)
         options = Selenium::WebDriver::Chrome::Options.new(args: %w[start-maximized])
         driver = Selenium::WebDriver.for(:chrome, capabilities: options)
-        driver.get interface_url
+        driver.get url
         manage = driver.manage
+        window = manage.window
         manage.timeouts.implicit_wait = 10
         manage.timeouts.page_load = 10
         # 1.登录
         all_btn = driver.all(tag_name: 'button')
         login_btn = all_btn.find { |ele| ele.text =~ /钉钉登录/ } if all_btn
         login_btn&.click
+        window.resize_to(200, 500)
         # 2.获取cookies
-        wait = Selenium::WebDriver::Wait.new(timeout: 60)
+        wait = Selenium::WebDriver::Wait.new(timeout: 90)
+        need_notify = true
         wait.until do
           res = {}
           manage.all_cookies.each do |cookie|
@@ -58,21 +30,64 @@ module Lhj
             res[:uid] = cookie[:value] if cookie[:name] == '_yapi_uid'
             res[:token] = cookie[:value] if cookie[:name] == '_yapi_token'
           end
+          if need_notify
+            file_name = 'qrcode.png'
+            file = File.join(Lhj::Config.instance.home_dir, file_name)
+            driver.save_screenshot(file)
+            Lhj::OSS::Helper.instance.upload(file_name, file)
+            notify_robot(driver.current_url)
+            need_notify = false
+          end
           return res if res.values.count == 3
         end
       end
 
+      def robot_url
+        'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
+      end
+
+      def notify_robot(url)
+        template = Lhj::ErbTemplateHelper.load('yapi_qr_code_notify')
+        output = Lhj::ErbTemplateHelper.render(template, { url: url }, '-')
+        Lhj::Dingtalk.post_message_robot(robot_url, 'yapi qrcode', output)
+      end
+
       def config_file
         File.join(Lhj::Config.instance.home_dir, 'yapi.yml')
       end
 
+      def user_info_file
+        File.join(Lhj::Config.instance.home_dir, 'yapi_user.yml')
+      end
+
+      def load_config(file)
+        YAML.load_file(file)
+      end
+
+      def save_user(result)
+        user_info = load_config(user_info_file) if File.exist?(user_info_file)
+        user_info ||= []
+        current = user_info.find { |k| k['_yapi_uid'].eql?(result['_yapi_uid']) }
+        if current
+          current['__wpkreporterwid_'] = result['__wpkreporterwid_']
+          current['_yapi_token'] = result['_yapi_token']
+        else
+          user_info << result
+        end
+        file_to_save = File.open(user_info_file, 'w+')
+        YAML.dump(user_info, file_to_save)
+        file_to_save.close
+      end
+
       def handle
-        cookie = request_cookie
-        config = YAML.load_file(config_file) if File.exist?(config_file)
+        config = load_config(config_file) if File.exist?(config_file)
+        # base_url: 'http://yapi.xx.com'
+        cookie = request_cookie(config['base_url'])
         if cookie && config
           config['__wpkreporterwid_'] = cookie[:wid]
           config['_yapi_uid'] = cookie[:uid].to_i
           config['_yapi_token'] = cookie[:token]
+          save_user({ '__wpkreporterwid_' => cookie[:wid], '_yapi_uid' => cookie[:uid].to_i, '_yapi_token' => cookie[:token] })
           file_to_save = File.open(config_file, 'w+')
           YAML.dump(config, file_to_save)
           file_to_save.close

data/lib/lhj/command/yapi.rb

@@ -51,8 +51,20 @@ module Lhj
       end
 
       def process(config_file)
-        load_config(config_file)
-        res_body = get_interface_api_model
+        config = load_config(config_file)
+        process_config(config)
+        res_body = get_interface_api_model(config)
+        unless res_body['errcode'].to_i.zero?
+          if File.exist?(user_yml_file)
+            user_infos = load_config(user_yml_file)
+            user_infos.each do |c|
+              res_body = get_interface_api_model(c)
+              config = c
+              break if res_body['errcode'].to_i.zero?
+            end
+            save_config(config) if res_body['errcode'].to_i.zero?
+          end
+        end
         unless res_body['errcode'].to_i.zero?
           puts '请执行 lhj yapi-init 初始化配置'.red
           return
@@ -61,7 +73,7 @@ module Lhj
 
         # get project info
         project_id = res_body['data']['project_id']
-        project_info = get_project_info(project_id)
+        project_info = get_project_info(project_id, config)
         # 1.print request result
         res_models = print_res_body_model(res_body)
         # 2.print request json body
@@ -176,11 +188,15 @@ module Lhj
         File.join(Lhj::Config.instance.home_dir, 'yapi.yml')
       end
 
+      def user_yml_file
+        File.join(Lhj::Config.instance.home_dir, 'yapi_user.yml')
+      end
+
       def load_config(file)
-        config = YAML.load_file(file)
-        config.each do |k, v|
-          @http_headers << "#{k}=#{v}" if k.eql?('__wpkreporterwid_') || k.eql?('_yapi_token') || k.eql?('_yapi_uid')
-        end
+        YAML.load_file(file)
+      end
+
+      def process_config(config)
         @config_base_url = config['base_url']
         @config_id = config['id']
         @config_model_pre = config['model_pre']
@@ -191,6 +207,16 @@ module Lhj
         @config_property_mapper = config['property_mapper']
       end
 
+      def save_config(config)
+        yml = load_config(yml_file)
+        yml['__wpkreporterwid_'] = config['__wpkreporterwid_']
+        yml['_yapi_uid'] = config['_yapi_uid']
+        yml['_yapi_token'] = config['_yapi_token']
+        file_to_save = File.open(yml_file, 'w+')
+        YAML.dump(yml, file_to_save)
+        file_to_save.close
+      end
+
       def api_id
         @id || @config_id.to_s
       end
@@ -219,10 +245,14 @@ module Lhj
         @config_property_mapper || { 'id' => 'gid' }
       end
 
-      def get_interface_api_model
+      def get_interface_api_model(config)
         uri = URI.parse(interface_url_str)
         req = Net::HTTP::Get.new(uri)
-        req['Cookie'] = @http_headers.join('; ')
+        header_arr = []
+        config.each do |k, v|
+          header_arr << "#{k}=#{v}" if k.eql?('__wpkreporterwid_') || k.eql?('_yapi_token') || k.eql?('_yapi_uid')
+        end
+        req['Cookie'] = header_arr.join('; ')
         res = Net::HTTP.start(uri.hostname, uri.port) do |http|
           http.request(req)
         end
@@ -232,11 +262,15 @@ module Lhj
         res_json
       end
 
-      def get_project_info(project_id)
+      def get_project_info(project_id, config)
         url = project_url_str(project_id)
         uri = URI.parse(url)
         req = Net::HTTP::Get.new(uri)
-        req['Cookie'] = @http_headers.join('; ')
+        header_arr = []
+        config.each do |k, v|
+          header_arr << "#{k}=#{v}" if k.eql?('__wpkreporterwid_') || k.eql?('_yapi_token') || k.eql?('_yapi_uid')
+        end
+        req['Cookie'] = header_arr.join('; ')
         res = Net::HTTP.start(uri.hostname, uri.port) do |http|
           http.request(req)
         end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.87"
+    VERSION = "0.1.89"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.87
+  version: 0.1.89
 platform: ruby
 authors:
 - lihaijian