lhj-tools 0.1.91 → 0.1.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff9380c967d2d9a660c0bc2985aa7593c56fdaed4178c1b6fc82f79aafa383e
-  data.tar.gz: 9e6c8e22f31276d5811595f35392183bc6e61f064f1c298f529f23a7d356d622
+  metadata.gz: e913a3b6a37362f81e34bae34ca1ccb2b03c830cf825ecc3af3d76482b34de3a
+  data.tar.gz: a294ea2f480cf906f80180ea3dfc351097c69f5a2f25725c858f0380b13f52a3
 SHA512:
-  metadata.gz: e9f5d70b9483a20908898da0142cccb579cf3034ac18d53ff251e9b48fc632b1a5bbdbe6b4e341be52ba13fe9329018028b21e288239aff4569f790710823818
-  data.tar.gz: 4a108b85e0434399ef97ecd13c77535a499f67695edf38de2b26a8ccb1fdb741c33a9ced7f22a326fcb557c6a5806af90d06e7aa5b640598002fdc9703453f71
+  metadata.gz: b4785975e8288571beccccee257c98f12d6ea88803c328c7df625d0bf0499ae2d7c6832d999553e39db9f82bbfe00238f732af749c1e1889af0ac53f58846517
+  data.tar.gz: 43834bc4842e447c6badab7de4ae9bb1854213be4041d0a2d38c240faad13bb4ae50c504b68538beb39afea1e2674e5cc81f94917964420c71b8e8dcee2386f6

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

@@ -7,7 +7,7 @@ module Lhj
       self.summary = '更新yapi请求cookie'
       self.description = '更新 ~/.lhj/yapi.yml 文件配置'
 
-      def request_cookie(url)
+      def request_cookie(url, qr_code_key)
         options = Selenium::WebDriver::Chrome::Options.new(args: %w[start-maximized])
         driver = Selenium::WebDriver.for(:chrome, capabilities: options)
         driver.get url
@@ -31,25 +31,22 @@ module Lhj
             res[:token] = cookie[:value] if cookie[:name] == '_yapi_token'
           end
           if need_notify
-            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)
-            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)
+            upload_file = File.join(Lhj::Config.instance.home_dir, qr_code_key)
+            driver.save_screenshot(upload_file)
+            callback_param = generate_callback_param("#{Lhj::OSS::Helper.instance.url_path}/#{qr_code_key}")
+            Lhj::OSS::Helper.instance.upload_file_callback(qr_code_key, upload_file, callback_param)
             need_notify = false
           end
           return res if res.values.count == 3
         end
       end
 
-      def gen_http_body(url)
+      def generate_callback_param(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,
+          url: 'https://oapi.dingtalk.com/robot/send',
           query: { access_token: 'fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807' },
           body: body,
           content_type: 'application/json'
@@ -57,7 +54,7 @@ module Lhj
       end
 
       def robot_url
-        'https://oapi.dingtalk.com/robot/send'
+        'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
       end
 
       def notify_robot(url)
@@ -94,17 +91,26 @@ module Lhj
       end
 
       def handle
+        time = Time.now
+        qr_code_name = "#{time.strftime('%Y%m%d%H%M%S')}.png"
         config = load_config(config_file) if File.exist?(config_file)
         # base_url: 'http://yapi.xx.com'
-        cookie = request_cookie(config['base_url'])
+        cookie = request_cookie(config['base_url'], qr_code_name)
         if cookie && config
           config['__wpkreporterwid_'] = cookie[:wid]
           config['_yapi_uid'] = cookie[:uid].to_i
           config['_yapi_token'] = cookie[:token]
+          # save user info
           save_user({ '__wpkreporterwid_' => cookie[:wid], '_yapi_uid' => cookie[:uid].to_i, '_yapi_token' => cookie[:token] })
+          # save config
           file_to_save = File.open(config_file, 'w+')
           YAML.dump(config, file_to_save)
           file_to_save.close
+          # remove temp file
+          qr_code_image = File.join(Lhj::Config.instance.home_dir, qr_code_name)
+          FileUtils.rm qr_code_image if File.exist?(qr_code_image)
+          # remove oss
+          Lhj::OSS::Helper.instance.delete(qr_code_name)
         end
       end
     end

data/lib/lhj/helper/dingtalk_helper.rb

@@ -29,8 +29,32 @@ module Lhj
       Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
     end
 
+    def self.post_action_card_message_robot(robot_url, title, message, btns)
+      http_body = action_card_body_message(title, message, btns, :vertical)
+      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
+      markdown_body_message(title, message)
+    end
+
+    def self.markdown_body_message(title, message)
+      {
+        'msgtype' => 'markdown',
+        'markdown' => { 'title' => title, 'text' => message }
+      }.to_json
+    end
+
+    # btns: [{'title'=>'内容不错', 'actionURL'=>'https://www.baidu.com'}]
+    def self.action_card_body_message(title, message, btns, orientation = :vertical)
+      btn_orientation = orientation == :vertical ? '1' : '0'
+      {
+        'msgtype' => 'actionCard',
+        'actionCard' => { 'title' => title,
+                          'text' => message },
+        'btnOrientation' => btn_orientation,
+        'btns' => btns
+      }.to_json
     end
 
     def self.fetch_branch

data/lib/lhj/helper/pgyer_helper.rb

@@ -100,7 +100,7 @@ module Lhj
       Actions.sh(update_cmd.join(' '), log: false, error_callback: nil)
     end
 
-    def render_with_template(template_name = 'pgyer')
+    def render_with_template(template_name)
       if @result.is_a? Hash
         temp = Lhj::ErbTemplateHelper.load(template_name)
         Lhj::ErbTemplateHelper.render(temp, @result, nil)
@@ -108,5 +108,9 @@ module Lhj
         @result
       end
     end
+
+    def app_download_url
+      "https://www.pgyer.com/#{@result['appShortcutUrl']}"
+    end
   end
 end

data/lib/lhj/tools/version.rb

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

metadata

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