wechat 0.11.10 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae019a8d3da8b0f78aba677ba633a46ecebdf975be517f09b5ec82050b2aee9
-  data.tar.gz: 1bdb9f6dd87d72071071e3ff36d4d6334c0ddb0825d2ef5abe243b6298983ee2
+  metadata.gz: 761a53485d1170176263ef051a032606c7ae1c5533c6ec9c3f4808a4aeb5cd66
+  data.tar.gz: be822b26ee8bc46bcc548190d8f7082e0424d9214ed88a26e3846be39c7fcde2
 SHA512:
-  metadata.gz: 0c87ecd9b34fc0c34538bd754e6b35e20cc6e87f138b7434fabf92c3f0ec2a0cfbbc44a7d0e7c88fa52237b293f1744408697043c3f7e624e5eba9c871ba2153
-  data.tar.gz: 8a431320b86e529acd98de9482070052fbeb4dcf80538dc9e0d5c2e6a7507460fa848a0bb0c3692c68c89ef8b7dbd0243ef537442680a678b3e871ff4f4ec40f
+  metadata.gz: 261f379c71351cf41d93e4bc3953c66f62d11c2f136111f2642379e78cde736e2e2667817c71f3001fec80d4432f83dcde2f4ac5d6f380b67daa55d6477252e4
+  data.tar.gz: b57190737963d214a9e644334ead4af99e68b774b3973f49ae652f6576b8aeb248407062e0ffc0fbb3ac86347b81b6b90942b632090eef6729ce6dc98504f4fe

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-a�u�A�lGh�iC�kgQ�P�j�U�G��gAs|�&{;M��Ԓ�[9�P��vC*�9���A˧�a�t���Ά��Դ	�-�L�n>����~�	ӌV�rqd�eIth�@����c蹩}��	8k}eo�w��£7/H�X��7����j�g[<�k~�F��`��h��=s	���ZA�i�a#���&4h��Ds�D�g]�vN9��V�#�"�q�x��7���ċD�(��
+��އ�i�(�m;L��nuq_HJ�*��-q$�8n{k#���k�Mp=�� f���0�#�]����u�Z�T.C�_��$�o�*���L}[&�1��ɉ�n������@˼?՛4��l}�W[��^������GD���p"<�9��y�t���T��x��I*��")�rgD�KAr���*9HwCN�o0!�S���-^��Z�X���
+L��n�8%��Z����ڭ}��d�>`6�^��q�J2{X6M�
+>�@J߆�L�S��Ǣt>=zUL��U�(9ۺ��&��%�yR�

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## v0.12.4 (released at 4/21/2021)
+
+* New material_add_news API, by @zlei1 #300
+* Support open_tag, by @xiajian2019 #299
+
+## v0.12.3 (released at 3/15/2021)
+
+* Fix MpApi initialize bug, by @hardywu #296
+
+## v0.12.2 (released at 3/3/2021)
+
+* New convert_to_userid API
+
+## 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.

data/README-CN.md

@@ -1,4 +1,4 @@
-WeChat [![Gem Version](https://badge.fury.io/rb/wechat.svg)](https://rubygems.org/gems/wechat) [![Build Status](https://travis-ci.org/Eric-Guo/wechat.svg)](https://travis-ci.org/Eric-Guo/wechat) [![Maintainability](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/maintainability)](https://codeclimate.com/github/Eric-Guo/wechat/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/test_coverage)](https://codeclimate.com/github/Eric-Guo/wechat/test_coverage)
+WeChat [![Gem Version](https://badge.fury.io/rb/wechat.svg)](https://rubygems.org/gems/wechat) [![Build Status](https://travis-ci.com/Eric-Guo/wechat.svg)](https://travis-ci.com/github/Eric-Guo/wechat) [![Maintainability](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/maintainability)](https://codeclimate.com/github/Eric-Guo/wechat/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/test_coverage)](https://codeclimate.com/github/Eric-Guo/wechat/test_coverage)
 ======
 
 [![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)
@@ -362,6 +362,7 @@ Wechat Public Account commands:
   wechat groups                                                 # 查询所有分组
   wechat material_get [MEDIA_ID, PATH]                              # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                        # 永久媒体上传
+  wechat material_add_news [MPNEWS_YAML_PATH]                   # 永久图文素材上传
   wechat material_count                                         # 获取永久素材总数
   wechat material_delete [MEDIA_ID]                             # 删除永久素材
   wechat material_list [TYPE, OFFSET, COUNT]                    # 获取永久素材列表
@@ -416,6 +417,7 @@ Wechat Enterprise Account commands:
   wechat callbackip                                        # 获取微信服务器IP地址
   wechat clear_quota                                       # 接口调用次数清零
   wechat convert_to_openid [USER_ID]                       # userid转换成openid
+  wechat convert_to_userid [OPENID]                        # openid转换成userid
   wechat custom_image [OPENID, IMAGE_PATH]                 # 发送图片客服消息
   wechat custom_music [OPENID, THUMBNAIL_PATH, MUSIC_URL]  # 发送音乐客服消息
   wechat custom_news [OPENID, NEWS_YAML_PATH]              # 发送图文客服消息

data/README.md

@@ -1,4 +1,4 @@
-WeChat [![Gem Version](https://badge.fury.io/rb/wechat.svg)](https://rubygems.org/gems/wechat) [![Build Status](https://travis-ci.org/Eric-Guo/wechat.svg)](https://travis-ci.org/Eric-Guo/wechat) [![Maintainability](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/maintainability)](https://codeclimate.com/github/Eric-Guo/wechat/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/test_coverage)](https://codeclimate.com/github/Eric-Guo/wechat/test_coverage)
+WeChat [![Gem Version](https://badge.fury.io/rb/wechat.svg)](https://rubygems.org/gems/wechat) [![Build Status](https://travis-ci.com/Eric-Guo/wechat.svg)](https://travis-ci.com/github/Eric-Guo/wechat) [![Maintainability](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/maintainability)](https://codeclimate.com/github/Eric-Guo/wechat/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/test_coverage)](https://codeclimate.com/github/Eric-Guo/wechat/test_coverage)
 ======
 
 [![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)
@@ -391,8 +391,9 @@ Wechat Public Account commands:
   wechat group_delete [GROUP_ID]                                # 删除分组
   wechat group_update [GROUP_ID, NEW_GROUP_NAME]                # 修改分组名
   wechat groups                                                 # 查询所有分组
-  wechat material_get [MEDIA_ID, PATH]                              # 永久媒体下载
+  wechat material_get [MEDIA_ID, PATH]                          # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                        # 永久媒体上传
+  wechat material_add_news [MPNEWS_YAML_PATH]                   # 永久图文素材上传
   wechat material_count                                         # 获取永久素材总数
   wechat material_delete [MEDIA_ID]                             # 删除永久素材
   wechat material_list [TYPE, OFFSET, COUNT]                    # 获取永久素材列表
@@ -448,6 +449,7 @@ Wechat Enterprise Account commands:
   wechat callbackip                                        # 获取微信服务器IP地址
   wechat clear_quota                                       # 接口调用次数清零
   wechat convert_to_openid [USER_ID]                       # userid转换成openid
+  wechat convert_to_userid [OPENID]                        # openid转换成userid
   wechat custom_image [OPENID, IMAGE_PATH]                 # 发送图片客服消息
   wechat custom_music [OPENID, THUMBNAIL_PATH, MUSIC_URL]  # 发送音乐客服消息
   wechat custom_news [OPENID, NEWS_YAML_PATH]              # 发送图文客服消息

data/bin/wechat

@@ -187,6 +187,11 @@ class App < Thor
       puts wechat_api.convert_to_openid(userid)
     end
 
+    desc 'convert_to_userid [OPENID]', 'openid转换成userid'
+    def convert_to_userid(openid)
+      puts wechat_api.convert_to_userid(openid)
+    end
+
     desc 'agent_list', '获取应用概况列表'
     def agent_list
       r = wechat_api.agent_list
@@ -406,6 +411,12 @@ class App < Thor
     puts wechat_api.material_add(type, path)
   end
 
+  desc 'material_add_news [MPNEWS_YAML_PATH]', '永久图文素材上传'
+  def material_add_news(mpnews_yaml_path)
+    new = YAML.load(File.read(mpnews_yaml_path))
+    puts wechat_api.material_add_news(Wechat::Message.new(MsgType: 'mpnews').mpnews(new['articles']))
+  end
+
   desc 'material_delete [MEDIA_ID]', '删除永久素材'
   def material_delete(media_id)
     puts wechat_api.material_delete(media_id)

data/lib/action_controller/wechat_responder.rb

@@ -38,25 +38,29 @@ 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_env = opts[:qcloud_env] || cfg.qcloud_env
+      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_env, 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_env, 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_env, 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})"
@@ -47,7 +50,7 @@ module Wechat
     decrypted_data = Base64.decode64(encrypted_data)
     JSON.parse(cipher.update(decrypted_data) + cipher.final)
   rescue StandardError => e
-    { 'errcode': 41003, 'errmsg': e.message }
+    { errcode: 41003, errmsg: e.message }
   end
 end
 

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/'
     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*')
 
@@ -43,7 +43,7 @@ module Wechat
       msg = decode_padding(msg)
       msg_len = msg[16, 4].reverse.unpack1('V')
       content = msg[20, msg_len]
-      app_id = msg[(20 + msg_len)..-1]
+      app_id = msg[(msg_len + 20)..-1]
 
       [content, app_id]
     end

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
@@ -158,6 +152,10 @@ module Wechat
         post_file 'material/add_material', file, params: { type: type }
       end
 
+      def material_add_news(mpnews_message)
+        post 'material/add_news', mpnews_message.to_json
+      end
+
       def material_delete(media_id)
         post 'material/del_material', JSON.generate(media_id: media_id)
       end

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
@@ -45,6 +47,10 @@ module Wechat
       post 'user/convert_to_openid', JSON.generate(userid: userid, agentid: agentid)
     end
 
+    def convert_to_userid(openid)
+      post 'user/convert_to_userid', JSON.generate(openid: openid)
+    end
+
     def invite_user(userid)
       post 'invite/send', JSON.generate(userid: userid)
     end
@@ -90,7 +96,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)

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
@@ -34,16 +34,11 @@ module Wechat
           timestamp: "#{js_hash[:timestamp]}",
           nonceStr: "#{js_hash[:noncestr]}",
           signature: "#{js_hash[:signature]}",
-          jsApiList: ['#{config_options[:api].join("','")}']
+          jsApiList: ['#{config_options[:api]&.join("','")}'],
+          openTagList: ['#{config_options[:open_tags]&.join("','")}']
         });
       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_2
+      @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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.12.4
 platform: ruby
 authors:
 - Skinnyworm
@@ -35,7 +35,7 @@ cert_chain:
   spvOK5/LPXWX6ZGc2SR8SH/s7ftYH2EkeM1VUbtemow08NdgCwJ4IG+fRQ9dcrJ+
   L9TbpLHvVrCe1w8duMqNeUmqj+M1iC/5Zst2vIe14QcOTuAh
   -----END CERTIFICATE-----
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2021-04-21 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: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.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
@@ -219,7 +235,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -228,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: DSL for wechat message handling and API