wechat 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f57875f2dee753674602e98333ae19b6a29c4ed
-  data.tar.gz: e0c6882f86e379bfd8ad74d31a3c6241cd47f0ae
+  metadata.gz: 66ecda4306d9d5a9fde71ae0477d99682fd443a0
+  data.tar.gz: 13b71709c26cc139d1be233a0449741eb404adbc
 SHA512:
-  metadata.gz: 375da3a164458340900ed8d1ab1b4c864ce3b2f645f18ef19be010a67954018ff5a34da7273e12169c1654673d91c237ea99a633ef63b5630d84f04561e887e9
-  data.tar.gz: 9dba3994255e0cff1de66e7f125f30b9a6f836f81f98a327fab1180fc940e7fc40ed5169c10ff939264a2e314ae9b3412afbb3a9a8b6bda2920237d43799fa0e
+  metadata.gz: 85fb0b5a0745542d5c9e9ec09095125c393192da41335592c58561353c6e5d91cc7eeb112a61c2456ac68cda0768391ae33a65a98aa7f05292abd2cfad78a2fc
+  data.tar.gz: 09d88487602a96a6bc1d9b3c7dad3a5f9199c1d8df1f40e96d7b5a5ec6692cc894b4fb071de20ac27a1df42f6536cb17fe691651a044c876c4c117bc80602f17

data/CHANGELOG.md

@@ -1,8 +1,15 @@
 # Changelog
 
+## v0.6.4 (released at 11/16/2015)
+
+* Command mode now display different command set based on enterprise/public account setting
+* Move config logic in command/wechat to ApiLoader class
+* Unsubscribe can only reply plain text 'success' #68
+* Fix 404 qrcode download problem, by @huangxiangdan #69
+
 ## v0.6.3 (released at 11/14/2015)
 
-* Official testing and support public encrypt mode, also fix one cipher bug, many thanks to hlltc #67
+* Official testing and support public encrypt mode, also fix one cipher bug, many thanks to @hlltc #67
 * hlltc report public account FILE_BASE no longer needs, clean code #67
 * Media command line reflect recent Tecent json schema change. #67
 

data/README.md

@@ -157,6 +157,46 @@ wechat gems 内部不会检查权限。但因公众号类型不同，和微信
 
 ## 使用命令行
 
+根据企业号和公众号配置不同，wechat提供了的命令行命令。
+
+#### 公众号命令行
+
+```
+$ wechat
+Wechat commands:
+  wechat callbackip                                        # 获取微信服务器IP地址
+  wechat custom_image [OPENID, IMAGE_PATH]                 # 发送图片客服消息
+  wechat custom_music [OPENID, THUMBNAIL_PATH, MUSIC_URL]  # 发送音乐客服消息
+  wechat custom_news [OPENID, NEWS_YAML_PATH]              # 发送图文客服消息
+  wechat custom_text [OPENID, TEXT_MESSAGE]                # 发送文字客服消息
+  wechat custom_video [OPENID, VIDEO_PATH]                 # 发送视频客服消息
+  wechat custom_voice [OPENID, VOICE_PATH]                 # 发送语音客服消息
+  wechat group_create [GROUP_NAME]                         # 创建分组
+  wechat group_delete [GROUP_ID]                           # 删除分组
+  wechat group_update [GROUP_ID, NEW_GROUP_NAME]           # 修改分组名
+  wechat groups                                            # 查询所有分组
+  wechat material [MEDIA_ID, PATH]                         # 永久媒体下载
+  wechat material_add [MEDIA_TYPE, PATH]                   # 永久媒体上传
+  wechat material_count                                    # 获取永久素材总数
+  wechat material_delete [MEDIA_ID]                        # 删除永久素材
+  wechat material_list [TYPE, OFFSET, COUNT]               # 获取永久素材列表
+  wechat media [MEDIA_ID, PATH]                            # 媒体下载
+  wechat media_create [MEDIA_TYPE, PATH]                   # 媒体上传
+  wechat menu                                              # 当前菜单
+  wechat menu_create [MENU_YAML_PATH]                      # 创建菜单
+  wechat menu_delete                                       # 删除菜单
+  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 template_message [OPENID, TEMPLATE_YAML_PATH]     # 模板消息接口
+  wechat user [OPEN_ID]                                    # 获取用户基本信息
+  wechat user_change_group [OPEN_ID, TO_GROUP_ID]          # 移动用户分组
+  wechat user_group [OPEN_ID]                              # 查询用户所在分组
+  wechat user_update_remark [OPEN_ID, REMARK]              # 设置备注名
+  wechat users                                             # 关注者列表
+```
+
+#### 企业号命令行
 ```
 $ wechat
 Wechat commands:
@@ -177,11 +217,7 @@ Wechat commands:
   wechat department [DEPARTMENT_ID]                        # 获取部门列表
   wechat department_create [NAME, PARENT_ID]               # 创建部门
   wechat department_delete [DEPARTMENT_ID]                 # 删除部门
-  wechat department_update [DEPARTMENT_ID, NAME]           # 更新部门  
-  wechat group_create [GROUP_NAME]                         # 创建分组
-  wechat group_delete [GROUP_ID]                           # 删除分组
-  wechat group_update [GROUP_ID, NEW_GROUP_NAME]           # 修改分组名
-  wechat groups                                            # 所有用户分组列表
+  wechat department_update [DEPARTMENT_ID, NAME]           # 更新部门
   wechat invite_user [USER_ID]                             # 邀请成员关注
   wechat material [MEDIA_ID, PATH]                         # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                   # 永久媒体上传
@@ -193,7 +229,7 @@ Wechat commands:
   wechat menu                                              # 当前菜单
   wechat menu_create [MENU_YAML_PATH]                      # 创建菜单
   wechat menu_delete                                       # 删除菜单
-  wechat message_send [OPENID, TEXT_MESSAGE]               # 发送文字消息(仅企业号)
+  wechat message_send [OPENID, TEXT_MESSAGE]               # 发送文字消息
   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下载二维码
@@ -201,21 +237,18 @@ Wechat commands:
   wechat tag_add_department [TAG_ID, PARTY_IDS]            # 增加标签部门
   wechat tag_add_user [TAG_ID, USER_IDS]                   # 增加标签成员
   wechat tag_create [TAGNAME, TAG_ID]                      # 创建标签
-  wechat tag_del_user [TAG_ID, USER_IDS]                   # 删除标签成员  
   wechat tag_del_department [TAG_ID, PARTY_IDS]            # 删除标签部门
+  wechat tag_del_user [TAG_ID, USER_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_batchdelete [USER_ID_LIST]                   # 批量删除成员  
-  wechat user_change_group [OPEN_ID, TO_GROUP_ID]          # 移动用户分组
+  wechat user_batchdelete [USER_ID_LIST]                   # 批量删除成员
   wechat user_delete [USER_ID]                             # 删除成员
-  wechat user_group [OPEN_ID]                              # 查询用户所在分组
   wechat user_list [DEPARTMENT_ID]                         # 获取部门成员详情
   wechat user_simplelist [DEPARTMENT_ID]                   # 获取部门成员
   wechat user_update_remark [OPEN_ID, REMARK]              # 设置备注名
-  wechat users                                             # 关注者列表
 ```
 
 ### 使用场景
@@ -449,7 +482,7 @@ class WechatsController < ApplicationController
 
   # 当用户取消关注订阅
   on :event, with: 'unsubscribe' do |request|
-    request.reply.text "#{request[:FromUserName]} can not receive this message"
+    request.reply.success # user can not receive this message
   end
 
   # 成员进入应用的事件推送

data/bin/wechat

@@ -12,316 +12,284 @@ require 'active_support/core_ext'
 require 'active_support/json'
 require 'fileutils'
 require 'yaml'
+require 'wechat/api_loader'
 
 class App < Thor
-  class Helper
-    def self.with(options)
-      config = loading_config
-
-      appid =  config['appid']
-      secret = config['secret']
-      corpid = config['corpid']
-      corpsecret = config['corpsecret']
-      token_file = options[:toke_file] || config['access_token'] || '/var/tmp/wechat_access_token'
-      agentid = config['agentid']
-      skip_verify_ssl = config['skip_verify_ssl']
-
-      if appid.present? && secret.present? && token_file.present?
-        Wechat::Api.new(appid, secret, token_file, skip_verify_ssl)
-      elsif corpid.present? && corpsecret.present? && token_file.present?
-        Wechat::CorpApi.new(corpid, corpsecret, token_file, agentid, skip_verify_ssl)
-      else
-        puts <<-HELP
-Need create ~/.wechat.yml with wechat appid and secret
-or running at rails root folder so wechat can read config/wechat.yml
-HELP
-        exit 1
-      end
-    end
-
-    def self.loading_config
-      config = {}
-
-      rails_config_file = File.join(Dir.getwd, 'config/wechat.yml')
-      home_config_file = File.join(Dir.home, '.wechat.yml')
-
-      if File.exist?(rails_config_file)
-        config = YAML.load(ERB.new(File.read(rails_config_file)).result)['default']
-        if config.present? && (config['appid'] || config['corpid'])
-          puts 'Using rails project config/wechat.yml default setting...'
-        else
-          config = {}
-        end
-      end
+  package_name 'Wechat'
+  option :toke_file, aliases: '-t', desc: 'File to store access token'
 
-      if config.blank? && File.exist?(home_config_file)
-        config = YAML.load ERB.new(File.read(home_config_file)).result
-      end
-      config
+  attr_reader :wechat_api_client
+  no_commands do
+    def wechat_api
+      @wechat_api_client ||= Wechat::ApiLoader.with(options)
     end
   end
 
-  package_name 'Wechat'
-  option :toke_file, aliases: '-t', desc: 'File to store access token'
-
   desc 'callbackip', '获取微信服务器IP地址'
   def callbackip
-    puts Helper.with(options).callbackip
+    puts wechat_api.callbackip
   end
 
   desc 'qrcode_download [TICKET, QR_CODE_PIC_PATH]', '通过ticket下载二维码'
   def qrcode_download(ticket, qr_code_pic_path)
-    tmp_file = Helper.with(options).qrcode(ticket)
+    tmp_file = wechat_api.qrcode(ticket)
     FileUtils.mv(tmp_file.path, qr_code_pic_path)
     puts 'File downloaded'
   end
 
-  desc 'groups', '所有用户分组列表'
-  def groups
-    puts Helper.with(options).groups
-  end
-
-  desc 'group_create [GROUP_NAME]', '创建分组'
-  def group_create(group_name)
-    puts Helper.with(options).group_create(group_name)
-  end
-
-  desc 'group_update [GROUP_ID, NEW_GROUP_NAME]', '修改分组名'
-  def group_update(groupid, new_group_name)
-    puts Helper.with(options).group_update(groupid, new_group_name)
-  end
+  if Wechat::ApiLoader.with(options).is_a?(Wechat::CorpApi)
+    desc 'department_create [NAME, PARENT_ID]', '创建部门'
+    method_option :parentid, aliases: '-p', desc: '父亲部门id。根部门id为1'
+    def department_create(name)
+      api_opts = options.slice(:parentid)
+      puts wechat_api.department_create(name, api_opts[:parentid] || '1')
+    end
 
-  desc 'group_delete [GROUP_ID]', '删除分组'
-  def group_delete(groupid)
-    puts Helper.with(options).group_delete(groupid)
-  end
+    desc 'department_delete [DEPARTMENT_ID]', '删除部门'
+    def department_delete(departmentid)
+      puts wechat_api.department_delete(departmentid)
+    end
 
-  desc 'department_create [NAME, PARENT_ID]', '创建部门'
-  method_option :parentid, aliases: '-p', desc: '父亲部门id。根部门id为1'
-  def department_create(name)
-    api_opts = options.slice(:parentid)
-    puts Helper.with(options).department_create(name, api_opts[:parentid] || '1')
-  end
+    desc 'department_update [DEPARTMENT_ID, NAME]', '更新部门'
+    method_option :parentid, aliases: '-p', desc: '父亲部门id。根部门id为1', default: nil
+    method_option :order, aliases: '-o', desc: '在父部门中的次序值。order值小的排序靠前。', default: nil
+    def department_update(departmentid, name)
+      api_opts = options.slice(:parentid, :order)
+      puts wechat_api.department_update(departmentid, name, api_opts[:parentid], api_opts[:order])
+    end
 
-  desc 'department_delete [DEPARTMENT_ID]', '删除部门'
-  def department_delete(departmentid)
-    puts Helper.with(options).department_delete(departmentid)
-  end
+    desc 'department [DEPARTMENT_ID]', '获取部门列表'
+    def department(departmentid = 0)
+      r = wechat_api.department(departmentid)
+      puts "errcode: #{r['errcode']} errmsg: #{r['errmsg']}"
+      puts 'Or# pid  id name'
+      r['department'].sort_by { |d| d['order'].to_i + d['parentid'].to_i * 1000 } .each do |i|
+        puts format('%3d %3d %3d %s', i['order'], i['parentid'], i['id'], i['name'])
+      end
+    end
 
-  desc 'department_update [DEPARTMENT_ID, NAME]', '更新部门'
-  method_option :parentid, aliases: '-p', desc: '父亲部门id。根部门id为1', default: nil
-  method_option :order, aliases: '-o', desc: '在父部门中的次序值。order值小的排序靠前。', default: nil
-  def department_update(departmentid, name)
-    api_opts = options.slice(:parentid, :order)
-    puts Helper.with(options).department_update(departmentid, name, api_opts[:parentid], api_opts[:order])
-  end
+    desc 'user_delete [USER_ID]', '删除成员'
+    def user_delete(userid)
+      puts wechat_api.user_delete(userid)
+    end
 
-  desc 'department [DEPARTMENT_ID]', '获取部门列表'
-  def department(departmentid = 0)
-    r = Helper.with(options).department(departmentid)
-    puts "errcode: #{r['errcode']} errmsg: #{r['errmsg']}"
-    puts 'Or# pid  id name'
-    r['department'].sort_by { |d| d['order'].to_i + d['parentid'].to_i * 1000 } .each do |i|
-      puts format('%3d %3d %3d %s', i['order'], i['parentid'], i['id'], i['name'])
+    desc 'user_batchdelete [USER_ID_LIST]', '批量删除成员'
+    def user_batchdelete(useridlist)
+      puts wechat_api.user_batchdelete(useridlist.split(','))
     end
-  end
 
-  desc 'user_simplelist [DEPARTMENT_ID]', '获取部门成员'
-  method_option :fetch_child, aliases: '-c', desc: '是否递归获取子部门下面的成员', default: 1
-  method_option :status, aliases: '-s', desc: '0 获取全部成员，1 获取已关注成员列表，2 获取禁用成员列表，4 获取未关注成员列表。status可叠加', default: 0
-  def user_simplelist(departmentid = 0)
-    api_opts = options.slice(:fetch_child, :status)
+    desc 'user_simplelist [DEPARTMENT_ID]', '获取部门成员'
+    method_option :fetch_child, aliases: '-c', desc: '是否递归获取子部门下面的成员', default: 1
+    method_option :status, aliases: '-s', desc: '0 获取全部成员，1 获取已关注成员列表，2 获取禁用成员列表，4 获取未关注成员列表。status可叠加', default: 0
+    def user_simplelist(departmentid = 0)
+      api_opts = options.slice(:fetch_child, :status)
+
+      r = wechat_api.user_simplelist(departmentid, api_opts[:fetch_child], api_opts[:status])
+      puts "errcode: #{r['errcode']} errmsg: #{r['errmsg']}"
+      puts " userid Name #{' ' * 20} department_ids"
+      r['userlist'].sort_by { |d| d['userid'] } .each do |i|
+        puts format('%7s %-25s %-14s', i['userid'], i['name'], i['department'])
+      end
+    end
 
-    r = Helper.with(options).user_simplelist(departmentid, api_opts[:fetch_child], api_opts[:status])
-    puts "errcode: #{r['errcode']} errmsg: #{r['errmsg']}"
-    puts " userid Name #{' ' * 20} department_ids"
-    r['userlist'].sort_by { |d| d['userid'] } .each do |i|
-      puts format('%7s %-25s %-14s', i['userid'], i['name'], i['department'])
+    desc 'user_list [DEPARTMENT_ID]', '获取部门成员详情'
+    method_option :fetch_child, aliases: '-c', desc: '是否递归获取子部门下面的成员', default: 0
+    method_option :status, aliases: '-s', desc: '0 获取全部成员，1 获取已关注成员列表，2 获取禁用成员列表，4 获取未关注成员列表。status可叠加', default: 0
+    def user_list(departmentid = 0)
+      api_opts = options.slice(:fetch_child, :status)
+
+      r = wechat_api.user_list(departmentid, api_opts[:fetch_child], api_opts[:status])
+      puts "errcode: #{r['errcode']} errmsg: #{r['errmsg']}"
+      puts " userid Name #{' ' * 15} department_ids position mobile #{' ' * 5}gender email #{' ' * 10}weixinid   status extattr"
+      r['userlist'].sort_by { |d| d['userid'] } .each do |i|
+        puts format('%7s %-20s %-14s %-8s %-11s %-6s %-15s %-15s %-6s %s',
+                    i['userid'], i['name'], i['department'], i['position'], i['mobile'],
+                    i['gender'], i['email'], i['weixinid'], i['status'], i['extattr'])
+      end
     end
-  end
 
-  desc 'user_list [DEPARTMENT_ID]', '获取部门成员详情'
-  method_option :fetch_child, aliases: '-c', desc: '是否递归获取子部门下面的成员', default: 0
-  method_option :status, aliases: '-s', desc: '0 获取全部成员，1 获取已关注成员列表，2 获取禁用成员列表，4 获取未关注成员列表。status可叠加', default: 0
-  def user_list(departmentid = 0)
-    api_opts = options.slice(:fetch_child, :status)
+    desc 'invite_user [USER_ID]', '邀请成员关注'
+    def invite_user(userid)
+      puts wechat_api.invite_user(userid)
+    end
 
-    r = Helper.with(options).user_list(departmentid, api_opts[:fetch_child], api_opts[:status])
-    puts "errcode: #{r['errcode']} errmsg: #{r['errmsg']}"
-    puts " userid Name #{' ' * 15} department_ids position mobile #{' ' * 5}gender email #{' ' * 10}weixinid   status extattr"
-    r['userlist'].sort_by { |d| d['userid'] } .each do |i|
-      puts format('%7s %-20s %-14s %-8s %-11s %-6s %-15s %-15s %-6s %s',
-                  i['userid'], i['name'], i['department'], i['position'], i['mobile'],
-                  i['gender'], i['email'], i['weixinid'], i['status'], i['extattr'])
+    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
-  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 Helper.with(options).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_update [TAG_ID, TAGNAME]', '更新标签名字'
-  def tag_update(tagid, tagname)
-    puts Helper.with(options).tag_update(tagid, tagname)
-  end
+    desc 'tag_delete [TAG_ID]', '删除标签'
+    def tag_delete(tagid)
+      puts wechat_api.tag_delete(tagid)
+    end
 
-  desc 'tag_delete [TAG_ID]', '删除标签'
-  def tag_delete(tagid)
-    puts Helper.with(options).tag_delete(tagid)
-  end
+    desc 'tag [TAG_ID]', '获取标签成员'
+    def tag(tagid)
+      puts wechat_api.tag(tagid)
+    end
 
-  desc 'tags', '获取标签列表'
-  def tags
-    puts Helper.with(options).tags
-  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 [TAG_ID]', '获取标签成员'
-  def tag(tagid)
-    puts Helper.with(options).tag(tagid)
-  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_add_user [TAG_ID, USER_IDS]', '增加标签成员'
-  def tag_add_user(tagid, userids)
-    puts Helper.with(options).tag_add_user(tagid, userids.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_add_department [TAG_ID, PARTY_IDS]', '增加标签部门'
-  def tag_add_department(tagid, partyids)
-    puts Helper.with(options).tag_add_user(tagid, nil, partyids.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 'tag_del_user [TAG_ID, USER_IDS]', '删除标签成员'
-  def tag_del_user(tagid, userids)
-    puts Helper.with(options).tag_del_user(tagid, userids.split(','))
-  end
+    desc 'tags', '获取标签列表'
+    def tags
+      puts wechat_api.tags
+    end
 
-  desc 'tag_del_department [TAG_ID, PARTY_IDS]', '删除标签部门'
-  def tag_del_department(tagid, partyids)
-    puts Helper.with(options).tag_del_user(tagid, nil, partyids.split(','))
-  end
+    desc 'batch_job_result [JOB_ID]', '获取异步任务结果'
+    def batch_job_result(job_id)
+      puts wechat_api.batch_job_result(job_id)
+    end
 
-  desc 'agent_list', '获取应用概况列表'
-  def agent_list
-    r = Helper.with(options).agent_list
-    puts "errcode: #{r['errcode']} errmsg: #{r['errmsg']}"
-    puts 'ag# name        square_logo_url round_logo_url'
-    r['agentlist'].sort_by { |d| d['agentid'] } .each do |i|
-      puts format('%3d %s %s %s', i['agentid'], i['name'], i['square_logo_url'], i['round_logo_url'])
+    desc 'batch_replaceparty [BATCH_PARTY_CSV_MEDIA_ID]', '全量覆盖部门'
+    def batch_replaceparty(batch_party_csv_media_id)
+      puts wechat_api.batch_replaceparty(batch_party_csv_media_id)
     end
-  end
 
-  desc 'agent [AGENT_ID]', '获取企业号应用详情'
-  def agent(agentid)
-    r = Helper.with(options).agent(agentid)
-    puts "agentid: #{r['agentid']} errcode: #{r['errcode']} errmsg: #{r['errmsg']}"
-    puts "name: #{r['name']}"
-    puts "description: #{r['description']}"
-    puts "  square_logo_url: #{r['square_logo_url']}"
-    puts "   round_logo_url: #{r['round_logo_url']}"
-    puts "allow_userinfos: #{r['allow_userinfos']}"
-    puts "allow_partys: #{r['allow_partys']}"
-    puts "allow_tags: #{r['allow_tags']}"
-    puts "close: #{r['close']} redirect_domain: #{r['redirect_domain']}"
-    puts "report_location_flag: #{r['report_location_flag']} isreportuser: #{r['isreportuser']} isreportenter: #{r['isreportenter']}"
-  end
+    desc 'batch_syncuser [SYNC_USER_CSV_MEDIA_ID]', '增量更新成员'
+    def batch_syncuser(sync_user_csv_media_id)
+      puts wechat_api.batch_syncuser(sync_user_csv_media_id)
+    end
 
-  desc 'users', '关注者列表'
-  def users
-    puts Helper.with(options).users
-  end
+    desc 'batch_replaceuser [BATCH_USER_CSV_MEDIA_ID]', '全量覆盖成员'
+    def batch_replaceuser(batch_user_csv_media_id)
+      puts wechat_api.batch_replaceuser(batch_user_csv_media_id)
+    end
 
-  desc 'user [OPEN_ID]', '获取用户基本信息'
-  def user(open_id)
-    puts Helper.with(options).user(open_id)
-  end
+    desc 'convert_to_openid [USER_ID]', 'userid转换成openid'
+    def convert_to_openid(userid)
+      puts wechat_api.convert_to_openid(userid)
+    end
 
-  desc 'convert_to_openid [USER_ID]', 'userid转换成openid'
-  def convert_to_openid(userid)
-    puts Helper.with(options).convert_to_openid(userid)
-  end
+    desc 'agent_list', '获取应用概况列表'
+    def agent_list
+      r = wechat_api.agent_list
+      puts "errcode: #{r['errcode']} errmsg: #{r['errmsg']}"
+      puts 'ag# name        square_logo_url round_logo_url'
+      r['agentlist'].sort_by { |d| d['agentid'] } .each do |i|
+        puts format('%3d %s %s %s', i['agentid'], i['name'], i['square_logo_url'], i['round_logo_url'])
+      end
+    end
 
-  desc 'invite_user [USER_ID]', '邀请成员关注'
-  def invite_user(userid)
-    puts Helper.with(options).invite_user(userid)
-  end
+    desc 'agent [AGENT_ID]', '获取企业号应用详情'
+    def agent(agentid)
+      r = wechat_api.agent(agentid)
+      puts "agentid: #{r['agentid']} errcode: #{r['errcode']} errmsg: #{r['errmsg']}"
+      puts "name: #{r['name']}"
+      puts "description: #{r['description']}"
+      puts "  square_logo_url: #{r['square_logo_url']}"
+      puts "   round_logo_url: #{r['round_logo_url']}"
+      puts "allow_userinfos: #{r['allow_userinfos']}"
+      puts "allow_partys: #{r['allow_partys']}"
+      puts "allow_tags: #{r['allow_tags']}"
+      puts "close: #{r['close']} redirect_domain: #{r['redirect_domain']}"
+      puts "report_location_flag: #{r['report_location_flag']} isreportuser: #{r['isreportuser']} isreportenter: #{r['isreportenter']}"
+    end
 
-  desc 'user_delete [USER_ID]', '删除成员'
-  def user_delete(userid)
-    puts Helper.with(options).user_delete(userid)
-  end
+    desc 'message_send [OPENID, TEXT_MESSAGE]', '发送文字消息'
+    def message_send(openid, text_message)
+      puts wechat_api.message_send openid, text_message
+    end
+  else
+    desc 'group_create [GROUP_NAME]', '创建分组'
+    def group_create(group_name)
+      puts wechat_api.group_create(group_name)
+    end
 
-  desc 'user_batchdelete [USER_ID_LIST]', '批量删除成员'
-  def user_batchdelete(useridlist)
-    puts Helper.with(options).user_batchdelete(useridlist.split(','))
-  end
+    desc 'groups', '查询所有分组'
+    def groups
+      puts wechat_api.groups
+    end
 
-  desc 'batch_job_result [JOB_ID]', '获取异步任务结果'
-  def batch_job_result(job_id)
-    puts Helper.with(options).batch_job_result(job_id)
-  end
+    desc 'user_group [OPEN_ID]', '查询用户所在分组'
+    def user_group(openid)
+      puts wechat_api.user_group(openid)
+    end
 
-  desc 'batch_replaceparty [BATCH_PARTY_CSV_MEDIA_ID]', '全量覆盖部门'
-  def batch_replaceparty(batch_party_csv_media_id)
-    puts Helper.with(options).batch_replaceparty(batch_party_csv_media_id)
-  end
+    desc 'group_update [GROUP_ID, NEW_GROUP_NAME]', '修改分组名'
+    def group_update(groupid, new_group_name)
+      puts wechat_api.group_update(groupid, new_group_name)
+    end
 
-  desc 'batch_syncuser [SYNC_USER_CSV_MEDIA_ID]', '增量更新成员'
-  def batch_syncuser(sync_user_csv_media_id)
-    puts Helper.with(options).batch_syncuser(sync_user_csv_media_id)
-  end
+    desc 'user_change_group [OPEN_ID, TO_GROUP_ID]', '移动用户分组'
+    def user_change_group(openid, to_groupid)
+      puts wechat_api.user_change_group(openid, to_groupid)
+    end
 
-  desc 'batch_replaceuser [BATCH_USER_CSV_MEDIA_ID]', '全量覆盖成员'
-  def batch_replaceuser(batch_user_csv_media_id)
-    puts Helper.with(options).batch_replaceuser(batch_user_csv_media_id)
-  end
+    desc 'group_delete [GROUP_ID]', '删除分组'
+    def group_delete(groupid)
+      puts wechat_api.group_delete(groupid)
+    end
 
-  desc 'user_group [OPEN_ID]', '查询用户所在分组'
-  def user_group(openid)
-    puts Helper.with(options).user_group(openid)
+    desc 'users', '关注者列表'
+    def users
+      puts wechat_api.users
+    end
   end
 
-  desc 'user_change_group [OPEN_ID, TO_GROUP_ID]', '移动用户分组'
-  def user_change_group(openid, to_groupid)
-    puts Helper.with(options).user_change_group(openid, to_groupid)
+  desc 'user [OPEN_ID]', '获取用户基本信息'
+  def user(open_id)
+    puts wechat_api.user(open_id)
   end
 
   desc 'user_update_remark [OPEN_ID, REMARK]', '设置备注名'
   def user_update_remark(openid, remark)
-    puts Helper.with(options).user_update_remark(openid, remark)
+    puts wechat_api.user_update_remark(openid, remark)
   end
 
   desc 'qrcode_create_scene [SCENE_ID, EXPIRE_SECONDS]', '请求临时二维码'
   def qrcode_create_scene(scene_id, expire_seconds = 604800)
-    puts Helper.with(options).qrcode_create_scene(scene_id, expire_seconds)
+    puts wechat_api.qrcode_create_scene(scene_id, expire_seconds)
   end
 
   desc 'qrcode_create_limit_scene [SCENE_ID_OR_STR]', '请求永久二维码'
   def qrcode_create_limit_scene(scene_id_or_str)
-    puts Helper.with(options).qrcode_create_limit_scene(scene_id_or_str)
+    puts wechat_api.qrcode_create_limit_scene(scene_id_or_str)
   end
 
   desc 'menu', '当前菜单'
   def menu
-    puts Helper.with(options).menu
+    puts wechat_api.menu
   end
 
   desc 'menu_delete', '删除菜单'
   def menu_delete
-    puts 'Menu deleted' if Helper.with(options).menu_delete
+    puts 'Menu deleted' if wechat_api.menu_delete
   end
 
   desc 'menu_create [MENU_YAML_PATH]', '创建菜单'
   def menu_create(menu_yaml_path)
     menu = YAML.load(File.read(menu_yaml_path))
-    puts 'Menu created' if Helper.with(options).menu_create(menu)
+    puts 'Menu created' if wechat_api.menu_create(menu)
   end
 
   desc 'media [MEDIA_ID, PATH]', '媒体下载'
   def media(media_id, path)
-    tmp_file = Helper.with(options).media(media_id)
+    tmp_file = wechat_api.media(media_id)
     FileUtils.mv(tmp_file.path, path)
     puts 'File downloaded'
   end
@@ -329,12 +297,12 @@ HELP
   desc 'media_create [MEDIA_TYPE, PATH]', '媒体上传'
   def media_create(type, path)
     file = File.new(path)
-    puts Helper.with(options).media_create(type, file)
+    puts wechat_api.media_create(type, file)
   end
 
   desc 'material [MEDIA_ID, PATH]', '永久媒体下载'
   def material(media_id, path)
-    tmp_file = Helper.with(options).material(media_id)
+    tmp_file = wechat_api.material(media_id)
     FileUtils.mv(tmp_file.path, path)
     puts 'File downloaded'
   end
@@ -342,46 +310,43 @@ HELP
   desc 'material_add [MEDIA_TYPE, PATH]', '永久媒体上传'
   def material_add(type, path)
     file = File.new(path)
-    puts Helper.with(options).material_add(type, file)
+    puts wechat_api.material_add(type, file)
   end
 
   desc 'material_delete [MEDIA_ID]', '删除永久素材'
   def material_delete(media_id)
-    puts Helper.with(options).material_delete(media_id)
+    puts wechat_api.material_delete(media_id)
   end
 
   desc 'material_count', '获取永久素材总数'
   def material_count
-    puts Helper.with(options).material_count
+    puts wechat_api.material_count
   end
 
   desc 'material_list [TYPE, OFFSET, COUNT]', '获取永久素材列表'
   def material_list(type, offset, count)
-    r = Helper.with(options).material_list(type, offset, count)
+    r = wechat_api.material_list(type, offset, count)
     if %w(image voice video file).include?(type)
       puts "errcode: #{r['errcode']} errmsg: #{r['errmsg']} total_count: #{r['total_count']} item_count: #{r['item_count']}"
-      r['item'].each do |i|
-        puts "#{i['media_id']} #{i['name']} #{Time.at(i['update_time'].to_i)}"
+      if wechat_api.is_a?(Wechat::CorpApi)
+        r['itemlist'].each { |i| puts "#{i['media_id']} #{i['filename']} #{Time.at(i['update_time'].to_i)}" }
+      else
+        r['item'].each { |i| puts "#{i['media_id']} #{i['name']} #{Time.at(i['update_time'].to_i)}" }
       end
     else
       puts r
     end
   end
 
-  desc 'message_send [OPENID, TEXT_MESSAGE]', '发送文字消息(仅企业号)'
-  def message_send(openid, text_message)
-    puts Helper.with(options).message_send openid, text_message
-  end
-
   desc 'custom_text [OPENID, TEXT_MESSAGE]', '发送文字客服消息'
   def custom_text(openid, text_message)
-    puts Helper.with(options).custom_message_send Wechat::Message.to(openid).text(text_message)
+    puts wechat_api.custom_message_send Wechat::Message.to(openid).text(text_message)
   end
 
   desc 'custom_image [OPENID, IMAGE_PATH]', '发送图片客服消息'
   def custom_image(openid, image_path)
     file = File.new(image_path)
-    api = Helper.with(options)
+    api = wechat_api
 
     media_id = api.media_create('image', file)['media_id']
     puts api.custom_message_send Wechat::Message.to(openid).image(media_id)
@@ -390,7 +355,7 @@ HELP
   desc 'custom_voice [OPENID, VOICE_PATH]', '发送语音客服消息'
   def custom_voice(openid, voice_path)
     file = File.new(voice_path)
-    api = Helper.with(options)
+    api = wechat_api
 
     media_id = api.media_create('voice', file)['media_id']
     puts api.custom_message_send Wechat::Message.to(openid).voice(media_id)
@@ -401,7 +366,7 @@ HELP
   method_option :description, aliases: '-d', desc: '视频描述'
   def custom_video(openid, video_path)
     file = File.new(video_path)
-    api = Helper.with(options)
+    api = wechat_api
 
     api_opts = options.slice(:title, :description)
     media_id = api.media_create('video', file)['media_id']
@@ -414,7 +379,7 @@ HELP
   method_option :HQ_music_url, aliases: '-u', desc: '高质量音乐URL链接'
   def custom_music(openid, thumbnail_path, music_url)
     file = File.new(thumbnail_path)
-    api = Helper.with(options)
+    api = wechat_api
 
     api_opts = options.slice(:title, :description, :HQ_music_url)
     thumb_media_id = api.media_create('thumb', file)['thumb_media_id']
@@ -424,13 +389,13 @@ HELP
   desc 'custom_news [OPENID, NEWS_YAML_PATH]', '发送图文客服消息'
   def custom_news(openid, news_yaml_path)
     articles = YAML.load(File.read(news_yaml_path))
-    puts Helper.with(options).custom_message_send Wechat::Message.to(openid).news(articles['articles'])
+    puts wechat_api.custom_message_send Wechat::Message.to(openid).news(articles['articles'])
   end
 
   desc 'template_message [OPENID, TEMPLATE_YAML_PATH]', '模板消息接口'
   def template_message(openid, template_yaml_path)
     template = YAML.load(File.read(template_yaml_path))
-    puts Helper.with(options).template_message_send Wechat::Message.to(openid).template(template['template'])
+    puts wechat_api.template_message_send Wechat::Message.to(openid).template(template['template'])
   end
 end
 

data/lib/generators/wechat/templates/app/controllers/wechats_controller.rb

@@ -81,7 +81,7 @@ class WechatsController < ApplicationController
   end
 
   on :event, with: 'unsubscribe' do |request|
-    request.reply.text "#{request[:FromUserName]} can not receive this message"
+    request.reply.success # user can not receive this message
   end
 
   # When user enter the app / agent app

data/lib/wechat.rb

@@ -1,3 +1,4 @@
+require 'wechat/api_loader'
 require 'wechat/api'
 require 'wechat/corp_api'
 require 'action_controller/wechat_responder'
@@ -19,18 +20,7 @@ module Wechat
   attr_reader :config
 
   def self.config
-    @config ||= begin
-      if defined? Rails
-        config_file = Rails.root.join('config/wechat.yml')
-        config = YAML.load(ERB.new(File.new(config_file).read).result)[Rails.env] if File.exist?(config_file)
-      end
-
-      config ||= config_from_environment
-      config.symbolize_keys!
-      config[:access_token] ||= Rails.root.join('tmp/access_token').to_s
-      config[:jsapi_ticket] ||= Rails.root.join('tmp/jsapi_ticket').to_s
-      OpenStruct.new(config)
-    end
+    @config ||= ApiLoader.loading_config
   end
 
   def self.api
@@ -40,19 +30,4 @@ module Wechat
       @api ||= Api.new(config.appid, config.secret, config.access_token, config.skip_verify_ssl, config.jsapi_ticket)
     end
   end
-
-  private
-
-  def self.config_from_environment
-    { appid: ENV['WECHAT_APPID'],
-      secret: ENV['WECHAT_SECRET'],
-      corpid: ENV['WECHAT_CORPID'],
-      corpsecret: ENV['WECHAT_CORPSECRET'],
-      agentid: ENV['WECHAT_AGENTID'],
-      token: ENV['WECHAT_TOKEN'],
-      access_token: ENV['WECHAT_ACCESS_TOKEN'],
-      encrypt_mode: ENV['WECHAT_ENCRYPT_MODE'],
-      skip_verify_ssl: ENV['WECHAT_SKIP_VERIFY_SSL'],
-      encoding_aes_key: ENV['WECHAT_ENCODING_AES_KEY'] }
-  end
 end

data/lib/wechat/api_base.rb

@@ -1,5 +1,3 @@
-require 'cgi'
-
 module Wechat
   class ApiBase
     attr_reader :access_token, :client
@@ -11,7 +9,7 @@ module Wechat
     end
 
     def qrcode(ticket)
-      client.get 'showqrcode', ticket: CGI.escape(ticket), base: MP_BASE, as: :file
+      client.get 'showqrcode', params: { ticket: ticket }, base: MP_BASE, as: :file
     end
 
     def media(media_id)

data/lib/wechat/api_loader.rb

@@ -0,0 +1,65 @@
+module Wechat
+  class ApiLoader
+    def self.with(options)
+      c = loading_config
+
+      token_file = options[:toke_file] || c.access_token || '/var/tmp/wechat_access_token'
+
+      if c.appid && c.secret && token_file.present?
+        Wechat::Api.new(c.appid, c.secret, token_file, c.skip_verify_ssl)
+      elsif c.corpid && c.corpsecret && token_file.present?
+        Wechat::CorpApi.new(c.corpid, c.corpsecret, token_file, c.agentid, c.skip_verify_ssl)
+      else
+        puts <<-HELP
+Need create ~/.wechat.yml with wechat appid and secret
+or running at rails root folder so wechat can read config/wechat.yml
+HELP
+        exit 1
+      end
+    end
+
+    def self.loading_config
+      if defined?(::Rails)
+        config_file = Rails.root.join('config/wechat.yml')
+        config = YAML.load(ERB.new(File.read(config_file)).result)[Rails.env] if File.exist?(config_file)
+      else
+        rails_config_file = File.join(Dir.getwd, 'config/wechat.yml')
+        home_config_file = File.join(Dir.home, '.wechat.yml')
+
+        if File.exist?(rails_config_file)
+          config = YAML.load(ERB.new(File.read(rails_config_file)).result)['default']
+          if config.present? && (config['appid'] || config['corpid'])
+            puts 'Using rails project config/wechat.yml default setting...'
+          else
+            config = {}
+          end
+        end
+
+        if config.blank? && File.exist?(home_config_file)
+          config = YAML.load ERB.new(File.read(home_config_file)).result
+        end
+      end
+
+      config ||= config_from_environment
+      if defined?(::Rails)
+        config[:access_token] ||= Rails.root.join('tmp/access_token').to_s
+        config[:jsapi_ticket] ||= Rails.root.join('tmp/jsapi_ticket').to_s
+      end
+      config.symbolize_keys!
+      OpenStruct.new(config)
+    end
+
+    def self.config_from_environment
+      { appid: ENV['WECHAT_APPID'],
+        secret: ENV['WECHAT_SECRET'],
+        corpid: ENV['WECHAT_CORPID'],
+        corpsecret: ENV['WECHAT_CORPSECRET'],
+        agentid: ENV['WECHAT_AGENTID'],
+        token: ENV['WECHAT_TOKEN'],
+        access_token: ENV['WECHAT_ACCESS_TOKEN'],
+        encrypt_mode: ENV['WECHAT_ENCRYPT_MODE'],
+        skip_verify_ssl: ENV['WECHAT_SKIP_VERIFY_SSL'],
+        encoding_aes_key: ENV['WECHAT_ENCODING_AES_KEY'] }
+    end
+  end
+end

data/lib/wechat/message.rb

@@ -73,6 +73,10 @@ module Wechat
       update(MsgType: 'transfer_customer_service')
     end
 
+    def success
+      update(MsgType: 'success')
+    end
+
     def image(media_id)
       update(MsgType: 'image', Image: { MediaId: media_id })
     end

data/lib/wechat/responder.rb

@@ -200,7 +200,11 @@ module Wechat
     end
 
     def process_response(response)
-      msg = response.to_xml
+      if response[:MsgType] == 'success'
+        msg = 'success'
+      else
+        msg = response.to_xml
+      end
 
       if self.class.encrypt_mode
         encrypt = Base64.strict_encode64(encrypt(pack(msg, @app_id), self.class.encoding_aes_key))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  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: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +115,7 @@ files:
 - lib/wechat/access_token.rb
 - lib/wechat/api.rb
 - lib/wechat/api_base.rb
+- lib/wechat/api_loader.rb
 - lib/wechat/cipher.rb
 - lib/wechat/client.rb
 - lib/wechat/corp_api.rb