feishu-rails 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b49a7ba4343fbd7ae4e4d35d00e999cbdd54a568cff97634bcbf6fdda102862
-  data.tar.gz: 2b1117e10d4c5b2cd6f6097dd3f8c66313fac00c2058cd138af6e661cc4836d7
+  metadata.gz: 6804988e9d3dcce71102da60cdf71cac5e9b1e1627835f022c082e9e0585310f
+  data.tar.gz: 9dfe63a9194bcb9c6f8bfd4f75bc5bd76d4112748c9fe792d0e7f5e9a4f4e610
 SHA512:
-  metadata.gz: 41c6b52e05e546e709f3993cec155858be0d898069dafc83e9e64c576343045e1f3cda5fcc940c685b0a3793abe5b73d75f871c4444ee6ffa4b2c1bc3df7d6cd
-  data.tar.gz: c040c72e826d829ccee8bd2cfb6773c05cc28156659abc0fd5a3a82b022b74f1637b1f7deb38f085a85993e270131c55b577481bf0cdbc2ff51a7756b633ae35
+  metadata.gz: b633d47d579b2a9f9fb3539880976fc4084bbeb6c8141f852bfd99c6886823d4b1ca851fb17bcb263d3d3d47b8dd4d96e9821edcb4287016955ab53d8ae3f303
+  data.tar.gz: 9f1819889b23fec6163fef128db9cf30640eeac0decc881f036cf9f3e44872e8193b56e9470f0cbbe0ebf36917d317d14cc19f584ede94d297bbcb8a85b6858f

data/lib/feishu/connector.rb

@@ -17,18 +17,9 @@ module Feishu
     GROUP_INFO = "https://open.feishu.cn/open-apis/chat/v4/info"
     SEND_TEXT  = "https://open.feishu.cn/open-apis/message/v4/send"
 
-    # 获取飞书 TOKEN 并缓存
-    def access_token
-      Rails.cache.fetch("feishu_token", expires_in: 30.minutes) do
-        # res = HTTP.post(AUTH_URL, json: { app_id: app_id, app_secret: app_secret })
-        res = HTTP.post(AUTH_URL, json: { app_id: Feishu.app_id, app_secret: Feishu.app_secret })
-        JSON.parse(res.body.readpartial)["tenant_access_token"]
-      end
-    end
-
     # 认证成功后，后续请求都携带 TOKEN
     def request
-      HTTP.headers(Authorization: "Bearer #{access_token}")
+      HTTP.headers(Authorization: "Bearer #{feishu_token}")
     end
 
     # 根据手机号码查询用户的 USER_ID
@@ -107,6 +98,10 @@ module Feishu
 
     # 向特定群组发生消息
     def send_alert(chat_id, title, content, image_path)
+      # 获取上传文件路径
+      uploaded_image_path = upload_image(image_path)
+
+      # 初始化数据结构
       data = {
         chat_id:  chat_id,
         msg_type: "post",
@@ -139,6 +134,9 @@ module Feishu
           }
         }
       }
+      # 如果图片不存在则移除相关属性
+      data[:content][:post][:zh_cn][:content].pop if uploaded_image_path.blank?
+
       # 请求后端
       res = request.post(SEND_TEXT, json: data)
 
@@ -149,4 +147,14 @@ module Feishu
       Rails.logger("群发消息期间捕捉到异常：#{e}")
     end
   end
+
+  private
+    def feishu_token
+      # 获取飞书 TOKEN 并缓存
+      Rails.cache.fetch("feishu_token", expires_in: 30.minutes) do
+        # res = HTTP.post(AUTH_URL, json: { app_id: app_id, app_secret: app_secret })
+        res = HTTP.post(AUTH_URL, json: { app_id: Feishu.app_id, app_secret: Feishu.app_secret })
+        JSON.parse(res.body.readpartial)["tenant_access_token"]
+      end
+    end
 end

data/lib/feishu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Feishu
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feishu-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - WENWU.YAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails