lhj-tools 0.1.89 → 0.1.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 636e87e8f38a49680d589ea0899a05f644debe88926734c8f7a2b0bb707e02a1
-  data.tar.gz: 170851d7bc279275151e72f6098d992aa728f5738f76075ade79b657e7a9ef03
+  metadata.gz: 3ff9380c967d2d9a660c0bc2985aa7593c56fdaed4178c1b6fc82f79aafa383e
+  data.tar.gz: 9e6c8e22f31276d5811595f35392183bc6e61f064f1c298f529f23a7d356d622
 SHA512:
-  metadata.gz: 1af599df60ad3ad1a91059d55d13971e52de3f081ed365c5fa66ea3a8f7e438a16cf7dd6ffd7724a29c8166dbc338a00e430e13eb53eb6213639a638034121f7
-  data.tar.gz: ea2ae987669a7a1a1a925c94e53e96db6bf40c553ade5970fcef9f74fba577840a627a76c2d0ae9ed01248612234c455a8e6d063b8f1391f9041279c11aa5902
+  metadata.gz: e9f5d70b9483a20908898da0142cccb579cf3034ac18d53ff251e9b48fc632b1a5bbdbe6b4e341be52ba13fe9329018028b21e288239aff4569f790710823818
+  data.tar.gz: 4a108b85e0434399ef97ecd13c77535a499f67695edf38de2b26a8ccb1fdb741c33a9ced7f22a326fcb557c6a5806af90d06e7aa5b640598002fdc9703453f71

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

@@ -21,7 +21,7 @@ module Lhj
         login_btn&.click
         window.resize_to(200, 500)
         # 2.获取cookies
-        wait = Selenium::WebDriver::Wait.new(timeout: 90)
+        wait = Selenium::WebDriver::Wait.new(timeout: 120)
         need_notify = true
         wait.until do
           res = {}
@@ -31,24 +31,38 @@ module Lhj
             res[:token] = cookie[:value] if cookie[:name] == '_yapi_token'
           end
           if need_notify
-            file_name = 'qrcode.png'
+            time = Time.now
+            file_name = "#{time.strftime('%Y%m%d%H%M%S')}.png"
+            # 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)
+            callback_param = gen_http_body("#{Lhj::OSS::Helper.instance.url_path}/#{file_name}")
+            Lhj::OSS::Helper.instance.upload_file_callback(file_name, file, callback_param)
             need_notify = false
           end
           return res if res.values.count == 3
         end
       end
 
+      def gen_http_body(url)
+        template = Lhj::ErbTemplateHelper.load('yapi_qr_code_notify')
+        output = Lhj::ErbTemplateHelper.render(template, { url: url }, nil)
+        body = Lhj::Dingtalk.http_body_message('yapi qrcode', output)
+        {
+          url: robot_url,
+          query: { access_token: 'fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807' },
+          body: body,
+          content_type: 'application/json'
+        }
+      end
+
       def robot_url
-        'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
+        'https://oapi.dingtalk.com/robot/send'
       end
 
       def notify_robot(url)
         template = Lhj::ErbTemplateHelper.load('yapi_qr_code_notify')
-        output = Lhj::ErbTemplateHelper.render(template, { url: url }, '-')
+        output = Lhj::ErbTemplateHelper.render(template, { url: url }, nil)
         Lhj::Dingtalk.post_message_robot(robot_url, 'yapi qrcode', output)
       end
 

data/lib/lhj/helper/dingtalk_helper.rb

@@ -7,7 +7,7 @@ module Lhj
 
     def self.post_message(title, message)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
-      http_body = { 'msgtype' => 'markdown', 'markdown' => { 'title' => title, 'text' => message } }.to_json
+      http_body = http_body_message(title, message)
       http_post(robot_url, http_body)
       post_branch_message(http_body)
     end
@@ -25,10 +25,14 @@ module Lhj
     end
 
     def self.post_message_robot(robot_url, title, message)
-      http_body = { 'msgtype' => 'markdown', 'markdown' => { 'title' => title, 'text' => message } }.to_json
+      http_body = http_body_message(title, message)
       Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
     end
 
+    def self.http_body_message(title, message)
+      { 'msgtype' => 'markdown', 'markdown' => { 'title' => title, 'text' => message } }.to_json
+    end
+
     def self.fetch_branch
       name = Lhj::Actions.git_branch || ''
       name.split('/').last

data/lib/lhj/helper/oss_helper.rb

@@ -19,6 +19,16 @@ module Lhj
         @bucket.put_object(key, :file => file)
       end
 
+      def upload_file_callback(key, file, callback_param = {})
+        callback = Aliyun::OSS::Callback.new(callback_param)
+        @bucket.put_object(key, { file: file, callback: callback })
+      end
+
+      def put_object(key, opts = {}, &block)
+        args = opts.dup
+        @bucket.put_object(key, args, &block)
+      end
+
       def down_load(key, file, &block)
         @bucket.get_object(key, :file => file, &block)
       end

data/lib/lhj/tools/version.rb

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

metadata

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