add type to third notifiers

Author: jicheng1014

README.md

@@ -17,6 +17,7 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 
 
 # 最近更新
+- (2.0.14) 第三方通知加入了 app 类型, 第三方报错将忽略异常继续运行
 - (2.0.13) 修正了企业微信通知的bug
 - (2.0.12) 修复因为钉钉机器人不再支持base64导致无法显示二维码，另外开始支持钉钉加签方式的鉴权， 参数为 --dingtalk_secret
 - (2.0.11) 兼容了 ruby 3.0

fir-cli.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
+  - (2.0.14) 第三方通知加入了 app 类型, 第三方报错将不再直接报出异常
   - (2.0.13) 修复了无法跳过企业微信通知逻辑的bug
   - (2.0.12) 修复因为钉钉机器人不再支持base64导致无法显示二维码，另外开始支持钉钉加签方式的鉴权， 参数为 --dingtalk_secret
   - (2.0.11) 兼容了 ruby 3.0 版本, 增加了环境变量FEISHU_TIMEOUT，可以多给飞书一些超时时间

lib/fir/util/dingtalk_helper.rb

@@ -20,7 +20,7 @@ def send_msg
     return if options[:dingtalk_access_token].blank?
 
     api_domain = @app_info[:api_url]
-    title = "#{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]})"
+    title = "#{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]}) #{@app_info[:type]}"
     payload = {
       "msgtype": 'markdown',
       "markdown": {

lib/fir/util/feishu_helper.rb

@@ -10,7 +10,8 @@ def initialize(app_info, options, qrcode_path, download_url)
     @feishu_access_token = @options[:feishu_access_token]
     @qrcode_path = qrcode_path
     @download_url = download_url
-    @title = "#{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]})"
+
+    @title = "#{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]}) #{@app_info[:type]}"
   end
 
   def send_msg

lib/fir/util/publish.rb

@@ -2,13 +2,15 @@
 
 # require 'byebug'
 
+require_relative './third_notifier_module'
 require_relative './qiniu_uploader'
 require_relative './ali_uploader'
 require_relative '../util/feishu_helper'
 require_relative '../util/dingtalk_helper'
 
 module FIR
   module Publish
+    include FIR::ThirdNotifierModule
     def publish(*args, options)
       initialize_publish_options(args, options)
       logger_info_publishing_message
@@ -30,9 +32,7 @@ def publish(*args, options)
 
       qrcode_path = build_qrcode download_url
 
-      dingtalk_notifier(download_url, qrcode_path)
-      feishu_notifier(download_url, qrcode_path)
-      wxwork_notifier(download_url)
+      notify_to_thirds(download_url, qrcode_path)
 
       upload_mapping_file_with_publish
 
@@ -195,34 +195,6 @@ def force_pin_release(release_id)
            api_token: @token
     end
 
-    def dingtalk_notifier(download_url, qrcode_path)
-      DingtalkHelper.new(@app_info, options, qrcode_path, download_url).send_msg
-    end
-
-    def feishu_notifier(download_url, qrcode_path)
-      FeishuHelper.new(@app_info, options, qrcode_path, download_url).send_msg
-    end
-
-    def wxwork_notifier(download_url)
-      return if options[:wxwork_webhook].blank? && options[:wxwork_access_token].blank?
-
-      webhook_url = options[:wxwork_webhook]
-      webhook_url ||= "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=#{options[:wxwork_access_token]}"
-
-      title = "#{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]})"
-      payload = {
-        "msgtype": 'news',
-        "news": {
-          "articles": [{
-            "title": "#{title} uploaded",
-            "description": "#{title} uploaded at #{Time.now}\nurl: #{download_url}\n#{options[:wxwork_custom_message]}\n",
-            "url": download_url,
-            "picurl": options[:wxwork_pic_url]
-          }]
-        }
-      }
-      DefaultRest.post(webhook_url, payload)
-    end
 
     def initialize_publish_options(args, options)
       @options = options

lib/fir/util/third_notifier_module.rb

@@ -0,0 +1,40 @@
+module FIR
+  module ThirdNotifierModule
+    def notify_to_thirds(download_url, qrcode_path)
+      dingtalk_notifier(download_url, qrcode_path)
+      feishu_notifier(download_url, qrcode_path)
+      wxwork_notifier(download_url)
+    rescue => e
+      logger.warn "third notifiers error #{e.message}"
+    end
+
+    def dingtalk_notifier(download_url, qrcode_path)
+      DingtalkHelper.new(@app_info, options, qrcode_path, download_url).send_msg
+    end
+
+    def feishu_notifier(download_url, qrcode_path)
+      FeishuHelper.new(@app_info, options, qrcode_path, download_url).send_msg
+    end
+
+    def wxwork_notifier(download_url)
+      return if options[:wxwork_webhook].blank? && options[:wxwork_access_token].blank?
+
+      webhook_url = options[:wxwork_webhook]
+      webhook_url ||= "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=#{options[:wxwork_access_token]}"
+
+      title = "#{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]}) #{@app_info[:type]}"
+      payload = {
+        "msgtype": 'news',
+        "news": {
+          "articles": [{
+            "title": "#{title} uploaded",
+            "description": "#{title} uploaded at #{Time.now}\nurl: #{download_url}\n#{options[:wxwork_custom_message]}\n",
+            "url": download_url,
+            "picurl": options[:wxwork_pic_url]
+          }]
+        }
+      }
+      DefaultRest.post(webhook_url, payload)
+    end
+  end
+end

lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = '2.0.13'
+  VERSION = '2.0.14'
 end

test/test_helper.rb

@@ -1,9 +1,6 @@
 # encoding: utf-8
 
 # CodeClimate::TestReporter.start
-require 'codeclimate-test-reporter'
-require 'simplecov'
-SimpleCov.start
 
 
 require 'minitest/autorun'
@@ -80,7 +77,7 @@ def default_distribution_name
 
 # 跑完测试之后再发结果到Codelimate
 # 测试CODECLIMATE_REPO_TOKEN: c454b9a54151b3ed3e18949279aec49d6a25bf507706815f99a919f1c01679ed
-Minitest.after_run do  
+Minitest.after_run do
   COVERAGE_FILE = "coverage/.resultset.json".freeze
   if (repo_token = ENV["CODECLIMATE_REPO_TOKEN"]) && !repo_token.empty?
     if File.exist?(COVERAGE_FILE)