Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add config instance #31

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Next Release

## 1.1.1 (10/15/2024)

* Add `config instance` feature

## 1.1.0 (07/26/2021)

* Fix `Accept-Encoding` issue in wechat.
Expand Down
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ $ bundle
Create `config/initializer/wechat_pay.rb`and put following configurations into it

``` ruby
WechatPay.apiclient_key = File.read('apiclient_key.pem')
WechatPay.platform_cert = File.read('platform_cert.pem') # You should comment this line before downloaded platform_cert.
WechatPay.apiclient_cert = File.read('apiclient_cert.pem')
WechatPay.app_id = 'Your App Id'
WechatPay.mch_id = 'Your Mch Id'
WechatPay.mch_key = 'Your Mch Key'
WechatPay.configure do |config|
WechatPay.apiclient_key = File.read('apiclient_key.pem')
WechatPay.platform_cert = File.read('platform_cert.pem') # You should comment this line before downloaded platform_cert.
WechatPay.apiclient_cert = File.read('apiclient_cert.pem')
WechatPay.app_id = 'Your App Id'
WechatPay.mch_id = 'Your Mch Id'
WechatPay.mch_key = 'Your Mch Key'
end
```

## Download
Expand Down
35 changes: 12 additions & 23 deletions lib/wechat-pay.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,27 @@
require 'wechat-pay/sign'
require 'wechat-pay/direct' # 直连模式
require 'wechat-pay/ecommerce' # 电商平台
require 'wechat-pay/config'
require 'wechat-pay/client'
require 'wechat-pay/helper'

# # 微信支付
#
# 设置关键信息
module WechatPay
class << self
attr_accessor :app_id, :mch_id, :mch_key
attr_reader :apiclient_key, :apiclient_cert, :platform_cert
attr_reader :client, :config, :direct, :ecommerce, :sign

# 设置商户私钥,从微信商户平台下载
def apiclient_key=(key)
@apiclient_key = OpenSSL::PKey::RSA.new(key)
end

# 设置平台证书,通过接口获取 https://github.com/lanzhiheng/wechat-pay/blob/master/lib/wechat-pay/ecommerce/applyment.rb#L116
def platform_cert=(cert)
@platform_cert = OpenSSL::X509::Certificate.new(cert)
end
delegate :app_id, :mch_id, :mch_key, :apiclient_key, :apiclient_cert, :platform_cert, :platform_serial_no, :apiclient_serial_no, to: :config

# 设置商户证书,从微信商户平台下载
def apiclient_cert=(cert)
@apiclient_cert = OpenSSL::X509::Certificate.new(cert)
end

# 平台证书序列号
def platform_serial_no
@platform_serial_no ||= platform_cert.serial.to_s(16)
end
def configure
@config = WechatPay::Config.new
yield config

# 商户证书序列号
def apiclient_serial_no
@apiclient_serial_no ||= apiclient_cert.serial.to_s(16)
@client = WechatPay::Client.new(config)
@direct = WechatPay::Direct::Direct.new(config)
@ecommerce = WechatPay::Ecommerce::Ecommerce.new(config)
@sign = WechatPay::Sign.new(config)
end
end
end
Expand Down
Loading