wechat 0.11.7 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed7c19916af2b008eeb90cbd140261806457a679ac04fd1d7cafc741b5414494
-  data.tar.gz: a16c5a69bbd32d54263cf3fc15207a0c3278384f75239c3dc94fefa3952b8d68
+  metadata.gz: f7dfe45f7c68aafa5b96a2a3178ae2108f9989bb5594b6ae35d1e7dcc358219a
+  data.tar.gz: 25a51c65de855682ec12ee332241d9acd47c8cc8c2376995c8d8f0512825e899
 SHA512:
-  metadata.gz: 76379f62522cf5eff64c0772a127a7e9ed4be8ceed0eba6710acc47f641c20404bccf039ac6383d0e61148e38171edb704b02f28c4a325dd68f79b83e9ba3dc7
-  data.tar.gz: da56c9242149a5a636975ad59bec0f1cb735b2d25ca2c06fec6125a972127f16c68dbdb2f114d208be3cc91a55cc582ea03dcce74360c67aa5a6865adde79642
+  metadata.gz: '080ada4dbb3191ed4d10d51d4cef85de0cfc469af61f636ee99b03be92e487060fa454a37ef54a8386d77d1ebede360d2819c64d59f0d1ca2a202ba199e1a31e'
+  data.tar.gz: f3482024b4e35f91924c384ca27819748341444047c135362552b460ccf15243fcd5fd1c896e0c15eb00e392aa73ce1c750854b78e6e0c52af0176482e4939cb

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## v0.12.1 (released at 28/12/2020)
+
+* Support Ruby 3.0.
+* Qcloud_token support.
+* CRUD of tencent cloud DB for miniapp
+* TCB storage API support.
+* Set default branch to *main*.
+
+## v0.11.11 (released at 09/13/2020)
+
+* FIX: fix_load_controller_wechat not support MP type, by @Msms-NJ #281
+
+## v0.11.10 (released at 09/02/2020)
+
+* ADD: Wechat::MpApi.wxa_msg_sec_check.
+
+## v0.11.9 (released at 04/29/2020)
+
+* CHG: upgrade ssl_version to 1.2 by @paicha #276
+
+## v0.11.8 (released at 03/09/2020)
+
+* ADD: Wechat::CorpApi.news_message_send
+* FIX: Wechat API Change material/get_material. reported by @0000sir #275
+
 ## v0.11.7 (released at 11/15/2019)
 
 * ADD: Wechat::MpApi.subscribe_message_send. by @paicha #271

data/README-CN.md

@@ -3,7 +3,7 @@ WeChat [![Gem Version](https://badge.fury.io/rb/wechat.svg)](https://rubygems.or
 
 [![Join the chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Eric-Guo/wechat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-WeChat gem帮助开发者方便地在Rails环境中集成[微信公众平台](https://mp.weixin.qq.com/)和[企业微信](https://qy.weixin.qq.com)，包括功能：
+WeChat gem帮助开发者方便地在Rails环境中集成[微信公众平台](https://developers.weixin.qq.com/doc/offiaccount/Getting_Started/Overview.html)、[企业微信](https://work.weixin.qq.com/api/doc)和[小程序](https://developers.weixin.qq.com/miniprogram/dev/framework/)，包括功能：
 
 - 微信公众平台/企业微信[发送消息](http://qydev.weixin.qq.com/wiki/index.php?title=%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF)API（命令行和Web环境都可以使用）
 - [接收消息](http://qydev.weixin.qq.com/wiki/index.php?title=%E6%8E%A5%E6%94%B6%E6%B6%88%E6%81%AF%E4%B8%8E%E4%BA%8B%E4%BB%B6)（必须运行Web服务器）
@@ -360,7 +360,7 @@ Wechat Public Account commands:
   wechat group_delete [GROUP_ID]                                # 删除分组
   wechat group_update [GROUP_ID, NEW_GROUP_NAME]                # 修改分组名
   wechat groups                                                 # 查询所有分组
-  wechat material [MEDIA_ID, PATH]                              # 永久媒体下载
+  wechat material_get [MEDIA_ID, PATH]                              # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                        # 永久媒体上传
   wechat material_count                                         # 获取永久素材总数
   wechat material_delete [MEDIA_ID]                             # 删除永久素材
@@ -399,6 +399,7 @@ Wechat Public Account commands:
   wechat user_group [OPEN_ID]                                   # 查询用户所在分组
   wechat user_update_remark [OPEN_ID, REMARK]                   # 设置备注名
   wechat users                                                  # 关注者列表
+  wechat wxa_msg_sec_check [CONTENT]                            # 检查一段文本是否含有违法违规内容。
   wechat wxacode_download [WXA_CODE_PIC_PATH, PATH, WIDTH]      # 下载小程序码
 ```
 

data/README.md

@@ -7,7 +7,7 @@ WeChat [![Gem Version](https://badge.fury.io/rb/wechat.svg)](https://rubygems.or
 
 [Wechat](http://www.wechat.com/) is a Chinese multi-purpose messaging, social media and mobile payment app developed by Tencent. It was first released in 2011, and by 2018 it was one of the world's largest standalone mobile apps by monthly active users, with over 1 billion monthly active users (902 million daily active users). (According to [wiki](https://en.wikipedia.org/wiki/WeChat))
 
-WeChat gem helps Rails developers integrate [WeChat Official Accounts Platform](https://mp.weixin.qq.com/) and [Wechat Enterprise](https://qy.weixin.qq.com) easily, including features:
+WeChat gem helps Rails developers integrate [WeChat Official Accounts Platform](https://developers.weixin.qq.com/doc/offiaccount/Getting_Started/Overview.html) or [Wechat mini program](https://developers.weixin.qq.com/miniprogram/dev/framework/) easily, including features:
 
 - [Sending message](http://qydev.weixin.qq.com/wiki/index.php?title=%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF) API（can be both accessed via console or rails server）
 - [Receiving message](http://qydev.weixin.qq.com/wiki/index.php?title=%E6%8E%A5%E6%94%B6%E6%B6%88%E6%81%AF%E4%B8%8E%E4%BA%8B%E4%BB%B6)（rails server is required to be running）
@@ -391,7 +391,7 @@ Wechat Public Account commands:
   wechat group_delete [GROUP_ID]                                # 删除分组
   wechat group_update [GROUP_ID, NEW_GROUP_NAME]                # 修改分组名
   wechat groups                                                 # 查询所有分组
-  wechat material [MEDIA_ID, PATH]                              # 永久媒体下载
+  wechat material_get [MEDIA_ID, PATH]                              # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                        # 永久媒体上传
   wechat material_count                                         # 获取永久素材总数
   wechat material_delete [MEDIA_ID]                             # 删除永久素材
@@ -430,6 +430,7 @@ Wechat Public Account commands:
   wechat user_group [OPEN_ID]                                   # 查询用户所在分组
   wechat user_update_remark [OPEN_ID, REMARK]                   # 设置备注名
   wechat users                                                  # 关注者列表
+  wechat wxa_msg_sec_check [CONTENT]                            # 检查一段文本是否含有违法违规内容。
   wechat wxacode_download [WXA_CODE_PIC_PATH, PATH, WIDTH]      # 下载小程序码
   wechat clear_quota                                            # 接口调用次数清零
 ```

data/bin/wechat

@@ -225,6 +225,11 @@ class App < Thor
       puts 'WXA Code File downloaded'
     end
 
+    desc 'wxa_msg_sec_check [CONTENT]', '检查一段文本是否含有违法违规内容。'
+    def wxa_msg_sec_check(content)
+      puts wechat_api.wxa_msg_sec_check(content)
+    end
+
     desc 'media_uploadnews [MPNEWS_YAML_PATH]', '上传图文消息素材'
     def media_uploadnews(mpnews_yaml_path)
       mpnew = YAML.load(File.read(mpnews_yaml_path))
@@ -389,9 +394,9 @@ class App < Thor
     puts wechat_api.media_uploadimg(image_path)
   end
 
-  desc 'material [MEDIA_ID, PATH]', '永久媒体下载'
-  def material(media_id, path)
-    tmp_file = wechat_api.material(media_id)
+  desc 'material_get [MEDIA_ID, PATH]', '永久媒体下载'
+  def material_get(media_id, path)
+    tmp_file = wechat_api.get_material(media_id)
     FileUtils.mv(tmp_file.path, path)
     puts 'File downloaded'
   end

data/lib/action_controller/wechat_responder.rb

@@ -38,25 +38,28 @@ module ActionController
       self.trusted_domain_fullname = opts[:trusted_domain_fullname] || cfg.trusted_domain_fullname
       self.oauth2_cookie_duration = opts[:oauth2_cookie_duration] || cfg.oauth2_cookie_duration.to_i.seconds
       self.timeout = opts[:timeout] || cfg.timeout
-      self.skip_verify_ssl = if opts.key?(:skip_verify_ssl)
-                               opts[:skip_verify_ssl]
-                             else
-                               cfg.skip_verify_ssl
-                             end
+      self.qcloud_token_lifespan = opts[:qcloud_token_lifespan] || cfg.qcloud_token_lifespan
+      self.skip_verify_ssl = opts.key?(:skip_verify_ssl) ? opts[:skip_verify_ssl] : cfg.skip_verify_ssl
 
       return Wechat.api if account == :default && opts.empty?
 
       access_token = opts[:access_token] || cfg.access_token
       jsapi_ticket = opts[:jsapi_ticket] || cfg.jsapi_ticket
+      qcloud_token = opts[:qcloud_token] || cfg.qcloud_token
 
-      if corpid.present?
-        corpsecret = opts[:corpsecret] || cfg.corpsecret
-        Wechat::CorpApi.new(corpid, corpsecret, access_token, \
-                            agentid, timeout, skip_verify_ssl, jsapi_ticket)
+      api_type = opts[:type] || cfg.type
+      secret = corpid.present? ? opts[:corpsecret] || cfg.corpsecret : opts[:secret] || cfg.secret
+
+      get_wechat_api(api_type, corpid, appid, secret, access_token, agentid, timeout, skip_verify_ssl, jsapi_ticket, qcloud_token, qcloud_token_lifespan)
+    end
+
+    def get_wechat_api(api_type, corpid, appid, secret, access_token, agentid, timeout, skip_verify_ssl, jsapi_ticket, qcloud_token, qcloud_token_lifespan)
+      if api_type && api_type.to_sym == :mp
+        Wechat::MpApi.new(appid, secret, access_token, timeout, skip_verify_ssl, jsapi_ticket, qcloud_token, qcloud_token_lifespan)
+      elsif corpid.present?
+        Wechat::CorpApi.new(corpid, secret, access_token, agentid, timeout, skip_verify_ssl, jsapi_ticket)
       else
-        secret = opts[:secret] || cfg.secret
-        Wechat::Api.new(appid, secret, access_token, \
-                        timeout, skip_verify_ssl, jsapi_ticket)
+        Wechat::Api.new(appid, secret, access_token, timeout, skip_verify_ssl, jsapi_ticket)
       end
     end
   end

data/lib/generators/wechat/templates/app/models/wechat_config.rb

@@ -35,7 +35,7 @@ class WechatConfig < ActiveRecord::Base
       errors.add(:corpsecret, 'cannot be nil when corpid is set') if self[:corpsecret].blank?
       errors.add(:agentid, 'cannot be nil when corpid is set') if self[:agentid].blank?
     else
-      errors[:base] << 'Either appid or corpid must be set'
+      errors.add(:base, 'Either appid or corpid must be set')
     end
   end
 end

data/lib/wechat.rb

@@ -16,9 +16,12 @@ module Wechat
   autoload :ControllerApi, 'wechat/controller_api'
 
   class AccessTokenExpiredError < StandardError; end
+
   class InvalidCredentialError < StandardError; end
+
   class ResponseError < StandardError
     attr_reader :error_code
+
     def initialize(errcode, errmsg)
       @error_code = errcode
       super "#{errmsg}(#{error_code})"

data/lib/wechat/api.rb

@@ -8,6 +8,14 @@ require 'wechat/concern/common'
 
 module Wechat
   class Api < ApiBase
+    def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file)
+      super()
+      @client = HttpClient.new(Wechat::Api::API_BASE, timeout, skip_verify_ssl)
+      @access_token = Token::PublicAccessToken.new(@client, appid, secret, token_file)
+      @jsapi_ticket = Ticket::PublicJsapiTicket.new(@client, @access_token, jsapi_ticket_file)
+      @qcloud = nil
+    end
+
     include Concern::Common
 
     def template_message_send(message)

data/lib/wechat/api_base.rb

@@ -2,13 +2,14 @@
 
 module Wechat
   class ApiBase
-    attr_reader :access_token, :client, :jsapi_ticket
+    attr_reader :access_token, :client, :jsapi_ticket, :qcloud
 
     API_BASE = 'https://api.weixin.qq.com/cgi-bin/'
     MP_BASE = 'https://mp.weixin.qq.com/cgi-bin/'
-    WXA_BASE    = 'https://api.weixin.qq.com/wxa/'
+    WXA_BASE = 'https://api.weixin.qq.com/wxa/'
     OAUTH2_BASE = 'https://api.weixin.qq.com/sns/'
     DATACUBE_BASE = 'https://api.weixin.qq.com/datacube/'
+    TCB_BASE = 'https://api.weixin.qq.com/tcb/'
     QYAPI_BASE = 'https://qyapi.weixin.qq.com/cgi-bin/'
 
     def callbackip

data/lib/wechat/api_loader.rb

@@ -9,9 +9,16 @@ module Wechat
       token_file = options[:token_file] || c.access_token.presence || '/var/tmp/wechat_access_token'
       js_token_file = options[:js_token_file] || c.jsapi_ticket.presence || '/var/tmp/wechat_jsapi_ticket'
       type = options[:type] || c.type
+
       if c.appid && c.secret && token_file.present?
-        wx_class = type == 'mp' ? Wechat::MpApi : Wechat::Api
-        wx_class.new(c.appid, c.secret, token_file, c.timeout, c.skip_verify_ssl, js_token_file)
+        if type == 'mp'
+          qcloud_env = options[:qcloud_env] || c.qcloud_env
+          qcloud_token_file = options[:qcloud_token_file] || c.qcloud_token_file.presence || '/var/tmp/qcloud_access_token'
+          qcloud_token_lifespan = options[:qcloud_token_lifespan] || c.qcloud_token_lifespan
+          Wechat::MpApi.new(c.appid, c.secret, token_file, c.timeout, c.skip_verify_ssl, js_token_file, qcloud_env, qcloud_token_file, qcloud_token_lifespan)
+        else
+          Wechat::Api.new(c.appid, c.secret, token_file, c.timeout, c.skip_verify_ssl, js_token_file)
+        end
       elsif c.corpid && c.corpsecret && token_file.present?
         Wechat::CorpApi.new(c.corpid, c.corpsecret, token_file, c.agentid, c.timeout, c.skip_verify_ssl, js_token_file)
       else
@@ -46,11 +53,13 @@ module Wechat
         configs.each do |_, cfg|
           cfg[:access_token] ||= Rails.root.try(:join, 'tmp/access_token').try(:to_path)
           cfg[:jsapi_ticket] ||= Rails.root.try(:join, 'tmp/jsapi_ticket').try(:to_path)
+          cfg[:qcloud_token] ||= Rails.root.try(:join, 'tmp/qcloud_token').try(:to_path)
         end
       end
 
       configs.each do |_, cfg|
         cfg[:timeout] ||= 20
+        cfg[:qcloud_token_lifespan] ||= 7200
         cfg[:have_session_class] = class_exists?('WechatSession')
         cfg[:oauth2_cookie_duration] ||= 1.hour
       end
@@ -135,6 +144,9 @@ module Wechat
                 skip_verify_ssl: ENV['WECHAT_SKIP_VERIFY_SSL'],
                 encoding_aes_key: ENV['WECHAT_ENCODING_AES_KEY'],
                 jsapi_ticket: ENV['WECHAT_JSAPI_TICKET'],
+                qcloud_env: ENV['WECHAT_QCLOUD_ENV'],
+                qcloud_token_file: ENV['WECHAT_QCLOUD_TOKEN'],
+                qcloud_token_lifespan: ENV['WECHAT_QCLOUD_TOKEN_LIFESPAN'],
                 trusted_domain_fullname: ENV['WECHAT_TRUSTED_DOMAIN_FULLNAME'] }
       { default: value }
     end

data/lib/wechat/cipher.rb

@@ -10,7 +10,7 @@ module Wechat
       cipher.encrypt
 
       cipher.padding = 0
-      key_data = Base64.decode64(encoding_aes_key + '=')
+      key_data = Base64.decode64("#{encoding_aes_key}=")
       cipher.key = key_data
       cipher.iv = [key_data].pack('H*')
 
@@ -22,7 +22,7 @@ module Wechat
       cipher.decrypt
 
       cipher.padding = 0
-      key_data = Base64.decode64(encoding_aes_key + '=')
+      key_data = Base64.decode64("#{encoding_aes_key}=")
       cipher.key = key_data
       cipher.iv = [key_data].pack('H*')
 
@@ -41,7 +41,7 @@ module Wechat
 
     def unpack(msg)
       msg = decode_padding(msg)
-      msg_len = msg[16, 4].reverse.unpack('V')[0]
+      msg_len = msg[16, 4].reverse.unpack1('V')
       content = msg[20, msg_len]
       app_id = msg[(20 + msg_len)..-1]
 

data/lib/wechat/concern/common.rb

@@ -3,12 +3,6 @@
 module Wechat
   module Concern
     module Common
-      def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file)
-        @client = HttpClient.new(Wechat::Api::API_BASE, timeout, skip_verify_ssl)
-        @access_token = Token::PublicAccessToken.new(@client, appid, secret, token_file)
-        @jsapi_ticket = Ticket::PublicJsapiTicket.new(@client, @access_token, jsapi_ticket_file)
-      end
-
       def groups
         get 'groups/get'
       end
@@ -106,6 +100,10 @@ module Wechat
         post 'wxaapp/createwxaqrcode', JSON.generate(path: path, width: width)
       end
 
+      def wxa_msg_sec_check(content)
+        post 'msg_sec_check', JSON.generate(content: content), base: Wechat::Api::WXA_BASE
+      end
+
       def menu
         get 'menu/get'
       end
@@ -133,7 +131,13 @@ module Wechat
       end
 
       def material(media_id)
-        get 'material/get', params: { media_id: media_id }, as: :file
+        ActiveSupport::Deprecation.warn('material is deprecated. use get_material instead.')
+
+        post 'material/get_material', JSON.generate(media_id: media_id), as: :file
+      end
+
+      def get_material(media_id)
+        post 'material/get_material', JSON.generate(media_id: media_id), as: :file
       end
 
       def material_count

data/lib/wechat/concern/qcloud.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Wechat
+  module Concern
+    module Qcloud
+      def invoke_cloud_function(function_name, post_body_params)
+        post 'invokecloudfunction', JSON.generate(post_body_params), params: { env: qcloud.qcloud_env, name: function_name }, base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_migrate_import(collection_name, file_path, file_type: Wechat::Qcloud::FILE_TYPE_JSON, stop_on_error: false, conflict_mode: Wechat::Qcloud::CONFLICT_MODE_UPSERT)
+        import_params_hash = { env: qcloud.qcloud_env,
+                               collection_name: collection_name,
+                               file_path: file_path,
+                               file_type: file_type,
+                               stop_on_error: stop_on_error,
+                               conflict_mode: conflict_mode }
+        post 'databasemigrateimport', JSON.generate(import_params_hash), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_migrate_export(query, file_path, file_type: Wechat::Qcloud::FILE_TYPE_JSON)
+        export_params_hash = { env: qcloud.qcloud_env,
+                               file_path: file_path,
+                               file_type: file_type,
+                               query: query }
+        post 'databasemigrateexport', JSON.generate(export_params_hash), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_migrate_query(job_id)
+        query_info_hash = { env: qcloud.qcloud_env,
+                            job_id: job_id }
+
+        post 'databasemigratequeryinfo', JSON.generate(query_info_hash), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_update_index(collection_name, create_indexes: [], drop_indexes: [])
+        update_index_params_hash = { env: qcloud.qcloud_env,
+                                     collection_name: collection_name,
+                                     create_indexes: create_indexes,
+                                     drop_indexes: drop_indexes }
+        post 'updateindex', JSON.generate(update_index_params_hash), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_collection_add(collection_name)
+        collection_add_params_hash = { env: qcloud.qcloud_env,
+                                       collection_name: collection_name }
+        post 'databasecollectionadd', JSON.generate(collection_add_params_hash), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_collection_delete(collection_name)
+        collection_delete_params_hash = { env: qcloud.qcloud_env,
+                                          collection_name: collection_name }
+        post 'databasecollectiondelete', JSON.generate(collection_delete_params_hash), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_collections(limit: 10, offset: 0)
+        get_collections_params_hash = { env: qcloud.qcloud_env,
+                                        limit: limit,
+                                        offset: offset }
+        post 'databasecollectionget', JSON.generate(get_collections_params_hash), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_add(add_query)
+        post 'databaseadd', JSON.generate(env: qcloud.qcloud_env, query: add_query), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_delete(delete_query)
+        post 'databasedelete', JSON.generate(env: qcloud.qcloud_env, query: delete_query), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_update(update_query)
+        post 'databaseupdate', JSON.generate(env: qcloud.qcloud_env, query: update_query), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_query(query)
+        post 'databasequery', JSON.generate(env: qcloud.qcloud_env, query: query), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_aggregate(aggregate_query)
+        post 'databaseaggregate', JSON.generate(env: qcloud.qcloud_env, query: aggregate_query), base: Wechat::Api::TCB_BASE
+      end
+
+      def qdb_count(count_query)
+        post 'databasecount', JSON.generate(env: qcloud.qcloud_env, query: count_query), base: Wechat::Api::TCB_BASE
+      end
+
+      def tcb_delete_files(fileid_list)
+        post 'batchdeletefile', JSON.generate(env: qcloud.qcloud_env, fileid_list: fileid_list), base: Wechat::Api::TCB_BASE
+      end
+
+      def tcb_download_files(file_list)
+        post 'batchdownloadfile', JSON.generate(env: qcloud.qcloud_env, file_list: file_list), base: Wechat::Api::TCB_BASE
+      end
+
+      def tcb_preflight_upload_file(q_path)
+        post 'uploadfile', JSON.generate(env: qcloud.qcloud_env, path: q_path), base: Wechat::Api::TCB_BASE
+      end
+
+      def tcb_do_upload_file(q_path, upload_url, signature, x_cos_security_token, x_cos_meta_fileid, file)
+        form_file = file.is_a?(HTTP::FormData::File) ? file : HTTP::FormData::File.new(file)
+        form_data = HTTP::FormData.create({ key: q_path,
+                                            Signature: signature,
+                                            "x-cos-security-token": x_cos_security_token,
+                                            'x-cos-meta-fileid': x_cos_meta_fileid,
+                                            file: form_file })
+        client.httprb.post(upload_url, form: form_data, ssl_context: client.ssl_context)
+      end
+
+      def tcb_upload_file(q_path, file)
+        res = tcb_preflight_upload_file(q_path)
+        tcb_do_upload_file(q_path, res['url'], res['authorization'], res['token'], res['cos_file_id'], file)
+        res
+      end
+    end
+  end
+end

data/lib/wechat/controller_api.rb

@@ -5,7 +5,7 @@ module Wechat
     extend ActiveSupport::Concern
 
     module ClassMethods
-      attr_accessor :wechat_api_client, :wechat_cfg_account, :token, :appid, :corpid, :agentid, :encrypt_mode, :timeout,
+      attr_accessor :wechat_api_client, :wechat_cfg_account, :token, :appid, :corpid, :agentid, :encrypt_mode, :timeout, :qcloud_token_lifespan,
                     :skip_verify_ssl, :encoding_aes_key, :trusted_domain_fullname, :oauth2_cookie_duration
     end
 

data/lib/wechat/corp_api.rb

@@ -10,10 +10,12 @@ module Wechat
     attr_reader :agentid
 
     def initialize(appid, secret, token_file, agentid, timeout, skip_verify_ssl, jsapi_ticket_file)
+      super()
       @client = HttpClient.new(QYAPI_BASE, timeout, skip_verify_ssl)
       @access_token = Token::CorpAccessToken.new(@client, appid, secret, token_file)
       @agentid = agentid
       @jsapi_ticket = Ticket::CorpJsapiTicket.new(@client, @access_token, jsapi_ticket_file)
+      @qcloud = nil
     end
 
     def agent_list
@@ -90,7 +92,7 @@ module Wechat
     end
 
     def department_update(departmentid, name = nil, parentid = nil, order = nil)
-      post 'department/update', JSON.generate({ id: departmentid, name: name, parentid: parentid, order: order }.reject { |_k, v| v.nil? })
+      post 'department/update', JSON.generate({ id: departmentid, name: name, parentid: parentid, order: order }.compact)
     end
 
     def department(departmentid = 1)
@@ -155,7 +157,13 @@ module Wechat
     end
 
     def material(media_id)
-      get 'material/get', params: { media_id: media_id, agentid: agentid }, as: :file
+      ActiveSupport::Deprecation.warn('material is deprecated. use get_material instead.')
+
+      post 'material/get_material', JSON.generate(media_id: media_id), params: { agentid: agentid }, as: :file
+    end
+
+    def get_material(media_id)
+      post 'material/get_material', JSON.generate(media_id: media_id), params: { agentid: agentid }, as: :file
     end
 
     def material_add(type, file)
@@ -170,6 +178,14 @@ module Wechat
       post 'message/send', Message.to(userid).text(message).agent_id(agentid).to_json, content_type: :json
     end
 
+    def news_message_send(userid, title, description, link_url, pic_url)
+      post 'message/send', Message.to(userid).news([{ title: title,
+                                                      description: description,
+                                                      url: link_url,
+                                                      pic_url: pic_url }])
+                                  .agent_id(agentid).to_json, content_type: :json
+    end
+
     def custom_message_send(message)
       post 'message/send', message.is_a?(Wechat::Message) ? message.agent_id(agentid).to_json : JSON.generate(message.merge(agent_id: agentid)), content_type: :json
     end

data/lib/wechat/helpers.rb

@@ -24,7 +24,7 @@ module Wechat
                  else
                    controller.request.original_url
                  end
-      page_url = page_url.split('#').first if ios?
+      page_url = page_url.split('#').first
       js_hash = api.jsapi_ticket.signature(page_url)
 
       config_js = <<~WECHAT_CONFIG_JS
@@ -39,11 +39,5 @@ module Wechat
       WECHAT_CONFIG_JS
       javascript_tag config_js, type: 'application/javascript'
     end
-
-    private
-
-    def ios?
-      controller.request.user_agent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)
-    end
   end
 end

data/lib/wechat/http_client.rb

@@ -14,7 +14,7 @@ module Wechat
                   HTTP.timeout(:global, write: timeout, connect: timeout, read: timeout)
                 end
       @ssl_context = OpenSSL::SSL::SSLContext.new
-      @ssl_context.ssl_version = :TLSv1
+      @ssl_context.ssl_version = 'TLSv1_2'
       @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_verify_ssl
     end
 
@@ -77,12 +77,12 @@ module Wechat
     def parse_response(response, as_type)
       content_type = response.headers[:content_type]
       parse_as = {
-        %r{^application\/json} => :json,
-        %r{^image\/.*} => :file,
-        %r{^audio\/.*} => :file,
-        %r{^voice\/.*} => :file,
-        %r{^text\/html} => :xml,
-        %r{^text\/plain} => :probably_json
+        %r{^application/json} => :json,
+        %r{^image/.*} => :file,
+        %r{^audio/.*} => :file,
+        %r{^voice/.*} => :file,
+        %r{^text/html} => :xml,
+        %r{^text/plain} => :probably_json
       }.each_with_object([]) { |match, memo| memo << match[1] if content_type =~ match[0] }.first || as_type || :text
 
       # try to parse response as json, fallback to user-specified format or text if failed

data/lib/wechat/message.rb

@@ -32,6 +32,7 @@ module Wechat
 
     class ArticleBuilder
       attr_reader :items
+
       delegate :count, to: :items
       def initialize
         @items = []
@@ -40,14 +41,14 @@ module Wechat
 
     class NewsArticleBuilder < ArticleBuilder
       def item(title: 'title', description: nil, pic_url: nil, url: nil)
-        items << { Title: title, Description: description, PicUrl: pic_url, Url: url }.reject { |_k, v| v.nil? }
+        items << { Title: title, Description: description, PicUrl: pic_url, Url: url }.compact
       end
     end
 
     class MpNewsArticleBuilder < ArticleBuilder
       def item(thumb_media_id:, title:, content:, author: nil, content_source_url: nil, digest: nil, show_cover_pic: '0')
         items << { Thumb_Media_ID: thumb_media_id, Author: author, Title: title, ContentSourceUrl: content_source_url,
-                   Content: content, Digest: digest, ShowCoverPic: show_cover_pic }.reject { |_k, v| v.nil? }
+                   Content: content, Digest: digest, ShowCoverPic: show_cover_pic }.compact
       end
     end
 
@@ -168,7 +169,7 @@ module Wechat
         items = article.items
       else
         items = collection.collect do |item|
-          camelize_hash_keys(item.symbolize_keys.slice(:title, :description, :pic_url, :url).reject { |_k, v| v.nil? })
+          camelize_hash_keys(item.symbolize_keys.slice(:title, :description, :pic_url, :url).compact)
         end
       end
 
@@ -183,7 +184,7 @@ module Wechat
         items = article.items
       else
         items = collection.collect do |item|
-          camelize_hash_keys(item.symbolize_keys.slice(:thumb_media_id, :title, :content, :author, :content_source_url, :digest, :show_cover_pic).reject { |_k, v| v.nil? })
+          camelize_hash_keys(item.symbolize_keys.slice(:thumb_media_id, :title, :content, :author, :content_source_url, :digest, :show_cover_pic).compact)
         end
       end
 

data/lib/wechat/mp_api.rb

@@ -4,11 +4,22 @@ require 'wechat/api_base'
 require 'wechat/http_client'
 require 'wechat/token/public_access_token'
 require 'wechat/ticket/public_jsapi_ticket'
+require 'wechat/qcloud/token'
 require 'wechat/concern/common'
+require 'wechat/concern/qcloud'
 
 module Wechat
   class MpApi < ApiBase
+    def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file, qcloud_env, qcloud_token_file, qcloud_token_lifespan)
+      super()
+      @client = HttpClient.new(Wechat::Api::API_BASE, timeout, skip_verify_ssl)
+      @access_token = Token::PublicAccessToken.new(@client, appid, secret, token_file)
+      @jsapi_ticket = Ticket::PublicJsapiTicket.new(@client, @access_token, jsapi_ticket_file)
+      @qcloud = Qcloud::Token.new(@client, @access_token, qcloud_env, qcloud_token_file, qcloud_token_lifespan)
+    end
+
     include Concern::Common
+    include Concern::Qcloud
 
     def template_message_send(message)
       post 'message/wxopen/template/send', message.to_json, content_type: :json

data/lib/wechat/qcloud/token.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Wechat
+  module Qcloud
+    FILE_TYPE_JSON = 1
+    FILE_TYPE_CSV = 2
+    CONFLICT_MODE_INSERT = 1
+    CONFLICT_MODE_UPSERT = 2
+
+    class Token
+      attr_reader :client, :access_token, :qcloud_env, :qcloud_token_file, :qcloud_token_lifespan, :qcloud_token, :qcloud_token_expired_time
+
+      def initialize(client, access_token, qcloud_env, qcloud_token_file, lifespan)
+        @client = client
+        @access_token = access_token
+        @qcloud_env = qcloud_env
+        @qcloud_token_file = qcloud_token_file
+        @qcloud_token_lifespan = lifespan
+        @random_generator = Random.new
+      end
+
+      def token(tries = 2)
+        # Possible two worker running, one worker refresh ticket, other unaware, so must read every time
+        read_qcloud_token_from_store
+        refresh if remain_life_seconds < @random_generator.rand(30..3 * 60)
+        qcloud_token
+      rescue AccessTokenExpiredError
+        access_token.refresh
+        retry unless (tries -= 1).zero?
+      end
+
+      def refresh
+        data = client.post('getqcloudtoken', JSON.generate(lifespan: qcloud_token_lifespan), base: ::Wechat::ApiBase::TCB_BASE, params: { access_token: access_token.token })
+        write_qcloud_token_to_store(data)
+        read_qcloud_token_from_store
+      end
+
+      protected
+
+      def read_qcloud_token_from_store
+        td = read_qcloud_token
+        @qcloud_token_expired_time = td.fetch('qcloud_token_expired_time').to_i
+        @qcloud_token = td.fetch('token') # return qcloud_token same time
+      rescue JSON::ParserError, Errno::ENOENT, KeyError, TypeError
+        refresh
+      end
+
+      def write_qcloud_token_to_store(qcloud_token_hash)
+        qcloud_token_hash['qcloud_token_expired_time'] = qcloud_token_hash.delete('expired_time')
+        write_qcloud_token(qcloud_token_hash)
+      end
+
+      def read_qcloud_token
+        JSON.parse(File.read(qcloud_token_file))
+      end
+
+      def write_qcloud_token(qcloud_token_hash)
+        File.write(qcloud_token_file, qcloud_token_hash.to_json)
+      end
+
+      def remain_life_seconds
+        qcloud_token_expired_time - Time.now.to_i
+      end
+    end
+  end
+end

data/lib/wechat/responder.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'English'
+require 'rexml/document'
 require 'wechat/signature'
 
 module Wechat
@@ -145,9 +146,10 @@ module Wechat
             next
           end
 
-          if condition.is_a? Regexp
+          case condition
+          when Regexp
             memo[:scoped] ||= [responder] + $LAST_MATCH_INFO.captures if value =~ condition
-          elsif value == condition
+          when value
             memo[:scoped] ||= [responder, value]
           end
         end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.12.1
 platform: ruby
 authors:
 - Skinnyworm
 - Eric Guo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEQDCCAqigAwIBAgIBATANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBplcmlj
-  Lmd1b2N6L0RDPWdtYWlsL0RDPWNvbTAeFw0xOTA4MzAwODIzMTVaFw0yMDA4Mjkw
-  ODIzMTVaMCUxIzAhBgNVBAMMGmVyaWMuZ3VvY3ovREM9Z21haWwvREM9Y29tMIIB
-  ojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA2ZlFyUImo53jN4+1Kk6cyGts
-  LcT2x+i3G4mvZeqrZFCyhgWHJ04oAsfKBLCLRmspRsUuDQ3GQ8P5tH9oTduu55qy
-  ohflwuuffJHwsJYJEQ4hykJSCQ8gd4qj8WrhAmNo15ujq6mjGXPRBtZltR142kKE
-  o1tUYtc4Fr3oIAh65m62ZC2kJ5GATLYQ+U3JiiHWga8iJ8KSHbrzhM4N3ppaeYxD
-  wk6Lwk2OyppO9Iiv9Ad2BEFFd2s7mvYtaMGPWYK2fYTUuq6yKupg3CppX3ttq+bN
-  Ejx6dXn4RwYmATfc/Iv4aVU8lZS9HABqmProgkmi5vE2AAW1rQihm2ACm9VGlX+B
-  J2uIIWFJC56+TmkyqcBM87ztRxFlNLJe1G2S2TZ/qhAyWfoSEDA9eW6OUsb6qvnz
-  PHFPo/Vgq9BEoYMItUsEoJHdmLBjzhiccQx2XWAhZrBREpH20jIC/ereVGRpAeVf
-  kYdFgW84K+lL9XTt9QJNM08YM/mFcpaGq4/2YbbLAgMBAAGjezB5MAkGA1UdEwQC
-  MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQdvlZDewUSWN/OWf9bTuDHHc5r+TAf
+  Lmd1b2N6L0RDPWdtYWlsL0RDPWNvbTAeFw0yMDA5MDIwNDUzMjFaFw0yMTA5MDIw
+  NDUzMjFaMCUxIzAhBgNVBAMMGmVyaWMuZ3VvY3ovREM9Z21haWwvREM9Y29tMIIB
+  ojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwSfWr5RlUBlv9OuNgmxjPwhU
+  7eoT/m7K5h0PzUaue+dtno4WqjodoCPHF6r9hh8Ys0h1VAPu3sobH2gNaL18M0CY
+  bmq+ik6LgH5tX2E6c2BmhMuURt2y1YvIwvx0dDOlEXll9J8ZVqGyo3Rm9AIblA3/
+  w/V5VJGCj3XY6iipNkHHDlSWSYeD2mNr0wJW8EAUFFcyRddpotxR9Es8JwUpXdj8
+  Bc5a/OWxKvzqLVlu76zYRYuZ41+3gWNxYF9OPnp55sNtsboGh5LJSdXZOs5+gMw9
+  gEW/KsP4GSMlqBT7SQEO5EH3qjp3aatHaMT8Fq9h3AnNESQMubMWtlPqEYyrYkli
+  wr8A8SGiX3rCkNG0cc4zVsagtXm4csbSeaIjLV57LA2sKngI4/kw55UYlloAtGPh
+  qNEqsPLbN/RkyS1zQjf14mQBpBt3SdxnT7YDSPIYiAPTtLuThcy3Flgh6cDX1RH7
+  FQPZJzQ7pSb/3Edj+VBaYhpo+y4ySLxx9DOLfm6lAgMBAAGjezB5MAkGA1UdEwQC
+  MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRWBfZurpq8AmvpfBq7eSA0ivhotDAf
   BgNVHREEGDAWgRRlcmljLmd1b2N6QGdtYWlsLmNvbTAfBgNVHRIEGDAWgRRlcmlj
-  Lmd1b2N6QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAkS8q1uex/jWTHtYi
-  6Rgv8hZugwpFCwGPb9i4VgSSA1qkfsFhNxQji1xcpo8hYlH6zW9L6CGC9BU4n9R2
-  iyuuvtHVnxt5i6u39fIw0dIHJdtswSXZ6Kq58RP1Lg1nbmXX0zHz1fXp+DXL7NoJ
-  bBHL9Oy6jps/Lz8fIanPIZ6iT/akA7Mts94v1F9dyeA3IIJVptvmuGFC9PexX4TJ
-  fZ/qmk93C6KEOGEQ0zJzjnKjRZT0KOnJxbpB6/4Xvr+SrTb0yx20s+YWWa28pb0C
-  gNr4HHRfhmqxoTKvM4Mm9oJSBO/ENi5zfLwvwOWRuriMuDGYmKCdwmn4Y9asgYS4
-  2febpVoh2LTA7GDc1VJOKhxisQ2OtYpcTR503eGyIrnS4NGs+B0rXOB7pEX+VOju
-  2Gz/SZ1dgCkJpJU45GNrhatKx3kyg8eC5IHekNrEvJNJqPl0VdRIs/GtUkQyk+np
-  3kTPkfLMsAZznXo3bzMe0V5TB4+a7pFEK1nN/htWrOVkIi/3
+  Lmd1b2N6QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAJ1tLpEqCXma9fFeU
+  l6N4tEDrwYVxdbkXgOScUZBsagNlEM9vvskygivKu8AV8ffdtsg9OAuhdfAjPjX+
+  GvGnmuoweHFTsIrOhNryqFDgvkufBczmFLOskjRuzt4NoBNgge8+xoNo+N9o/0jz
+  GZi69Dth2i92rffuEzyFbfA9xzkjL+uSqJRJVDP5UbIWGnQ99M4GfplJZWRkmoX9
+  5Ek/ZVhzEz6kdZuZErloYKqjWWvFHUFAYmJd3fqKpb468yTIaL4bl4aUl2+xLdyK
+  fPI/ZWGy2uNjffzbrhJ+Ti6qAdubkJoMIqrfbrFV1ew2Bxkp/93etXVNjAgHNmu1
+  o3VAf3sbhnj33jAri7JYx/1MhAcJXlvpKxX9QnYouxU/RgzBF7oqcT0dJ2jWUnAI
+  spvOK5/LPXWX6ZGc2SR8SH/s7ftYH2EkeM1VUbtemow08NdgCwJ4IG+fRQ9dcrJ+
+  L9TbpLHvVrCe1w8duMqNeUmqj+M1iC/5Zst2vIe14QcOTuAh
   -----END CERTIFICATE-----
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -105,20 +105,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -139,14 +153,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -195,12 +209,14 @@ files:
 - lib/wechat/api_loader.rb
 - lib/wechat/cipher.rb
 - lib/wechat/concern/common.rb
+- lib/wechat/concern/qcloud.rb
 - lib/wechat/controller_api.rb
 - lib/wechat/corp_api.rb
 - lib/wechat/helpers.rb
 - lib/wechat/http_client.rb
 - lib/wechat/message.rb
 - lib/wechat/mp_api.rb
+- lib/wechat/qcloud/token.rb
 - lib/wechat/responder.rb
 - lib/wechat/signature.rb
 - lib/wechat/ticket/corp_jsapi_ticket.rb
@@ -213,23 +229,23 @@ homepage: https://github.com/Eric-Guo/wechat
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: DSL for wechat message handling and API
 test_files: []