wechat 0.7.15 → 0.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc56f21f48d36e92b661e701ef739bf57c0e19c
-  data.tar.gz: a3e8fa2c4e22491607a006695992a544d54020d1
+  metadata.gz: 23916edc0bd81f54751cecf9e3936e7c9c0e3d66
+  data.tar.gz: 7948b1899e0926c4f7c7c1da2e18b3b7ea63e52e
 SHA512:
-  metadata.gz: 2fa99da16ca5d3587970a1a81bcec0b301bea9c1bd1e29811bd992452deb0f9554382cf464056c5a7a88ab709dc406f8495734bdd829077bfebb594593b0dda1
-  data.tar.gz: 15ce193b4dd2939f3d79e3d98e0666de9b6b451505ea376a801cefb76090ef108ad29ae6e258e65c6f3b6747ba36ff2dbe2a094b4a3e750d6af7fd94b4847c23
+  metadata.gz: 529950c0422c7ec2e9c20ee8de79bf879528e94d47a61074f2d82bf05ead6305137824304ad38c334bd79bbae9b05ec9f7e0fdca7535b82ebec97502dd6369f9
+  data.tar.gz: 999bda64d6631f8f221d3b4d5e1a6e625bbb3e23adaffe4037856dfce0bc774709731a6289c50e5d307e9c1d8240bc8e2b2974ada59a70687fe09bf9ea572794

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.7.16 (released at 7/27/2016)
+
+* FIX: consider '' in params as equal with nil, in ControllerApi#wechat_public_oauth2, by @snow #135
+* New tag API for public account, by @pynixwang #127
+* fix SSLv3 error by use TLSv1_client, by @IvanChou #133
+
 ## v0.7.15 (released at 7/03/2016)
 
 * RSpec testing case on Rails 5 now.

data/README-CN.md

@@ -23,25 +23,25 @@ WeChat gem 可以帮助开发者方便地在Rails环境中集成微信[公众平
 
 ## 安装
 
-Using `gem install`
+使用 `gem install`
 
 ```
 gem install "wechat"
 ```
 
-Or add to your app's `Gemfile`:
+或者添加下面这行到 `Gemfile`:
 
 ```
 gem 'wechat'
 ```
 
-Run the following command to install it:
+运行下面这行代码来安装:
 
 ```console
 bundle install
 ```
 
-Run the generator:
+运行下面这行代码来生成必要文件:
 
 ```console
 rails generate wechat:install
@@ -266,7 +266,7 @@ Wechat commands:
   wechat custom_text [OPENID, TEXT_MESSAGE]                # 发送文字客服消息
   wechat custom_video [OPENID, VIDEO_PATH]                 # 发送视频客服消息
   wechat custom_voice [OPENID, VOICE_PATH]                 # 发送语音客服消息
-  wechat customservice_getonlinekflist                     # 获取在线客服接待信息  
+  wechat customservice_getonlinekflist                     # 获取在线客服接待信息
   wechat group_create [GROUP_NAME]                         # 创建分组
   wechat group_delete [GROUP_ID]                           # 删除分组
   wechat group_update [GROUP_ID, NEW_GROUP_NAME]           # 修改分组名
@@ -280,18 +280,25 @@ Wechat commands:
   wechat media_create [MEDIA_TYPE, PATH]                   # 媒体上传
   wechat media_uploadimg [IMAGE_PATH]                      # 上传图文消息内的图片
   wechat menu                                              # 当前菜单
-  wechat menu_addconditional [CONDITIONAL_MENU_YAML_PATH]  # 创建个性化菜单  
+  wechat menu_addconditional [CONDITIONAL_MENU_YAML_PATH]  # 创建个性化菜单
   wechat menu_create [MENU_YAML_PATH]                      # 创建菜单
-  wechat menu_delconditional [MENU_ID]                     # 删除个性化菜单  
+  wechat menu_delconditional [MENU_ID]                     # 删除个性化菜单
   wechat menu_delete                                       # 删除菜单
-  wechat menu_trymatch [USER_ID]                           # 测试个性化菜单匹配结果  
+  wechat menu_trymatch [USER_ID]                           # 测试个性化菜单匹配结果
   wechat qrcode_create_limit_scene [SCENE_ID_OR_STR]       # 请求永久二维码
   wechat qrcode_create_scene [SCENE_ID, EXPIRE_SECONDS]    # 请求临时二维码
   wechat qrcode_download [TICKET, QR_CODE_PIC_PATH]        # 通过ticket下载二维码
   wechat short_url [LONG_URL]                              # 长链接转短链接
+  wechat tag [TAGID]                                       # 获取标签下粉丝列表
+  wechat tag_add_user [TAG_ID, OPEN_IDS]                   # 批量为用户打标签
+  wechat tag_create [TAGNAME, TAG_ID]                      # 创建标签
+  wechat tag_del_user [TAG_ID, OPEN_IDS]                   # 批量为用户取消标签
+  wechat tag_delete [TAG_ID]                               # 删除标签
+  wechat tag_update [TAG_ID, TAGNAME]                      # 更新标签名字
+  wechat tags                                              # 获取所有标签
   wechat template_message [OPENID, TEMPLATE_YAML_PATH]     # 模板消息接口
   wechat user [OPEN_ID]                                    # 获取用户基本信息
-  wechat user_batchget [OPEN_ID_LIST]                      # 批量获取用户基本信息  
+  wechat user_batchget [OPEN_ID_LIST]                      # 批量获取用户基本信息
   wechat user_change_group [OPEN_ID, TO_GROUP_ID]          # 移动用户分组
   wechat user_group [OPEN_ID]                              # 查询用户所在分组
   wechat user_update_remark [OPEN_ID, REMARK]              # 设置备注名
@@ -330,9 +337,12 @@ Wechat commands:
   wechat media_create [MEDIA_TYPE, PATH]                   # 媒体上传
   wechat media_uploadimg [IMAGE_PATH]                      # 上传图文消息内的图片
   wechat menu                                              # 当前菜单
+  wechat menu_addconditional [CONDITIONAL_MENU_YAML_PATH]  # 创建个性化菜单
   wechat menu_create [MENU_YAML_PATH]                      # 创建菜单
+  wechat menu_delconditional [MENU_ID]                     # 删除个性化菜单
   wechat menu_delete                                       # 删除菜单
-  wechat message_send [USERID, TEXT_MESSAGE]               # 发送文字消息
+  wechat menu_trymatch [USER_ID]                           # 测试个性化菜单匹配结果
+  wechat message_send [OPENID, TEXT_MESSAGE]               # 发送文字消息
   wechat qrcode_download [TICKET, QR_CODE_PIC_PATH]        # 通过ticket下载二维码
   wechat tag [TAG_ID]                                      # 获取标签成员
   wechat tag_add_department [TAG_ID, PARTY_IDS]            # 增加标签部门
@@ -342,7 +352,7 @@ Wechat commands:
   wechat tag_del_user [TAG_ID, USER_IDS]                   # 删除标签成员
   wechat tag_delete [TAG_ID]                               # 删除标签
   wechat tag_update [TAG_ID, TAGNAME]                      # 更新标签名字
-  wechat tags                                              # 获取标签列表
+  wechat tags                                              # 获取所有标签
   wechat template_message [OPENID, TEMPLATE_YAML_PATH]     # 模板消息接口
   wechat upload_replaceparty [BATCH_PARTY_CSV_PATH]        # 上传文件方式全量覆盖部门
   wechat upload_replaceuser [BATCH_USER_CSV_PATH]          # 上传文件方式全量覆盖成员

data/README.md

@@ -282,7 +282,7 @@ Wechat commands:
   wechat custom_text [OPENID, TEXT_MESSAGE]                # 发送文字客服消息
   wechat custom_video [OPENID, VIDEO_PATH]                 # 发送视频客服消息
   wechat custom_voice [OPENID, VOICE_PATH]                 # 发送语音客服消息
-  wechat customservice_getonlinekflist                     # 获取在线客服接待信息  
+  wechat customservice_getonlinekflist                     # 获取在线客服接待信息
   wechat group_create [GROUP_NAME]                         # 创建分组
   wechat group_delete [GROUP_ID]                           # 删除分组
   wechat group_update [GROUP_ID, NEW_GROUP_NAME]           # 修改分组名
@@ -296,18 +296,25 @@ Wechat commands:
   wechat media_create [MEDIA_TYPE, PATH]                   # 媒体上传
   wechat media_uploadimg [IMAGE_PATH]                      # 上传图文消息内的图片
   wechat menu                                              # 当前菜单
-  wechat menu_addconditional [CONDITIONAL_MENU_YAML_PATH]  # 创建个性化菜单  
+  wechat menu_addconditional [CONDITIONAL_MENU_YAML_PATH]  # 创建个性化菜单
   wechat menu_create [MENU_YAML_PATH]                      # 创建菜单
-  wechat menu_delconditional [MENU_ID]                     # 删除个性化菜单  
+  wechat menu_delconditional [MENU_ID]                     # 删除个性化菜单
   wechat menu_delete                                       # 删除菜单
-  wechat menu_trymatch [USER_ID]                           # 测试个性化菜单匹配结果  
+  wechat menu_trymatch [USER_ID]                           # 测试个性化菜单匹配结果
   wechat qrcode_create_limit_scene [SCENE_ID_OR_STR]       # 请求永久二维码
   wechat qrcode_create_scene [SCENE_ID, EXPIRE_SECONDS]    # 请求临时二维码
   wechat qrcode_download [TICKET, QR_CODE_PIC_PATH]        # 通过ticket下载二维码
   wechat short_url [LONG_URL]                              # 长链接转短链接
+  wechat tag [TAGID]                                       # 获取标签下粉丝列表
+  wechat tag_add_user [TAG_ID, OPEN_IDS]                   # 批量为用户打标签
+  wechat tag_create [TAGNAME, TAG_ID]                      # 创建标签
+  wechat tag_del_user [TAG_ID, OPEN_IDS]                   # 批量为用户取消标签
+  wechat tag_delete [TAG_ID]                               # 删除标签
+  wechat tag_update [TAG_ID, TAGNAME]                      # 更新标签名字
+  wechat tags                                              # 获取所有标签
   wechat template_message [OPENID, TEMPLATE_YAML_PATH]     # 模板消息接口
   wechat user [OPEN_ID]                                    # 获取用户基本信息
-  wechat user_batchget [OPEN_ID_LIST]                      # 批量获取用户基本信息  
+  wechat user_batchget [OPEN_ID_LIST]                      # 批量获取用户基本信息
   wechat user_change_group [OPEN_ID, TO_GROUP_ID]          # 移动用户分组
   wechat user_group [OPEN_ID]                              # 查询用户所在分组
   wechat user_update_remark [OPEN_ID, REMARK]              # 设置备注名
@@ -346,9 +353,12 @@ Wechat commands:
   wechat media_create [MEDIA_TYPE, PATH]                   # 媒体上传
   wechat media_uploadimg [IMAGE_PATH]                      # 上传图文消息内的图片
   wechat menu                                              # 当前菜单
+  wechat menu_addconditional [CONDITIONAL_MENU_YAML_PATH]  # 创建个性化菜单
   wechat menu_create [MENU_YAML_PATH]                      # 创建菜单
+  wechat menu_delconditional [MENU_ID]                     # 删除个性化菜单
   wechat menu_delete                                       # 删除菜单
-  wechat message_send [USERID, TEXT_MESSAGE]               # 发送文字消息
+  wechat menu_trymatch [USER_ID]                           # 测试个性化菜单匹配结果
+  wechat message_send [OPENID, TEXT_MESSAGE]               # 发送文字消息
   wechat qrcode_download [TICKET, QR_CODE_PIC_PATH]        # 通过ticket下载二维码
   wechat tag [TAG_ID]                                      # 获取标签成员
   wechat tag_add_department [TAG_ID, PARTY_IDS]            # 增加标签部门
@@ -358,7 +368,7 @@ Wechat commands:
   wechat tag_del_user [TAG_ID, USER_IDS]                   # 删除标签成员
   wechat tag_delete [TAG_ID]                               # 删除标签
   wechat tag_update [TAG_ID, TAGNAME]                      # 更新标签名字
-  wechat tags                                              # 获取标签列表
+  wechat tags                                              # 获取所有标签
   wechat template_message [OPENID, TEMPLATE_YAML_PATH]     # 模板消息接口
   wechat upload_replaceparty [BATCH_PARTY_CSV_PATH]        # 上传文件方式全量覆盖部门
   wechat upload_replaceuser [BATCH_USER_CSV_PATH]          # 上传文件方式全量覆盖成员

data/bin/wechat

@@ -38,7 +38,9 @@ class App < Thor
     puts 'File downloaded'
   end
 
-  if Wechat::ApiLoader.with(options).is_a?(Wechat::CorpApi)
+  in_corp_api_cmd = Wechat::ApiLoader.with(options).is_a?(Wechat::CorpApi)
+
+  if in_corp_api_cmd
     desc 'department_create [NAME, PARENT_ID]', '创建部门'
     method_option :parentid, aliases: '-p', desc: '父亲部门id。根部门id为1'
     def department_create(name)
@@ -114,53 +116,16 @@ class App < Thor
       puts wechat_api.invite_user(userid)
     end
 
-    desc 'tag_create [TAGNAME, TAG_ID]', '创建标签'
-    method_option :tagid, aliases: '-id', desc: '整型，指定此参数时新增的标签会生成对应的标签id，不指定时则以目前最大的id自增'
-    def tag_create(name)
-      api_opts = options.slice(:tagid)
-      puts wechat_api.tag_create(name, api_opts[:tagid])
-    end
-
-    desc 'tag_update [TAG_ID, TAGNAME]', '更新标签名字'
-    def tag_update(tagid, tagname)
-      puts wechat_api.tag_update(tagid, tagname)
-    end
-
-    desc 'tag_delete [TAG_ID]', '删除标签'
-    def tag_delete(tagid)
-      puts wechat_api.tag_delete(tagid)
-    end
-
-    desc 'tag [TAG_ID]', '获取标签成员'
-    def tag(tagid)
-      puts wechat_api.tag(tagid)
-    end
-
-    desc 'tag_add_user [TAG_ID, USER_IDS]', '增加标签成员'
-    def tag_add_user(tagid, userids)
-      puts wechat_api.tag_add_user(tagid, userids.split(','))
-    end
-
     desc 'tag_add_department [TAG_ID, PARTY_IDS]', '增加标签部门'
     def tag_add_department(tagid, partyids)
       puts wechat_api.tag_add_user(tagid, nil, partyids.split(','))
     end
 
-    desc 'tag_del_user [TAG_ID, USER_IDS]', '删除标签成员'
-    def tag_del_user(tagid, userids)
-      puts wechat_api.tag_del_user(tagid, userids.split(','))
-    end
-
     desc 'tag_del_department [TAG_ID, PARTY_IDS]', '删除标签部门'
     def tag_del_department(tagid, partyids)
       puts wechat_api.tag_del_user(tagid, nil, partyids.split(','))
     end
 
-    desc 'tags', '获取标签列表'
-    def tags
-      puts wechat_api.tags
-    end
-
     desc 'batch_job_result [JOB_ID]', '获取异步任务结果'
     def batch_job_result(job_id)
       puts wechat_api.batch_job_result(job_id)
@@ -441,6 +406,59 @@ class App < Thor
     template = YAML.load(File.read(template_yaml_path))
     puts wechat_api.template_message_send Wechat::Message.to(openid).template(template['template'])
   end
+
+  desc 'tags', '获取所有标签'
+  def tags
+    puts wechat_api.tags
+  end
+
+  desc 'tag_create [TAGNAME, TAG_ID]', '创建标签'
+  method_option :tagid, aliases: '-id', desc: '整型，指定此参数时新增的标签会生成对应的标签id，不指定时则以目前最大的id自增' if in_corp_api_cmd
+  def tag_create(tag_name)
+    if in_corp_api_cmd
+      api_opts = options.slice(:tagid)
+      puts wechat_api.tag_create(tag_name, api_opts[:tagid])
+    else
+      puts wechat_api.tag_create(tag_name)
+    end
+  end
+
+  desc 'tag_update [TAG_ID, TAGNAME]', '更新标签名字'
+  def tag_update(tagid, tagname)
+    puts wechat_api.tag_update(tagid, tagname)
+  end
+
+  desc 'tag_delete [TAG_ID]', '删除标签'
+  def tag_delete(tagid)
+    puts wechat_api.tag_delete(tagid)
+  end
+
+  if in_corp_api_cmd
+    desc 'tag_add_user [TAG_ID, USER_IDS]', '增加标签成员'
+  else
+    desc 'tag_add_user [TAG_ID, OPEN_IDS]', '批量为用户打标签'
+  end
+  def tag_add_user(tagid, open_or_user_ids)
+    puts wechat_api.tag_add_user(tagid, open_or_user_ids.split(','))
+  end
+
+  if in_corp_api_cmd
+    desc 'tag_del_user [TAG_ID, USER_IDS]', '删除标签成员'
+  else
+    desc 'tag_del_user [TAG_ID, OPEN_IDS]', '批量为用户取消标签'
+  end
+  def tag_del_user(tagid, open_or_user_ids)
+    puts wechat_api.tag_del_user(tagid, open_or_user_ids.split(','))
+  end
+
+  if in_corp_api_cmd
+    desc 'tag [TAG_ID]', '获取标签成员'
+  else
+    desc 'tag [TAGID]', '获取标签下粉丝列表'
+  end
+  def tag(tagid)
+    puts wechat_api.tag tagid
+  end
 end
 
 App.start

data/lib/wechat/api.rb

@@ -133,6 +133,34 @@ module Wechat
       get 'customservice/getonlinekflist'
     end
 
+    def tags
+      get 'tags/get'
+    end
+
+    def tag_create(tag_name)
+      post 'tags/create', JSON.generate(tag: { name: tag_name })
+    end
+
+    def tag_update(tagid, new_tag_name)
+      post 'tags/update', JSON.generate(tag: { id: tagid, name: new_tag_name })
+    end
+
+    def tag_delete(tagid)
+      post 'tags/delete', JSON.generate(tag: { id: tagid })
+    end
+
+    def tag_add_user(tagid, openids)
+      post 'tags/members/batchtagging', JSON.generate(openid_list: openids, tagid: tagid)
+    end
+
+    def tag_del_user(tagid, openids)
+      post 'tags/members/batchuntagging', JSON.generate(openid_list: openids, tagid: tagid)
+    end
+
+    def tag(tagid, next_openid = '')
+      post 'user/tag/get', JSON.generate(tagid: tagid, next_openid: next_openid)
+    end
+
     OAUTH2_BASE = 'https://api.weixin.qq.com/sns/'.freeze
 
     def web_access_token(code)

data/lib/wechat/controller_api.rb

@@ -34,7 +34,9 @@ module Wechat
     def wechat_public_oauth2(oauth2_url)
       if cookies.signed_or_encrypted[:we_openid].blank? && params[:code].blank?
         redirect_to oauth2_url
-      elsif cookies.signed_or_encrypted[:we_openid].blank? && params[:code].present? && params[:state] == wechat.jsapi_ticket.oauth2_state
+      elsif cookies.signed_or_encrypted[:we_openid].blank? &&
+            params[:code].present? &&
+            params[:state].to_s == wechat.jsapi_ticket.oauth2_state.to_s # params[:state] maybe nil and wechat.jsapi_ticket.oauth2_state may be nil
         access_info = wechat.web_access_token(params[:code])
         cookies.signed_or_encrypted[:we_openid] = { value: access_info['openid'], expires: self.class.oauth2_cookie_duration.from_now }
         yield access_info['openid'], access_info

data/lib/wechat/http_client.rb

@@ -8,6 +8,7 @@ module Wechat
       @base = base
       HTTP.timeout(:global, write: timeout, connect: timeout, read: timeout)
       @ssl_context = OpenSSL::SSL::SSLContext.new
+      @ssl_context.ssl_version = :TLSv1_client
       @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_verify_ssl
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport