From 01d9e84eeb182185dc0c410f397ee7763b0fc72e Mon Sep 17 00:00:00 2001
From: jasl <jasl9187@hotmail.com>
Date: Wed, 2 Dec 2015 18:04:35 +0800
Subject: [PATCH] bug fix

---
 lib/wx_pay.rb         | 2 +-
 lib/wx_pay/service.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/wx_pay.rb b/lib/wx_pay.rb
index 4be7774..3d96532 100644
--- a/lib/wx_pay.rb
+++ b/lib/wx_pay.rb
@@ -4,7 +4,7 @@ require 'wx_pay/service'
 require 'openssl'
 
 module WxPay
-  @rest_client_options = {}
+  @extra_rest_client_options = {}
 
   class<< self
     attr_accessor :appid, :mch_id, :key, :apiclient_cert, :apiclient_key, :extra_rest_client_options
diff --git a/lib/wx_pay/service.rb b/lib/wx_pay/service.rb
index 8e624b2..519731e 100644
--- a/lib/wx_pay/service.rb
+++ b/lib/wx_pay/service.rb
@@ -173,13 +173,15 @@ module WxPay
     end
 
     def self.invoke_remote(url, payload, options = {})
+      options = WxPay.extra_rest_client_options.merge(options)
+
       r = RestClient::Request.execute(
         {
           method: :post,
           url: url,
           payload: payload,
           headers: { content_type: 'application/xml' }
-        }.merge(WxPay.extra_rest_client_options).merge(options)
+        }.merge(options)
       )
 
       if r
--
libgit2 0.21.0