feishu-rails 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6b9dc17b25ed71b79c2e5c2160c3073a60229ec72fcb57886afd78670f40dce
-  data.tar.gz: 589b5a49e22547cb7a1707af6abdda452c4c37b526f26a3be7929719ed62f0ee
+  metadata.gz: 7dc4e1b6b4f87a681cf692808792450bdf9bb47fc81cfcefe34161e481c6f8db
+  data.tar.gz: 0e3a7e30aa7c294e1b61d3419e0d04c41c091c8982124bdfbadedc14e5504c08
 SHA512:
-  metadata.gz: '068363fc3fc91c331e63d4dc98c455b9c13254b55f1ebb7b6f12f709b738f5b1d25b3bdd72d35a3347b25f61ad229ddfe154f946877a9af727aa63722c2e3829'
-  data.tar.gz: 1c4707530b6173a37bb5e9fe98d93026c7b9398c46a4db971b1ba1817bfb12ab4236b43ea1a3e20b345dde24ba54f5b31fb58d1facf339ee24cadfb511b6ea6d
+  metadata.gz: cc71e1a0b20353a715308e50167f9e3424260ca35904beb9aad2f457ec82e15131b0c762edd3afef96dd44181b93e88e1ed5783e94262ff8ec182608dfd5a41f
+  data.tar.gz: 72af82dd959521f7abc12761d5f68383c3da8616bcc7ef480f1ead2f5aa9946943dedbe11e002b52bd320636fc0d096ac8a3c37e1ef7d1acd5dc957d5067fe05

data/README.md

@@ -1,28 +1,55 @@
-# Feishu
-Short description and motivation.
+# feishu-Rails
+
+对接飞书机器人，实现告警推送
 
 ## Usage
-How to use my plugin.
+
+- include Feishu::Connector 到模块或者类对象；
+- 主要实现的方法：[:user_id, :send_text, :group_members, :request, :send_alert, :access_token, :chat_id, :upload_image, :send_message, :group_list]
+- 群内推送 send_alert(chat_id, title, content, image_path)
+- 上传图片到飞书 upload_image(path) ，建议使用图片绝对路径
 
 ## Installation
+
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "feishu"
+gem "feishu-rails"
 ```
 
 And then execute:
+
 ```bash
 $ bundle
 ```
 
 Or install it yourself as:
+
 ```bash
-$ gem install feishu
+$ gem install feishu-rails
+```
+
+add feishu_rails.rb in config/initializers
+
+```ruby
+Feishu.config do |f|
+  f.app_id      = "xxx"
+  f.app_secret  = "yyy"
+  f.encrypt_key = "zzz"
+end
+```
+
+推送群组告警消息：
+
+```ruby
+include Feishu::Connector
+
+Feishu::Connector.send_alert("oc_xxx", "title", "content", "/home/xxx/Codes/xxx.png")
+
 ```
 
 ## Contributing
-Contribution directions go here.
 
 ## License
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/setup"
 
 require "bundler/gem_tasks"

data/lib/feishu/connector.rb

@@ -1,19 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
 module Feishu
-  class << self
+  extend ActiveSupport::Concern
+
+  module Connector
     # 定义常用的 URL
-    AUTH_URL    = "https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal/"
-    USER_INFO   = "https://open.feishu.cn/open-apis/contact/v1/user/batch_get"
-    GROUP_LIST  = "https://open.feishu.cn/open-apis/chat/v4/list"
-    GROUP_INFO  = "https://open.feishu.cn/open-apis/chat/v4/info"
-    SEND_TEXT   = "https://open.feishu.cn/open-apis/message/v4/send/"
-    IMAGE_URL   = "https://open.feishu.cn/open-apis/im/v1/images"
+    AUTH_URL    = "https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal"
+    USER_ID     = "https://open.feishu.cn/open-apis/user/v1/batch_get_id?mobiles="
+    CHAT_ID     = "https://open.feishu.cn/open-apis/chat/v4/list?page_size=20"
+    IMAGE_ID    = "https://open.feishu.cn/open-apis/im/v1/images"
     MESSAGE_URL = "https://open.feishu.cn/open-apis/im/v1/messages"
 
+    GROUP_LIST = "https://open.feishu.cn/open-apis/im/v1/chats"
+    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: 2.hours) do
-        res = HTTP.post(AUTH_URL, json: { app_id: Config.app_id, app_secret: Config.app_secret })
-        # res = HTTP.post(AUTH_URL, json: { app_id: Config.app_id, app_secret: Config.app_secret })
+      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
@@ -23,52 +31,62 @@ module Feishu
       HTTP.headers(Authorization: "Bearer #{access_token}")
     end
 
-    def batch_user_info(open_ids)
-      res   = request.get(USER_INFO, params: { open_ids: open_ids })
-      users = JSON.parse(res.body.readpartial)
-
-      users["data"]
-    end
-
-    # 获取机器人所在的群列表
-    def group_list(page_size = 200, page = nil)
+    # 根据手机号码查询用户的 USER_ID
+    def user_id(mobile)
+      url = "#{USER_ID}#{mobile}"
       # 请求后端
-      res = request.get(GROUP_LIST, params: { page_size: page_size, page_token: page })
+      res = request.get(url)
       # 序列化
-      group_content = JSON.parse(res.body.readpartial)
+      ret = JSON.parse(res.body.readpartial)
 
-      group_content["data"]
+      # 返回数据
+      ret["data"]["mobile_users"].try(:[], mobile).try(:[], 0).try(:[], "user_id")
     end
 
-    # 获取群信息
-    def group_info(chat_id)
+    # 获取群组的 chat_id
+    def chat_id(name)
       # 请求后端
-      res = request.get(GROUP_INFO, params: { chat_id: chat_id })
+      res = request.get(CHAT_ID)
       # 序列化
-      group_users_content = JSON.parse(res.body.readpartial)
+      ret = JSON.parse(res.body.readpartial)
 
-      group_users_content["data"]["members"]
+      # 返回数据
+      ret["data"]["groups"].select { |i| i["name"] == name }.try(:[], 0).try(:[], "chat_id")
     end
 
-    #  获取群成员信息
-    # def member_list(chat_id)
-    #   res = request.get("https://open.feishu.cn/open-apis/chat/v4/members", :params => {:chat_id=> chat_id})
-    #   group_users_content = JSON.parse(res.body.readpartial)
-
-    #   member_ids = group_users_content["data"]
-    # end
-
+    # 上传图片到飞书后台
     def upload_image(image_path)
       # 读取图片
       data = HTTP::FormData::File.new image_path
 
       # 请求后端
-      res = request.post(IMAGE_URL, form: { image_type: "message", image: data })
+      res = request.post(IMAGE_ID, form: { image_type: "message", image: data })
       ret = JSON.parse res.body.readpartial
+
       # 返回上传后的序列号
       ret["data"]["image_key"]
     end
 
+    # 获取机器人所在的群列表
+    def group_list(page_size = 20, page = nil)
+      # 请求后端
+      res = request.get(GROUP_LIST, params: { page_size: page_size, page_token: page })
+      # 序列化
+      ret = JSON.parse(res.body.readpartial)
+      # 返回数据
+      ret["data"]
+    end
+
+    # 获取群信息
+    def group_members(chat_id)
+      # 请求后端
+      res = request.get(GROUP_INFO, params: { chat_id: chat_id })
+      # 序列化
+      ret = JSON.parse(res.body.readpartial)
+      # 返回数据
+      ret["data"]["members"]
+    end
+
     # 发送文本消息
     def send_text(open_id, text)
       # 请求后端
@@ -78,47 +96,55 @@ module Feishu
     end
 
     # 使用推荐的消息接口
-    def send_message(receive_type, receive_id, msg_type, content)
+    def send_message(receive_type = "chat_id", receive_id, msg_type, content)
       # 请求后端
       res = request.post(MESSAGE_URL, params: { receive_id_type: receive_type }, json: { receive_id: receive_id, msg_type: msg_type, content: content })
       # 序列化
       JSON.parse(res.body.readpartial)
     end
 
-    # def send_alert(chat_id)
-    #   data = {
-    #     "chat_id":  chat_id,
-    #     "msg_type": "post",
-    #     "content":  {
-    #       "post": {
-    #         "zh_cn": {
-    #           "title":   title,
-    #           "content": [
-    #                        [
-    #                          {
-    #                            "tag":       "text",
-    #                            "un_escape": True,
-    #                            "text":      content
-    #                          },
-    #                          {
-    #                            "tag":     "at",
-    #                            "user_id": self.user_id
-    #
-    #                          },
-    #                        ],
-    #                        [
-    #                          {
-    #                            "tag":       "img",
-    #                            "image_key": self.image_key,
-    #                            "width":     1000,
-    #                            "height":    600
-    #                          }
-    #                        ]
-    #                      ]
-    #         }
-    #       }
-    #     }
-    #   }
-    # end
+    # 向特定群组发生消息
+    def send_alert(chat_id, title, content, image_path)
+      data = {
+        chat_id:  chat_id,
+        msg_type: "post",
+        content:  {
+          post: {
+            zh_cn: {
+              title:   title,
+              content: [
+                         [
+                           {
+                             tag:       "text",
+                             un_escape: true,
+                             text:      content
+                           },
+                           {
+                             tag:     "at",
+                             user_id: user_id("15673443571")
+
+                           },
+                         ],
+                         [
+                           {
+                             tag:       "img",
+                             image_key: upload_image(image_path),
+                             width:     1000,
+                             height:    600
+                           }
+                         ]
+                       ]
+            }
+          }
+        }
+      }
+      # 请求后端
+      res = request.post(SEND_TEXT, json: data)
+
+      # 序列化
+      JSON.parse(res.body.readpartial).to_query
+      
+      alias_method :feishu_alert, :send_alert
+    end
   end
 end

data/lib/feishu/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feishu
-  VERSION = "0.1.2"
+  VERSION = "0.1.5"
 end

data/lib/feishu-rails.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 require "feishu/version"
-require "feishu/config"
 require "feishu/connector"
 
 module Feishu
   class << self
-    def configure(&block)
-      Config.configure(&block)
+    attr_accessor :app_id, :app_secret, :encrypt_key
+
+    def config
+      yield self
     end
   end
 end

data/lib/tasks/feishu_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :feishu do
 #   # Task goes here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feishu-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - WENWU.YAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,6 @@ files:
 - README.md
 - Rakefile
 - lib/feishu-rails.rb
-- lib/feishu/config.rb
 - lib/feishu/connector.rb
 - lib/feishu/version.rb
 - lib/tasks/feishu_tasks.rake

data/lib/feishu/config.rb

@@ -1,11 +0,0 @@
-module Feishu
-  class Config
-    class << self
-      attr_accessor :app_id, :app_secret, :encrypt_key
-
-      def configure
-        yield self
-      end
-    end
-  end
-end