eric_weixin 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80beb7d241714a87e6159fc03053106cbeaf78e5
-  data.tar.gz: 4db48304387dde424d5c27ed1dcc4ffe23afdf60
+  metadata.gz: 3f1ededcda869f5ec482457ba9299c8697b50113
+  data.tar.gz: 701440fcd6765a14d8164faa3d8b1e638a80b8cf
 SHA512:
-  metadata.gz: 47e63938b4b77e560178523949d7b02db6582100a7ad7d79afb5276f36f02e8416e8a72beb01e4aab6b62e1f80f2521f353ebdb2b66f594fde0db56eaa4c982c
-  data.tar.gz: 7b5ae164a8c2c5238aa765edebb4dfcc41ee8a9ecd945490f99b6854147f42902d062b4dd4191e9b18253b586293d57977c96646db1b5f531079029bc0328348
+  metadata.gz: a9e46d8e894d1c42ac88b0b4df879debf2335fa23877ea4a072c1294d262cc014cedee426c538f16a69acf83c87c50ad18c018e0ff877fde6551ce5ccff1301e
+  data.tar.gz: ae26b5cc10abbf9c7fa44880e5ff50eea0101e550ce065ca0b4ea6a638be32a5903ffc376cf0af3b60d7ec1b21850c92ee872f0ce9b180f607f1a8f754a9c77b

data/app/assets/stylesheets/eric_weixin/wz/base.css.scss

@@ -70,3 +70,6 @@
   }
 }
 
+body{
+  height: inherit;
+}

data/app/controllers/eric_weixin/cms/weixin/xiaodian/orders_controller.rb

@@ -1,7 +1,7 @@
 class EricWeixin::Cms::Weixin::Xiaodian::OrdersController < EricWeixin::Cms::BaseController
   def index
     @orders = EricWeixin::Xiaodian::Order.order_query params
-    @orders = @orders.order(order_create_time: :desc).paginate(per_page: params[:per_page]||6, page: params[:page]||1)
+    @orders = @orders.order(order_create_time: :desc).paginate(per_page: params[:per_page]||10, page: params[:page]||1)
   end
 
   def save_delivery_info

data/app/models/eric_weixin/weixin_user.rb

@@ -109,7 +109,7 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
       if wx_user_data["subscribe"] == 0
         weixin_user.update_attributes(wx_user_data.select { |k, v| ["subscribe"].include? k })
       else
-        weixin_user.update_attributes(wx_user_data.select { |k, v| ["subscribe", "openid", "nickname", "sex", "language", "city", "province", "country", "headimgurl", "subscribe_time", "remark"].include? k })
+        weixin_user.update_attributes(wx_user_data.select { |k, v| ["subscribe", "openid", "nickname", "sex", "language", "city", "province", "country", "headimgurl", "subscribe_time", "remark", "unionid"].include? k })
       end
     end
 
@@ -191,9 +191,49 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
       users = users.where(weixin_public_account_id: options[:weixin_public_account_id]) unless options[:weixin_public_account_id].blank?
       users = users.where("subscribe_time >= ?", options[:start_date].to_date.to_time.to_i) unless options[:start_date].blank?
       users = users.where("subscribe_time <= ?", (options[:end_date].to_date+1.day).to_time.to_i) unless options[:end_date].blank?
-      users = users.where("last_register_channel = ?", options[:last_register_channel]) unless options[:last_register_channel].blank?
-      users = users.where("first_register_channel = ?", options[:first_register_channel]) unless options[:first_register_channel].blank?
+
+      # 模糊搜索订阅微信号的来源渠道
+      prefix = 'qrscene_'
+      unless options[:last_register_channel].blank?
+        lrc = options[:last_register_channel]
+        lrc_qrcode = EricWeixin::TwoDimensionCode.where("scene_str LIKE ? OR action_info LIKE ?", "%#{lrc}%", "%#{lrc}%").first
+        pp lrc_qrcode
+        unless lrc_qrcode.blank?
+          new_lrc_qrcode = "#{prefix}#{lrc_qrcode.scene_str}"
+          users = users.where("last_register_channel = ?", new_lrc_qrcode)
+          pp new_lrc_qrcode
+          pp users
+        end
+      end
+      unless options[:first_register_channel].blank?
+        frc = options[:first_register_channel]
+        frc_qrcode = EricWeixin::TwoDimensionCode.where("scene_str LIKE ? OR action_info LIKE ?", "%#{frc}%", "%#{frc}%").first
+        unless frc_qrcode.blank?
+          new_frc_qrcode = "#{prefix}#{frc_qrcode.scene_str}"
+          users = users.where("first_register_channel = ?", new_frc_qrcode)
+        end
+      end
       users
     end
   end
+
+
+  # 本方法将注册方式处理为, 人类可读形式.
+  # 此处注册方式register_channel对应微信文档中EventKey
+  # 暂时只有一种情况, 未注册用户扫描带参数二维码, 触发subscribe事件, 返回的EventKey中, qrscene_为前缀，后面为二维码的参数值
+  # 如果是长时间二维码, 就返回二维码对应文字说明; 如果是短时间二维码(无说明), 就返回对应数字编号
+  def translate_register_channel option
+    target_channel = if option == "last_register_channel"
+                       self.last_register_channel
+                     elsif option == "first_register_channel"
+                       self.first_register_channel
+                     end
+    return '' if target_channel.blank?
+    if target_channel.match /qrscene_/
+      qrparam = target_channel.gsub(/qrscene_/, '')
+      qrcode = EricWeixin::TwoDimensionCode.where('scene_str = ?', qrparam).first
+      action_info = qrcode.action_info unless qrcode.blank?
+      return action_info.blank? ? qrparam : action_info
+    end
+  end
 end

data/app/models/eric_weixin/xiaodian/order.rb

@@ -361,6 +361,9 @@ class EricWeixin::Xiaodian::Order < ActiveRecord::Base
         :content => delivery_id.to_s,
         :file_path => Rails.root.join('public', 'uploads/barcode', file_name)
     }
+    Dir.mkdir Rails.root.join('public/uploads') unless Dir.exist? Rails.root.join('public/uploads')
+    Dir.mkdir Rails.root.join('public/uploads/barcode') unless Dir.exist? Rails.root.join('public/uploads/barcode')
+
     BarbyTools.create_barcode options # 使用tools里面的方法,代替下面这个注释过的代码块
     # barcode = Barby::Code128B.new(delivery_id.to_s)
     # blob = Barby::PngOutputter.new(barcode).to_png(:height => 20, :margin => 5) # 初始png数据

data/app/views/eric_weixin/cms/weixin/news_datas/edit.html.erb

@@ -5,16 +5,16 @@
         <%= f.label "标题" %>
       </div>
       <div class="large-9 columns">
-        <%= f.text_field :title %>
+        <%= f.text_field :title, name: 'weixin_news[title]' %>
       </div>
     </div>
     <div class="row">
-        <div class="large-3 columns">
-            <%= f.label "关键字" %>
-        </div>
-        <div class="large-9 columns">
-            <%= f.text_field :match_key %>
-        </div>
+      <div class="large-3 columns">
+        <%= f.label "关键字" %>
+      </div>
+      <div class="large-9 columns">
+        <%= f.text_field :match_key, name: 'weixin_news[match_key]' %>
+      </div>
     </div>
     <h2>图文列表：</h2>
     <div style="margin-left: 30px">

data/app/views/eric_weixin/cms/weixin/news_datas/new.html.erb

@@ -5,7 +5,7 @@
         <%= f.label "标题" %>
       </div>
       <div class="large-9 columns">
-        <%= f.text_field :title %>
+        <%= f.text_field :title, name: 'weixin_news[title]' %>
       </div>
     </div>
     <div class="row">
@@ -13,7 +13,7 @@
         <%= f.label "关键字" %>
       </div>
       <div class="large-9 columns">
-        <%= f.text_field :match_key %>
+        <%= f.text_field :match_key, name: 'weixin_news[match_key]' %>
       </div>
     </div>
     <h2>图文列表：</h2>

data/app/views/eric_weixin/cms/weixin/weixin_users/index.html.erb

@@ -70,7 +70,7 @@
   </div>
 
   <div class="columns small-2">
-    <%= select_tag :public_account_id, options_from_collection_for_select(@public_accounts, 'id', 'name', (params[:public_account_id].blank? ? '' : params[:public_account_id])), prompt: '请选择公众账号' %>
+    <%= select_tag :public_account_id, options_from_collection_for_select(@public_accounts, 'id', 'name', (params[:public_account_id].blank? ? 1 : params[:public_account_id])), prompt: '请选择公众账号' %>
   </div>
 
   <div class="columns small-2 end">
@@ -82,7 +82,7 @@
     <%= will_paginate @collection, renderer: FoundationPagination::Rails %>
 <table>
   <thead>
-  <th width="150px">openid</th> <th>是否订阅</th> <th>昵称</th> <th>性别</th> <th>语言</th> <th>城市</th> <th>省份</th> <th>国家</th> <th>头像</th> <th>关注时间</th> <th>备注</th> <th>最后一次注册渠道</th> <th>第一次注册渠道</th><th>操作</th>
+  <th width="150px">openid</th> <th>是否订阅</th> <th>昵称</th> <th>性别</th> <!--<th>语言</th>--> <th>国家 | 省份 | 城市</th> <th>头像</th> <th>关注时间</th> <th>备注</th> <th>最后一次注册渠道</th> <th>第一次注册渠道</th><th>操作</th>
   </thead>
   <tbody>
   <% @weixin_users.each do |user| %>
@@ -91,15 +91,13 @@
     <td><%= case user.subscribe when 1 then '是' when 0 then '否' end %></td>
     <td><%= user.nickname %></td>
     <td><%= case user.sex when 1 then '男' when 2 then '女' else '未知' end %></td>
-    <td><%= case user.language when 'zh_CN' then '简体中文' when 'zh_TW' then '繁体中文' when 'en' then '英文' else '其它' end %></td>
-    <td><%= user.city %></td>
-    <td><%= user.province %></td>
-    <td><%= user.country %></td>
+    <!--<td><%#= case user.language when 'zh_CN' then '简体中文' when 'zh_TW' then '繁体中文' when 'en' then '英文' else '其它' end %></td>-->
+    <td><%= user.country %> <br><%= user.province %> <br><%= user.city %></td>
     <td><%= image_tag(user.headimgurl, height: '32', width: '32') %></td>
-    <td><%= Time.at(user.subscribe_time.to_i).chinese_format %></td>
+    <td><%= Time.at(user.subscribe_time.to_i).strftime('%Y-%m-%d %H:%M') %></td>
     <td id="user_remark_<%= user.id %>"><%= user.remark %></td>
-    <td><%= user.last_register_channel %></td>
-    <td><%= user.first_register_channel %></td>
+    <td><%= user.translate_register_channel "last_register_channel" %></td>
+    <td><%= user.translate_register_channel "first_register_channel" %></td>
     <td>
       <%= link_to '备注', "javascript:open_modal(#{user.id})" %>
     </td>

data/app/views/eric_weixin/cms/weixin/xiaodian/orders/index.html.erb

@@ -72,9 +72,9 @@
   <% end %>
 <h3>订单列表</h3>
 微信小店官方物流公司：邮政EMS、申通快递、中通速递、圆通速递、天天快递、顺丰速运、韵达快运、宅急送、汇通快运、易迅快递
-<table style="width: 113%; table-layout: auto;" >
+<table style="width: 140%; table-layout: auto; margin-left: -140px" >
   <thead>
-    <th>订单ID/快递码</th>
+    <th>订单ID</th>
 
     <th>昵称</th><th>购买时间</th><th>宝贝</th><th>宝贝信息</th><th>数量</th><th>收货信息</th>
 
@@ -83,14 +83,7 @@
   <tbody>
     <% @orders.each do |order| %>
         <tr>
-          <!--<td style="word-break:break-all"><%#= order.order_id %></td>-->
-          <td width="170px">
-            <%= order.order_id %>
-            <% unless order.delivery_id.blank? %>
-              <% file_path = order.delivery_id_barcode %>
-              <%= image_tag file_path, height: '80', width: '150' %>
-            <% end %>
-          </td>
+          <td style="word-break:break-all"><%= order.order_id %></td>
           <td style="word-break:break-all"><%= order.buyer_nick rescue '' %></td>
           <td style="word-break:break-all"><%= Time.at(order.order_create_time).strftime("%Y-%m-%d %H:%M") %></td>
           <td style="word-break:break-all"><%= order.product.name rescue 'error' %></td>
@@ -120,7 +113,7 @@
               </span>
             <% end %>
           </td>
-          <td id="order_<%= order.id %>_deliver_id_td"  style="word-break:break-all">
+          <td id="order_<%= order.id %>_deliver_id_td"  style="word-break:break-all" width="170px">
             <% if order.delivery_id.blank? %>
               <%= text_field_tag "order_#{order.id}_delivery_id" %>
             <% else %>
@@ -129,11 +122,30 @@
                 <%= text_field_tag "order_#{order.id}_delivery_id", order.delivery_id %>
               </span>
             <% end %>
+
+            <% unless order.delivery_id.blank? %>
+              <% file_path = order.delivery_id_barcode %>
+              <%= image_tag file_path, height: '60', width: '150' %>
+            <% end %>
           </td>
           <td id="order_<%= order.id %>_action_td"  style="word-break:break-all">
             <%= link_to '保存', "javascript:save_delivery_info(#{order.id})", id: "order_#{order.id}_action", class: "button tiny" %>
           </td>
         </tr>
+
+        <!--<tr>-->
+          <!--<td class="row">-->
+            <!--<div class="large-6 columns">-->
+              <!--<%= order.order_id %>-->
+            <!--</div>-->
+            <!--<div class="large-6 columns">-->
+              <!--<%#= Time.at(order.order_create_time).strftime("%Y-%m-%d %H:%M") %>-->
+            <!--</div>-->
+          <!--</td>-->
+          <!--<td class="row">-->
+
+          <!--</td>-->
+        <!--</tr>-->
     <% end %>
   </tbody>
 </table>

data/app/views/eric_weixin/wz/xiaodian/orders/index.html.erb

@@ -40,8 +40,25 @@
                       数量：<%= order.product_count %>
                     </div>
                     <div class="product_info-part">
-                      <% sku_info = order.sku_info.gsub(/[$]/, '$' => '') unless order.sku_info.blank? %>
-                      <%= "(#{sku_info})" unless order.sku_info.blank? %>
+                      <% unless order.sku_info.blank? %>
+                        <% result_array = [] %>
+                        <% sku_array = order.sku_info.split(';') %>
+                        <% sku_array.each do |sku| %>
+                          <% sku_pair = sku.split(':') %>
+                          <% sku_k = sku_pair[0] %>
+                          <% sku_v = sku_pair[1] %>
+                          <% if sku_k =~ /^\d{10}$/ %>
+                            <% sku_result_k = EricWeixin::Xiaodian::SkuName.where(:wx_name_id => sku_k.to_s).first.name %>
+                            <% sku_result_v = EricWeixin::Xiaodian::SkuValue.where(:wx_value_id => sku_v).first.name %>
+                          <% else %>
+                            <% sku_result_k = sku_k.gsub(/[$]/, '$' => '') %>
+                            <% sku_result_v = sku_v.gsub(/[$]/, '$' => '') %>
+                          <% end %>
+                          <% single_result = "#{sku_result_k}: #{sku_result_v}" %>
+                          <% result_array << single_result %>
+                        <% end %>
+                        <%= result_array.join('; ') %>
+                      <% end %>
                     </div>
                   </div>
                 </div>

data/db/migrate/20160801040113_add_unionid_to_weixin_users.rb

@@ -0,0 +1,5 @@
+class AddUnionidToWeixinUsers < ActiveRecord::Migration
+  def change
+    add_column :weixin_users, :unionid, :string
+  end
+end

data/lib/eric_weixin/version.rb

@@ -1,3 +1,3 @@
 module EricWeixin
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: eric_weixin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - 刘晓琦
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.1'
     - - '>='
       - !ruby/object:Gem::Version
         version: 4.1.4
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.1'
     - - '>='
       - !ruby/object:Gem::Version
         version: 4.1.4
@@ -43,6 +49,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.5
   type: :runtime
@@ -50,8 +59,259 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.5
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: tinymce-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.1.3
+- !ruby/object:Gem::Dependency
+  name: will_paginate-foundation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '6.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 6.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '6.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 6.2.0
+- !ruby/object:Gem::Dependency
+  name: eric_tools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+- !ruby/object:Gem::Dependency
+  name: exception_notification
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: multi_xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.3.1
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.4
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+- !ruby/object:Gem::Dependency
+  name: delayed_job_active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: barby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: rqrcode
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: 快速开发微信公众账号
 email:
 - ericliu@ikidstv.com
@@ -211,6 +471,7 @@ files:
 - db/migrate/20151117021439_create_weixin_xiaodian_product_sku_detail.rb
 - db/migrate/20151119033354_add_status_to_weixin_xiaodian_product.rb
 - db/migrate/20151124113559_add_openid_to_weixin_xiaodian_order.rb
+- db/migrate/20160801040113_add_unionid_to_weixin_users.rb
 - lib/eric_weixin.rb
 - lib/eric_weixin/engine.rb
 - lib/eric_weixin/modules/analyze_data.rb