eric_weixin 0.1.1 → 0.2.0

data/lib/eric_weixin/modules/ip.rb

@@ -9,6 +9,7 @@ module EricWeixin::Ip
   # ===调用示例
   # Ip.is_ip_exist? ip: "127.0.0.1", public_account_id: 1
   def self.is_ip_exist? options
+    return true    #TODO 腾讯ip有时候不能获取正常的列表，需要调整研究
     options[:ip].to_s.to_debug
     return true if IPLIST[:iplist].include? options[:ip]
     get_ip_list options
@@ -27,6 +28,7 @@ module EricWeixin::Ip
       token = ::EricWeixin::AccessToken.get_valid_access_token public_account_id: options[:public_account_id]
       ips = RestClient.get "https://api.weixin.qq.com/cgi-bin/getcallbackip?access_token=#{token}"
       ips = JSON.parse ips.body
+      ips.to_debug
       IPLIST[:iplist] =  ips["ip_list"]
       IPLIST[:update_at] = Time.now
     end

data/lib/eric_weixin/modules/pay.rb

@@ -0,0 +1,31 @@
+module EricWeixin::Pay
+  def self.generate_prepay_id options
+    required_field = %i(appid mch_id openid attach body out_trade_no total_fee spbill_create_ip notify_url trade_type)
+    query_options = {}
+    required_field.each do |p|
+      query_options[p] = options[p]
+    end
+    query_options[:nonce_str] = SecureRandom.uuid.tr('-', '')
+    public_account = ::EricWeixin::PublicAccount.find_by_weixin_app_id(options[:appid])
+
+    sign = generate_sign query_options, public_account.mch_key
+    last_query_options = query_options
+    last_query_options[:sign] = sign
+    pay_load = "<xml>#{last_query_options.map { |k, v| "<#{k.to_s}>#{v.to_s}</#{k.to_s}>" }.join}</xml>"
+    require 'rest-client'
+
+    response = RestClient.post 'https://api.mch.weixin.qq.com/pay/unifiedorder', pay_load
+    pp "**********************下单结果 *********************************"
+    pp response.force_encoding("UTF-8")
+    result = Hash.from_xml(response.force_encoding("UTF-8"))
+    return result['xml']['prepay_id'] if result['xml']['return_code'] == 'SUCCESS'
+    nil
+  end
+
+  def self.generate_sign options, api_key
+    query = options.sort.map do |k,v|
+      "#{k.to_s}=#{v.to_s}"
+    end.join('&')
+    Digest::MD5.hexdigest("#{query}&key=#{api_key}").upcase
+  end
+end

data/lib/eric_weixin/version.rb

@@ -1,3 +1,3 @@
 module EricWeixin
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eric_weixin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - 刘晓琦
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,9 @@ files:
 - app/controllers/eric_weixin/cms/base_controller.rb
 - app/controllers/eric_weixin/cms/weixin/article_datas_controller.rb
 - app/controllers/eric_weixin/cms/weixin/customs_service_records_controller.rb
+- app/controllers/eric_weixin/cms/weixin/media_articles_controller.rb
+- app/controllers/eric_weixin/cms/weixin/media_news_controller.rb
+- app/controllers/eric_weixin/cms/weixin/media_resources_controller.rb
 - app/controllers/eric_weixin/cms/weixin/news_datas_controller.rb
 - app/controllers/eric_weixin/cms/weixin/public_accounts_controller.rb
 - app/controllers/eric_weixin/cms/weixin/reply_message_rules_controller.rb
@@ -50,6 +53,7 @@ files:
 - app/controllers/eric_weixin/cms/weixin/url_encodes_controller.rb
 - app/controllers/eric_weixin/cms/weixin/users_controller.rb
 - app/controllers/eric_weixin/cms/weixin/weixin_users_controller.rb
+- app/controllers/eric_weixin/wz/pays_controller.rb
 - app/controllers/eric_weixin/wz/weixin_controller.rb
 - app/helpers/eric_weixin/application_helper.rb
 - app/helpers/eric_weixin/cms/weixin/public_accounts_helper.rb
@@ -57,6 +61,10 @@ files:
 - app/models/eric_weixin/article.rb
 - app/models/eric_weixin/article_news.rb
 - app/models/eric_weixin/customs_service_record.rb
+- app/models/eric_weixin/media_article.rb
+- app/models/eric_weixin/media_article_news.rb
+- app/models/eric_weixin/media_news.rb
+- app/models/eric_weixin/media_resource.rb
 - app/models/eric_weixin/message_log.rb
 - app/models/eric_weixin/news.rb
 - app/models/eric_weixin/public_account.rb
@@ -74,6 +82,19 @@ files:
 - app/views/eric_weixin/cms/weixin/article_datas/new.html.erb
 - app/views/eric_weixin/cms/weixin/article_datas/show.html.erb
 - app/views/eric_weixin/cms/weixin/customs_service_records/index.html.erb
+- app/views/eric_weixin/cms/weixin/media_articles/_media_article.html.erb
+- app/views/eric_weixin/cms/weixin/media_articles/_select_pic.html.erb
+- app/views/eric_weixin/cms/weixin/media_articles/edit.html.erb
+- app/views/eric_weixin/cms/weixin/media_articles/index.html.erb
+- app/views/eric_weixin/cms/weixin/media_articles/new.html.erb
+- app/views/eric_weixin/cms/weixin/media_news/_select_article.html.erb
+- app/views/eric_weixin/cms/weixin/media_news/_select_user.html.erb
+- app/views/eric_weixin/cms/weixin/media_news/_will_send_article.html.erb
+- app/views/eric_weixin/cms/weixin/media_news/new.html.erb
+- app/views/eric_weixin/cms/weixin/media_resources/_media_resource.html.erb
+- app/views/eric_weixin/cms/weixin/media_resources/edit.html.erb
+- app/views/eric_weixin/cms/weixin/media_resources/index.html.erb
+- app/views/eric_weixin/cms/weixin/media_resources/new.html.erb
 - app/views/eric_weixin/cms/weixin/news_datas/_news_data.html.erb
 - app/views/eric_weixin/cms/weixin/news_datas/edit.html.erb
 - app/views/eric_weixin/cms/weixin/news_datas/index.html.erb
@@ -97,11 +118,17 @@ files:
 - app/views/eric_weixin/cms/weixin/url_encodes/index.html.erb
 - app/views/eric_weixin/cms/weixin/users/index.html.erb
 - app/views/eric_weixin/cms/weixin/weixin_users/index.html.erb
+- app/views/eric_weixin/wz/pays/pay_fail.html.erb
+- app/views/eric_weixin/wz/pays/pay_ok.html.erb
+- app/views/eric_weixin/wz/pays/prepay.html.erb
 - app/views/layouts/eric_weixin/application.html.erb
 - app/views/layouts/eric_weixin/cms/base.html.erb
 - app/views/layouts/eric_weixin/weixin/aa.erb
+- app/views/layouts/eric_weixin/wz/pays.html.erb
 - config/initializers/assets.rb
+- config/initializers/inflections.rb
 - config/routes.rb
+- config/tinymce.yml
 - db/migrate/20150610031604_create_weixin_report_user_data.rb
 - db/migrate/20150610031935_create_weixin_report_news_data.rb
 - db/migrate/20150610032545_create_weixin_report_msg_data.rb
@@ -115,11 +142,20 @@ files:
 - db/migrate/20150610090206_create_weixin_user.rb
 - db/migrate/20150612104303_add_index_to_weixin_message_logs.rb
 - db/migrate/20150625065249_delete_clomn_weixin_token_from_public_account.rb
+- db/migrate/20150813080541_add_mch_id_to_weixin_public_accounts.rb
+- db/migrate/20150817105643_alert_weixin_reply_message_rules_s_reply_message_length.rb
+- db/migrate/20150817143407_add_mch_key_to_weixin_public_account.rb
+- db/migrate/20150818090435_create_weixin_media_resources.rb
+- db/migrate/20150818094553_create_weixin_media_articles.rb
+- db/migrate/20150818095654_create_weixin_media_news.rb
+- db/migrate/20150818100348_create_weixin_media_articles_news.rb
+- db/migrate/20150904045253_add_host_name_to_public_account.rb
 - lib/eric_weixin.rb
 - lib/eric_weixin/engine.rb
 - lib/eric_weixin/modules/analyze_data.rb
 - lib/eric_weixin/modules/ip.rb
 - lib/eric_weixin/modules/mult_customer.rb
+- lib/eric_weixin/modules/pay.rb
 - lib/eric_weixin/modules/reply_message.rb
 - lib/eric_weixin/modules/snsapi.rb
 - lib/eric_weixin/version.rb