eric_weixin 0.0.7 → 0.0.8

data/lib/eric_weixin/app/model/reply_message_rule.rb

@@ -13,9 +13,6 @@ class EricWeixin::ReplyMessageRule < ActiveRecord::Base
       options = get_arguments_options options, [:weixin_public_account_id, :key_word, :reply_message, :key_word_type, :order, :reply_type], is_valid: true
       ::EricWeixin::ReplyMessageRule.transaction do
         reply_message_rule = ::EricWeixin::ReplyMessageRule.new options
-        public_account = ::EricWeixin::PublicAccount.find(options[:weixin_public_account_id])
-        reply_message_rule.weixin_app_id = public_account.weixin_app_id
-        reply_message_rule.weixin_secret_key = public_account.weixin_secret_key
         reply_message_rule.save!
         reply_message_rule
       end
@@ -26,34 +23,31 @@ class EricWeixin::ReplyMessageRule < ActiveRecord::Base
       EricWeixin::ReplyMessageRule.transaction do
         rule = EricWeixin::ReplyMessageRule.find(rule_id)
         rule.update_attributes(options)
-        public_account = ::EricWeixin::PublicAccount.find(options[:weixin_public_account_id])
-        rule.weixin_app_id = public_account.weixin_app_id
-        rule.weixin_secret_key = public_account.weixin_secret_key
         rule.save!
         rule
       end
     end
 
-    def process_rule(receive_message, secret_key)
+    def process_rule(receive_message, public_account)
       business_type = "#{receive_message[:MsgType]}~#{receive_message[:Event]}"
-
-      pa = EricWeixin::PublicAccount.find_by_weixin_number receive_message[:ToUserName]
+      pa = ::EricWeixin::PublicAccount.find_by_weixin_number receive_message[:ToUserName]
       log = ::EricWeixin::MessageLog.create_public_account_receive_message_log openid: receive_message[:FromUserName],
-                                                                         app_id: pa.weixin_app_id,
-                                                                         message_type: receive_message[:MsgType],
-                                                                         message_id: receive_message[:MsgId],
-                                                                         data: receive_message.to_json,
-                                                                         process_status: 0, #在这里假设都处理完毕，由业务引起的更新请在工程的Process中进行修改。
-                                                                         event_name: receive_message[:Event],
-                                                                         create_time: receive_message[:CreateTime]
+                                                                               weixin_public_account_id: pa.id,
+                                                                               message_type: receive_message[:MsgType],
+                                                                               message_id: receive_message[:MsgId],
+                                                                               data: receive_message.to_json,
+                                                                               process_status: 0, #在这里假设都处理完毕，由业务引起的更新请在工程的Process中进行修改。
+                                                                               event_name: receive_message[:Event],
+                                                                               event_key: receive_message[:EventKey], #事件值
+                                                                               create_time: receive_message[:CreateTime]
 
       reply_message = case business_type
                         #订阅
                         when /event~subscribe/
                           result = ::Weixin::Process.subscribe receive_message
                           if result == true
-                            ::EricWeixin::WeixinUser.create_weixin_user secret_key, receive_message[:FromUserName]
-                            match_key_words 'subscribe', secret_key, receive_message
+                            ::EricWeixin::WeixinUser.create_weixin_user public_account.id, receive_message[:FromUserName],receive_message[:EventKey]
+                            match_key_words 'subscribe', public_account.id, receive_message
                           else
                             result
                           end
@@ -62,8 +56,8 @@ class EricWeixin::ReplyMessageRule < ActiveRecord::Base
                         when /event~unsubscribe/
                           result = ::Weixin::Process.unsubscribe receive_message
                           if result == true
-                            ::EricWeixin::WeixinUser.create_weixin_user secret_key, receive_message[:FromUserName]
-                            match_key_words 'unsubscribe', secret_key, receive_message
+                            ::EricWeixin::WeixinUser.create_weixin_user public_account.id, receive_message[:FromUserName]
+                            ''
                           else
                             result
                           end
@@ -72,7 +66,16 @@ class EricWeixin::ReplyMessageRule < ActiveRecord::Base
                         when /event~CLICK/
                           result = ::Weixin::Process.click_event receive_message[:EventKey], receive_message
                           if result == true
-                            match_key_words receive_message[:EventKey], secret_key, receive_message
+                            match_key_words receive_message[:EventKey], public_account.id, receive_message
+                          else
+                            result
+                          end
+
+                        #点击消息
+                        when /event~SCAN/
+                          result = ::Weixin::Process.scan_event receive_message[:EventKey], receive_message
+                          if result == true
+                            match_key_words "scan_#{receive_message[:EventKey]}", public_account.id, receive_message, false
                           else
                             result
                           end
@@ -86,7 +89,16 @@ class EricWeixin::ReplyMessageRule < ActiveRecord::Base
                             result
                           end
 
-                        #用户上报地理位置
+                        #用户自动上报地理位置信息
+                        when /event~LOCATION/
+                          result = ::Weixin::Process.auto_location_event receive_message
+                          if result == true
+                            ''
+                          else
+                            result
+                          end
+
+                        #用户共享地理位置信息
                         when /location/
                           result = ::Weixin::Process.location_event receive_message
                           if result == true
@@ -105,7 +117,7 @@ class EricWeixin::ReplyMessageRule < ActiveRecord::Base
                         when /text~/
                           result = ::Weixin::Process.text_event receive_message[:Content], receive_message
                           if result == true
-                            match_key_words receive_message[:Content], secret_key, receive_message
+                            match_key_words receive_message[:Content], public_account.id, receive_message
                           else
                             result
                           end
@@ -114,24 +126,32 @@ class EricWeixin::ReplyMessageRule < ActiveRecord::Base
                         else
                           result = ::Weixin::Process.another_event receive_message
                           if result == true
-                            match_key_words 'unknow~words', secret_key, receive_message
+                            match_key_words 'unknow~words', public_account.id, receive_message
                           else
                             result
                           end
                       end
       "message_to_wechat:".to_logger
       reply_message.to_logger
-      log.passive_reply_message = reply_message.to_s
-      log.save!
+      unless receive_message.to_s.blank?
+        log.passive_reply_message = reply_message.to_s
+        log.save!
+      end
+
       reply_message
     end
 
-    def match_key_words wx_key_word, secret_key, receive_message
+    def match_key_words wx_key_word, public_account_id, receive_message,need_to_mult_service=true
       matched_rule = EricWeixin::ReplyMessageRule.order(order: :desc).
-          where(:key_word => wx_key_word, :weixin_secret_key => secret_key).first
+          where(:key_word => wx_key_word, :weixin_public_account_id => public_account_id, :key_word_type=>(receive_message[:MsgType]||"keyword")).first
       if matched_rule.nil?
-        return EricWeixin::ReplyMessage::transfer_mult_customer_service ToUserName: receive_message[:FromUserName],
-                                                                        FromUserName: receive_message[:ToUserName]
+        if need_to_mult_service
+          return EricWeixin::ReplyMessage::transfer_mult_customer_service ToUserName: receive_message[:FromUserName],
+                                                                          FromUserName: receive_message[:ToUserName]
+        else
+          return '' #当匹配不上，也不需要去多客服的时候，就直接返回。
+        end
+
       end
       reply_msg = case matched_rule.reply_type
                     when "text"
@@ -144,7 +164,7 @@ class EricWeixin::ReplyMessageRule < ActiveRecord::Base
                                                                                   FromUserName: receive_message[:ToUserName],
                                                                                   news: weixin_news.weixin_articles
                     when "wx_function"
-                      Weixin::WeixinAutoReplyFunctions.send(matched_rule.reply_message, {:key_word => wx_key_word, :receive_message => receive_message})
+                      ::Weixin::WeixinAutoReplyFunctions.send(matched_rule.reply_message, ({:key_word => wx_key_word, :receive_message => receive_message}))
                   end
       reply_msg
     end

data/lib/eric_weixin/app/model/template_message_log.rb

@@ -13,6 +13,7 @@ class EricWeixin::TemplateMessageLog < ActiveRecord::Base
     #                                                      template_id: "WdYZPTwhAMc59aKGs5SUCxRw9xqOM-eOkvGJlZpQahk",
     #                                                      topcolor: '#00FF00',
     #                                                      url: 'www.baidu.com',
+    #                                                      public_account_id: 1,
     #                                                      data: {
     #                                                          first: {value: 'xx'},
     #                                                          keyword1: {value: '王小明'},
@@ -21,8 +22,8 @@ class EricWeixin::TemplateMessageLog < ActiveRecord::Base
     #                                                          keyword4: {value: '小明同学今天上课表现很别棒，很认真。手工都自己做的，依恋家长比较严重。'},
     #                                                          keyword5: {value: '总体来讲还很不错，心理上缺乏安全感，需要家长多陪同。'},
     #                                                          remark: {value: ''}
-    #                                                      },
-    #                                                      app_id: "wx4564afc37fac0ebf"
+    #                                                      }
+
     def send_template_message options
       BusinessException.raise '没有接收对象' if options[:openid].blank?
       BusinessException.raise '模板未指定' if options[:template_id].blank?
@@ -35,9 +36,16 @@ class EricWeixin::TemplateMessageLog < ActiveRecord::Base
           :topcolor => options[:topcolor],
           :data => options[:data]
       }.to_json
-      token = EricWeixin::AccessToken.get_valid_access_token(:weixin_secret_key => EricWeixin::PublicAccount.get_secret(options[:app_id]))
+
+      #todo 在日志表中补充模板信息
+
+      public_account = ::EricWeixin::PublicAccount.find_by_id options[:public_account_id]
+      token = EricWeixin::AccessToken.get_valid_access_token_by_app_id app_id: public_account.weixin_app_id
+
+
       response = RestClient.post "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=#{token}", message_json
       response = JSON.parse response.body
+      pp response
       log = EricWeixin::TemplateMessageLog.new openid: options[:openid],
                                                url: options[:url],
                                                template_id: options[:template_id],
@@ -45,7 +53,7 @@ class EricWeixin::TemplateMessageLog < ActiveRecord::Base
                                                data: options[:data].to_json,
                                                message_id: response["msgid"],
                                                error_code: response["errcode"],
-                                               app_id: options[:app_id]
+                                               weixin_public_account_id: options[:public_account_id]
       log.save!
     end
 

data/lib/eric_weixin/app/model/two_dimension_code.rb

@@ -0,0 +1,146 @@
+class EricWeixin::TwoDimensionCode < ActiveRecord::Base
+  self.table_name = "weixin_two_dimension_codes"
+  validates_uniqueness_of :scene_str, :allow_blank => true, :message => "永久二维码健值重复", if: Proc.new { |code| code.action_name == 'QR_LIMIT_STR_SCENE' }
+  validates_presence_of :scene_str, message: '永久二维码健值不能为空。', if: Proc.new { |code| code.action_name == 'QR_LIMIT_STR_SCENE' }
+  validate :check_scene_str_length
+
+  def check_scene_str_length
+    return if self.scene_str.blank?
+    BusinessException.raise '永久性二维码场景值不能超过64位' if self.scene_str.length > 64
+  end
+
+  def encode_ticket
+    CGI::escape(self.ticket)
+  end
+
+  def image_url
+    "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=#{self.encode_ticket}"
+  end
+
+  # 获取永久性二维码对象。
+  # 典型使用场景如下：
+  # 1.第一步调用此方法先创建/获取二维码对象。
+  # 2.使用二维码对象获取二维码下载、展示链接。 如：two_dimension_code.image_url
+  # 3.尽情享受带参数的永久二维码吧，很简单，有木有？
+  # ===参数描述：
+  # * app_id 微信app_id
+  # * scene_str 场景值，字符串长度不能超过64位,亦不能为空。
+  # * action_info 场景值描述（可选）
+  # 调用示例：
+  #  EricWeixin::TwoDimensionCode.get_long_time_two_dimension_code app_id: 'wx51729870d9012531', scene_str: 'abc', action_info: 'hello'
+  #  EricWeixin::TwoDimensionCode.get_long_time_two_dimension_code app_id: 'wx51729870d9012531', scene_str: 'bus'
+  def self.get_long_time_two_dimension_code options
+    BusinessException.raise '场景值不能为空' if options[:scene_str].blank?
+    BusinessException.raise '场景值不能超过64字符' if options[:scene_str].length > 63
+    EricWeixin::TwoDimensionCode.transaction do
+      public_account = EricWeixin::PublicAccount.find_by_weixin_app_id options[:app_id]
+      BusinessException.raise 'app_id不存在' if public_account.blank?
+      codes = public_account.two_dimension_codes.where scene_str: options[:scene_str],
+                                                       action_name: "QR_LIMIT_STR_SCENE"
+      code = if codes.blank?
+               code = EricWeixin::TwoDimensionCode.new weixin_public_account_id: public_account.id,
+                                                       action_name: "QR_LIMIT_STR_SCENE",
+                                                       action_info: options[:action_info],
+                                                       scene_str: options[:scene_str],
+                                                       expire_at: Time.now.chinese_format +
+               code.save!
+               code
+             else
+               codes[0]
+             end
+      if not code.ticket.blank?
+        return code  #永久性二维码，不需要再次进行更新。
+      end
+      token = ::EricWeixin::AccessToken.get_valid_access_token_by_app_id app_id: options[:app_id]
+      url = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=#{token}"
+      json = {:action_name => 'QR_LIMIT_STR_SCENE',
+              :action_info => {
+                  :scene => {
+                      :scene_str => options[:scene_str]
+                  }
+              }}.to_json
+      response = RestClient.post url, json
+      response = JSON.parse response.body
+      pp response
+      code.ticket = response["ticket"]
+      code.url = response["url"]
+      code.save!
+      code
+    end
+  end
+
+
+  # 获取临时二维码对象。
+  # 典型使用场景如下：
+  # 1.第一步调用此方法先创建/获取二维码对象。
+  # 2.使用二维码对象获取二维码下载、展示链接。 如：two_dimension_code.image_url
+  # 3.尽情享受带参数的永久二维码吧，很简单，有木有？
+  # ===参数描述：
+  # * app_id 微信app_id
+  # * scene_id 场景值，应该是一个数字
+  # * expire_seconds 过期时间，默认为604800秒，可选
+  # 调用示例：
+  #  EricWeixin::TwoDimensionCode.get_short_time_two_dimension_code app_id: 'wx51729870d9012531', scene_id: 1, expire_seconds: 3600
+  #  EricWeixin::TwoDimensionCode.get_short_time_two_dimension_code app_id: 'wx51729870d9012531', scene_id: 2300
+  def self.get_short_time_two_dimension_code options
+    BusinessException.raise '场景值不能为空' if options[:scene_id].blank?
+
+    EricWeixin::TwoDimensionCode.transaction do
+      public_account = EricWeixin::PublicAccount.find_by_weixin_app_id options[:app_id]
+      BusinessException.raise 'app_id不存在' if public_account.blank?
+      codes = public_account.two_dimension_codes.where ["scene_id = ? and action_name = ? and expire_at > ?",
+                                                        options[:scene_id],
+                                                        "QR_SCENE",
+                                                        Time.now.chinese_format
+                                                       ]
+
+      code = if codes.blank?
+               code = EricWeixin::TwoDimensionCode.new weixin_public_account_id: public_account.id,
+                                                       action_name: "QR_SCENE",
+                                                       scene_id: options[:scene_id],
+                                                       expire_at: (Time.now + (options[:expire_seconds]||604800).to_i)
+               code.save!
+               code
+             else
+               codes[0]
+             end
+      if not code.ticket.blank?
+        return code  #永久性二维码，不需要再次进行更新。
+      end
+      token = ::EricWeixin::AccessToken.get_valid_access_token_by_app_id app_id: options[:app_id]
+      url = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=#{token}"
+      json = {:action_name => 'QR_SCENE',
+              :expire_seconds => (options[:expire_seconds]||604800).to_i,
+              :action_info => {
+                  :scene => {
+                      :scene_id => options[:scene_id]
+                  }
+              }}.to_json
+      response = RestClient.post url, json
+      response = JSON.parse response.body
+      pp response
+      code.ticket = response["ticket"]
+      code.url = response["url"]
+      code.expire_at = Time.now + (options[:expire_seconds]||604800).to_i
+      code.save!
+      code
+    end
+  end
+
+  # 长URL转短URL
+  # ===参数说明：
+  # * app_id 微信公众账号的app_id
+  # * url 需要转短url的链接
+  # ===调用示例：
+  #  EricWeixin::TwoDimensionCode.short_url app_id: 'wx51729870d9012531', url: 'http://mp.weixin.qq.com/wiki/10/165c9b15eddcfbd8699ac12b0bd89ae6.html'
+  def self.short_url options
+    access_token = EricWeixin::AccessToken.get_valid_access_token_by_app_id app_id: options[:app_id]
+    url = "https://api.weixin.qq.com/cgi-bin/shorturl?access_token=#{access_token}"
+    response = RestClient.post url, {action: "long2short", long_url: options[:url]}.to_json
+    response = JSON.parse(response.body)
+    response["short_url"]
+  end
+
+end
+
+# EricWeixin::TwoDimensionCode.get_long_time_two_dimension_code app_id: 'wx51729870d9012531', scene_str: 'abc', action_info: 'hello'

data/lib/eric_weixin/app/model/weixin_user.rb

@@ -2,8 +2,8 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
   SEX = {1=>'男' , 2=>'女', 0=>'未知'}
   belongs_to :member_info
   belongs_to :weixin_public_account, :class_name => '::EricWeixin::PublicAccount', :foreign_key => 'weixin_public_account_id'
-  validates_uniqueness_of :openid, scope: :weixin_secret_key
-  validates_presence_of :openid, :weixin_secret_key, :weixin_public_account
+  validates_uniqueness_of :openid, scope: :weixin_public_account_id
+  validates_presence_of :openid, :weixin_public_account_id
 
 
   def nickname
@@ -18,39 +18,42 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
 
   class << self
 
-    ##
     # ===业务说明：创建、更新微信用户
     # * 微信用户在关注、取消关注时更新用户信息。
     # * 当用户关注微信时，创建用户。
     # * 当用户取消关注时，把用户标记为取消关注
     # ===参数说明
-    # * secret_key::公众账号的secret_key,其值取决于公众账号的设置。
+    # * public_account_id::公众账号的数据库存储id
     # * openid::用户的openid,微信服务器传送过来。
     # ===调用方法
     #  EricWeixin::WeixinUser.create_weixin_user 'adsfkj', 'sdfdf'
     #  EricWeixin::WeixinUser.create_weixin_user 'adsfkj', 'sdfdf'
     # ====返回
     # 正常情况下返回当前微信用户 <tt>::EricWeixin::WeixinUser</tt>，抛出异常时错误查看异常信息。
-    def create_weixin_user(secret_key, openid)
-      public_account = ::EricWeixin::PublicAccount.find_by_weixin_secret_key(secret_key)
+    def create_weixin_user(public_account_id, openid, channel=nil)
+      public_account = ::EricWeixin::PublicAccount.find_by_id(public_account_id)
       ::EricWeixin::ReplyMessageRule.transaction do
-        weixin_user = ::EricWeixin::WeixinUser.where(openid: openid, weixin_secret_key: secret_key).first
+        weixin_user = ::EricWeixin::WeixinUser.where(openid: openid, weixin_public_account_id: public_account.id).first
         if weixin_user.blank?
           weixin_user = ::EricWeixin::WeixinUser.new openid: openid,
-                                       weixin_secret_key: secret_key,
                                        weixin_public_account_id: public_account.id
           weixin_user.save!
         end
         wx_user_data = public_account.get_user_data_from_weixin_api openid
         weixin_user.update_attributes(wx_user_data.select{|k,v| ["subscribe", "openid", "nickname", "sex", "language", "city", "province", "country", "headimgurl", "subscribe_time", "remark"].include? k })
+        if not channel.blank?
+          weixin_user.first_register_channel = channel if weixin_user.first_register_channel.blank?
+          weixin_user.last_register_channel = channel
+          weixin_user.save!
+        end
         weixin_user
       end
     end
 
 
-    def export_users_to_csv(weixin_secret_key)
+    def export_users_to_csv(public_account_id)
       require 'csv'
-      weixin_users = ::EricWeixin::WeixinUser.where(weixin_secret_key: weixin_secret_key)
+      weixin_users = ::EricWeixin::WeixinUser.where(weixin_public_account_id: public_account_id)
       CSV.generate do |csv|
         csv << ["订阅状态", "openid", "昵称", "性别", "语言", "城市", "省份", "国家", "订阅时间"]
         weixin_users.each do |weixin_user|

data/lib/eric_weixin/app/moudles/mult_customer.rb

@@ -39,11 +39,11 @@ module EricWeixin::MultCustomer
     response = RestClient.post url, post_data.to_json
     response = JSON.parse response.body
     ::EricWeixin::MessageLog.transaction do
-      message = ::EricWeixin::MessageLog.where(message_id: options[:message_id])
+      message = ::EricWeixin::MessageLog.where(message_id: options[:message_id]).first
       message_id = if message.blank? then
                      nil
                    else
-                     message.first.id
+                     message.id
                    end
       ::EricWeixin::MessageLog.create_public_account_send_message_log openid: options[:openid],
                                                                       app_id: options[:app_id],

data/lib/eric_weixin/app/moudles/snsapi.rb

@@ -10,13 +10,13 @@ module EricWeixin::Snsapi
   # * schema_host 当前项目的域名(包含http://)：如http://www.baidu.com
   # * state 这个参数可以直接带到业务页面。
   # ===调用示例
-  #  EricWeixin::Snsapi.get_snsapi_uri url:'/weixin/service1/ddd?a=1', app_id: 'wx4564afc37fac0ebf', schema_host: "http://lxq.mdcc.com"
+  #  EricWeixin::Snsapi.get_snsapi_base_url url:'/weixin/service1/ddd?a=1', app_id: 'wx51729870d9012531', schema_host: "http://lxq.mdcc.club"
   def self.get_snsapi_base_url options
     require 'base64'
     p_zhongzhuan = []
     p_zhongzhuan_host_path = "#{options[:schema_host]}/weixin/snsapi"
     p_zhongzhuan << ["weixin_app_id", options[:app_id]]
-    p_zhongzhuan << ["url", Base64.encode64(options[:url])]
+    p_zhongzhuan << ["url", Base64.encode64(options[:url]).gsub(/\n/,'')]
     p_zhongzhuan = URI.encode_www_form p_zhongzhuan
     p_zhongzhuan = CGI::unescape p_zhongzhuan
     p_zhongzhuan_url = [p_zhongzhuan_host_path, p_zhongzhuan].join('?')
@@ -46,13 +46,13 @@ module EricWeixin::Snsapi
   # * schema_host 当前项目的域名(包含http://)：如http://www.baidu.com
   # * state 这个参数可以直接带到业务页面。
   # ===调用示例
-  #  EricWeixin::Snsapi.get_snsapi_userinfo_url url:'/weixin/service1/ddd?a=1', app_id: 'wx4564afc37fac0ebf', schema_host: "http://lxq.mdcc.club"
+  #  EricWeixin::Snsapi.get_snsapi_userinfo_url url:'/weixin/service1/ddd?a=1', app_id: 'wx51729870d9012531', schema_host: "http://lxq.mdcc.club"
   def self.get_snsapi_userinfo_url options
     require 'base64'
     p_zhongzhuan = []
     p_zhongzhuan_host_path = "#{options[:schema_host]}/weixin/snsuserinfo"
     p_zhongzhuan << ["weixin_app_id", options[:app_id]]
-    p_zhongzhuan << ["url", Base64.encode64(options[:url])]
+    p_zhongzhuan << ["url", Base64.encode64(options[:url]).gsub(/\n/,'')]
     p_zhongzhuan = URI.encode_www_form p_zhongzhuan
     p_zhongzhuan = CGI::unescape p_zhongzhuan
     p_zhongzhuan_url = [p_zhongzhuan_host_path, p_zhongzhuan].join('?')