lhj-tools 0.1.95 → 0.1.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55b9242149da893982e764986c573ac7fb0d44b22500e36e980e9b83fa195054
-  data.tar.gz: b8345388b62ab38bd0f689269233703bce75eaec0e57b7683f5c1cb776c33e1d
+  metadata.gz: 3141a25ce2e0c2b88124dd148417f856317982f1f4da81b9bd43c90ee858b820
+  data.tar.gz: 70f7ffc027cbcb03cb1c4b613a2e132cd46e57dbd2833d36ff88aacc395ed636
 SHA512:
-  metadata.gz: 9b8fa34d2a6941d63ceea2ef5449b98ce483ab6aa114d7f4fd63ae2ccbba54d32a19055fe0b5f461ad2ed821a2501329893b339519d6b00a3cba2d933255604b
-  data.tar.gz: e69802cb604ec9cfed945bd02fc8a88c640441d9fbcf71a13ab667085828fe561f5733c3a44e08178f8109f0826c973d6dfad85dd4da5db76d681f7e15a27b26
+  metadata.gz: ab33b726b8306c881f3ecbced49a801d1d217cb7a340d88b759e82a4d283f2c18f0db89584296edb8e00ca9abb3c8d212ea82d1ee3cf423b56637b507fa9ba14
+  data.tar.gz: b172f1fbe29b4475b777a30dd646d0e01bf83015406cfeb22a161010edb2f62a299cee0db36a7a3a2ee9e4ab40b3583f2a5317da749ef0d1b96bc826b837ff4b

data/lib/lhj/command/yapi.rb

@@ -148,10 +148,10 @@ module Lhj
       end
 
       def push_to_git
-        Actions.sh('git checkout master')
-        Actions.sh('git add .')
-        Actions.sh("git commit -m 'generate yapi code'")
-        Actions.sh('git push')
+        Actions.sh('git checkout master', log: false)
+        Actions.sh('git add .', log: false)
+        Actions.sh("git commit -m 'generate yapi code'", log: false)
+        Actions.sh('git push', log: false)
       end
 
       def notify_robot(upload_info, interface_info, project_info)
@@ -169,7 +169,10 @@ module Lhj
                                       })
         template = Lhj::ErbTemplateHelper.load('oc_code_notify')
         output = Lhj::ErbTemplateHelper.render(template, temp_vars, '-')
-        Lhj::Dingtalk.post_message_robot(robot_url, 'yapi generate', output)
+        btn_array = [
+          { 'title' => '查看Yapi', 'actionURL' => api_url }
+        ]
+        Lhj::Dingtalk.post_card_message_robot(robot_url, 'yapi generate', output, btn_array)
       end
 
       def interface_url_str

data/lib/lhj/helper/dingtalk_helper.rb

@@ -7,39 +7,39 @@ module Lhj
 
     def self.post_message(title, message)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
-      http_body = http_body_message(title, message)
+      post_message_robot(robot_url, title, message)
+    end
+
+    def self.post_message_robot(robot_url, title, message)
+      http_body = markdown_body_message(title, message)
       http_post(robot_url, http_body)
-      post_branch_message(http_body)
     end
 
     def self.post_card_message(title, message, btns)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
-      http_body = action_card_body_message(title, message, btns, :vertical)
-      http_post(robot_url, http_body)
+      post_card_message_robot(robot_url, title, message, btns)
     end
 
-    def self.post_branch_message(http_body)
-      branch_name = fetch_branch
-      branch_map = Lhj::DingTalkConfig.git_branch
-      branch_robot_key = branch_map[branch_name] if branch_map && branch_name
-      branch_robot_url = Lhj::DingTalkConfig.config[branch_robot_key] if branch_robot_key
-      http_post(branch_robot_url, http_body) if branch_robot_url
+    def self.post_card_message_robot(robot_url, title, message, btns)
+      http_body = action_card_body_message(title, message, btns, :vertical)
+      http_post(robot_url, http_body)
     end
 
-    def self.http_post(robot_url, http_body)
-      Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
+    def self.post_single_card_message(title, message, single_title, single_url)
+      robot_url = Lhj::DingTalkConfig.dingtalk_robot
+      post_single_card_message_robot(robot_url, title, message, single_title, single_url)
     end
 
-    def self.post_message_robot(robot_url, title, message)
-      http_body = http_body_message(title, message)
-      Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
+    def self.post_single_card_message_robot(robot_url, title, message, single_title, single_url)
+      http_body = single_action_card_body_message(title, message, single_title, single_url)
+      http_post(robot_url, http_body)
     end
 
-    def self.post_action_card_message_robot(robot_url, title, message, btns)
-      http_body = action_card_body_message(title, message, btns, :vertical)
+    def self.http_post(robot_url, http_body)
       Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
     end
 
+    # deprecation warnings used: markdown_body_message method
     def self.http_body_message(title, message)
       markdown_body_message(title, message)
     end
@@ -63,9 +63,23 @@ module Lhj
       }.to_json
     end
 
-    def self.fetch_branch
-      name = Lhj::Actions.git_branch || ''
-      name.split('/').last
+    def self.single_action_card_body_message(title, message, single_title, single_url)
+      {
+        'msgtype' => 'actionCard',
+        'actionCard' => { 'title' => title,
+                          'text' => message,
+                          'btnOrientation' => '0',
+                          'singleTitle' => single_title,
+                          'singleURL' => single_url }
+      }.to_json
+    end
+
+    # links: [{'title'=>'this is ...', 'messageURL'=>'https://www.dingtalk.com', 'picURL'=>'https://xx.png'}]
+    def self.feed_card_body_message(links)
+      {
+        'msgtype' => 'feedCard',
+        'feedCard' => links
+      }.to_json
     end
   end
 end

data/lib/lhj/helper/pgyer_helper.rb

@@ -110,7 +110,7 @@ module Lhj
     end
 
     def app_download_url
-      "https://www.pgyer.com/#{@result['data']['appShortcutUrl']}"
+      "https://www.pgyer.com/#{@result['data']['appKey']}"
     end
   end
 end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.95"
+    VERSION = "0.1.97"
   end
 end

metadata

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