fuiou 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f9fe07a187ad5b56257dec8cd148cb12df1d46bf60bd00a223103bd83fe25b
-  data.tar.gz: d52fc1de0c697d3482604e172d39b7655fff65e52407b9f1d68f7db9327f4e47
+  metadata.gz: ae232fcdb1b823356426238a1373b183269500de47beacf9e7585f63829a0ce3
+  data.tar.gz: 06d655b1a3a4fdfcf697003d6cf1c5d78b1ccd7749c6bf690fae273b754c9fa8
 SHA512:
-  metadata.gz: f9c6cb4e695237134c5f599704036960bda0463b24b7d0c4356b3c8b9c630323b8e561d9774aa3e94b8d8a555fbfee4558025049cdf6fddeda52d99d8bab7947
-  data.tar.gz: 458b731db237cb0e01ba47203e6e40e3becebc0694a24dd3e996f2dc984ada98c24e7b6a85ab1b6af16fe6a82dc200cadc70baec9205e99b891cff5c83d6917c
+  metadata.gz: a07c5893bc4e69b541d2234c23de192c7e4eb73922923c6cc385460dd67ca50be1fa0d5d87e45fadb61aedacbe6f2b5e6d72c5ad82d4ded8239df6f9112d6cbe
+  data.tar.gz: 1f23162d9a3392366bab681ec0967af936fd9847759aa5fc79e0f3c8db1c4f0b23408d85f9dd98fdaf07c8ccc647c12c5f91cd76fdafa556988650d34c6e95ff

data/lib/fuiou/result.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'cgi'
+require 'active_support/core_ext/hash/conversions'
+
+module Fuiou
+  module Result
+    class << self
+      def parse(req)
+        Hash.from_xml(CGI.unescape(req))["xml"]
+      end
+    end
+  end
+end

data/lib/fuiou/service.rb

@@ -7,8 +7,6 @@ require 'active_support/core_ext/hash/conversions'
 
 module Fuiou
   module Service
-    FUIOU_21_URL = "https://fundwx.fuiou.com/preCreate".freeze
-    FUIOU_30_URL = "https://fundwx.fuiou.com/commonQuery".freeze
     ENCODE_TYPE_GBK = "GBK"
 
     class << self
@@ -17,7 +15,7 @@ module Fuiou
       def invoke_pre_create(params)
         check_required_options(params, INVOKE_PRE_CREATE_REQUIRED_FIELDS)
         payload = xmlify_payload(params)
-        invoke_remote(FUIOU_21_URL, { req: payload })
+        invoke_remote(Fuiou.fuiou_21_url, { req: payload })
       end
 
       INVOKE_COMMON_QUERY_REQUIRED_FIELDS = %i[version ins_cd mchnt_cd term_id order_type mchnt_order_no random_str]
@@ -25,9 +23,27 @@ module Fuiou
       def invoke_common_query(params)
         check_required_options(params, INVOKE_COMMON_QUERY_REQUIRED_FIELDS)
         payload = xmlify_payload(params)
-        invoke_remote(FUIOU_30_URL, { req: payload })
+        invoke_remote(Fuiou.fuiou_30_url, { req: payload })
       end
 
+      INVOKE_HIS_TRADE_QUERY_REQUIRED_FIELDS = %i[version ins_cd mchnt_cd term_id order_type]
+      # 历史订单查询: https://fundwx.fuiou.com/doc/#/scanpay/api?id=_310-%e5%8e%86%e5%8f%b2%e8%ae%a2%e5%8d%95%e6%9f%a5%e8%af%a2
+      def invoke_his_trade_query(params)
+        check_required_options(params, INVOKE_HIS_TRADE_QUERY_REQUIRED_FIELDS)
+        payload = xmlify_payload(params)
+        invoke_remote(Fuiou.his_trade_query_url, { req: payload })
+      end
+
+      INVOKE_WX_PRE_CREATE_REQUIRED_FIELDS = %i[version addn_inf ins_cd mchnt_cd term_id random_str goods_des goods_detail goods_tag product_id mchnt_order_no curr_type order_amt term_ip txn_begin_ts notify_url limit_pay trade_type openid sub_openid sub_appid]
+      # 公众号/服务窗统一下单: https://fundwx.fuiou.com/doc/#/scanpay/api?id=_33-%e5%85%ac%e4%bc%97%e5%8f%b7%e6%9c%8d%e5%8a%a1%e7%aa%97%e7%bb%9f%e4%b8%80%e4%b8%8b%e5%8d%95
+      def invoke_wx_pre_create(params)
+        check_required_options(params, INVOKE_WX_PRE_CREATE_REQUIRED_FIELDS)
+        payload = xmlify_payload(params)
+        invoke_remote(Fuiou.wx_pre_create_url, { req: payload })
+      end
+
+      private
+
       def invoke_remote(url, payload, options = {})
         resp = RestClient.post(
           url,
@@ -37,26 +53,24 @@ module Fuiou
             charset: ENCODE_TYPE_GBK
           }
         )
-        Hash.from_xml(CGI.unescape(resp.body))["xml"]
+        Fuiou::Result.parse(resp.body)
       end
 
-      private
-
       def xmlify_payload(params)
         rsa_string = params.sort.map{|k,v| "#{k}=#{v}&" unless k.start_with?("sign") || k.start_with?("reserved")}.join
-        rsa_string = rsa_string.delete_suffix("&") if rsa_string.end_with?("&")
+        rsa_string = rsa_string.chop if rsa_string.end_with?("&")
 
         sign = Fuiou::Sign.rsa_sign(rsa_string)
 
-        xml = "<?xml version=\"1.0\" encoding=\"GBK\" standalone=\"yes\"?><xml>#{params.except(:sign).sort.map { |k, v| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
-        (xml.force_encoding(ENCODE_TYPE_GBK)).force_encoding(ENCODE_TYPE_GBK)
+        xml = "<?xml version=\"1.0\" encoding=\"GBK\" standalone=\"yes\"?><xml>#{params.sort.map { |k, v| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
+        (xml.encode(ENCODE_TYPE_GBK)).encode(ENCODE_TYPE_GBK)
       end
 
       def check_required_options(options, names)
         names.each do |name|
           warn("Fuiou Warn: missing required option: #{name}") unless options.has_key?(name)
         end
-      end      
+      end
     end
   end
-end
+end

data/lib/fuiou/sign.rb

@@ -13,7 +13,6 @@ module Fuiou
       def rsa_sign(rsa_string)
         rsa = OpenSSL::PKey::RSA.new(Fuiou.ins_private_key)
         sign = rsa.sign(SIGN_TYPE_MD5, rsa_string.encode(ENCODE_TYPE_GBK))
-        Base64.strict_encode64(sign)
         CGI.escape(Base64.strict_encode64(sign))
       end
 

data/lib/fuiou/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fuiou
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.4".freeze
 end

data/lib/fuiou.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
+require 'fuiou/result'
 require 'fuiou/service'
 require 'fuiou/sign'
 require 'fuiou/version'
-require 'openssl'
 
 module Fuiou
   class << self
@@ -12,7 +12,11 @@ module Fuiou
     # ins_private_key 机构号私钥
     # ins_public_key 机构号公钥
     # notify_url 回调通知地址
+    # fuiou_21_url 统一下单地址
+    # fuiou_30_url 订单查询地址
+    # his_trade_query_url 历史交易查询地址
     attr_accessor :mch_id, :notify_url
     attr_accessor :ins_id, :ins_private_key, :ins_public_key
+    attr_accessor :fuiou_21_url, :fuiou_30_url, :his_trade_query_url, :wx_pre_create_url
   end
 end

data/test/test_helper.rb

@@ -8,6 +8,8 @@ require "webmock/minitest"
 Fuiou.mch_id = "0002900F0370542"
 Fuiou.notify_url = "http://www.wrx.cn"
 Fuiou.ins_id = "08A9999999"
+Fuiou.fuiou_21_url = "https://fundwx.fuiou.com/preCreate"
+Fuiou.fuiou_30_url = "https://fundwx.fuiou.com/commonQuery"
 
 Fuiou.ins_private_key = "-----BEGIN RSA PRIVATE KEY-----\nMIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJgAzD8fEvBHQTyxUEeK963mjziMWG7nxpi+pDMdtWiakc6xVhhbaipLaHo4wVI92A2wr3ptGQ1/YsASEHm3m2wGOpT2vrb2Ln/S7lz1ShjTKaT8U6rKgCdpQNHUuLhBQlpJer2mcYEzG/nGzcyalOCgXC/6CySiJCWJmPyR45bJAgMBAAECgYBHFfBvAKBBwIEQ2jeaDbKBIFcQcgoVa81jt5xgz178WXUg/awu3emLeBKXPh2i0YtN87hM/+J8fnt3KbuMwMItCsTD72XFXLM4FgzJ4555CUCXBf5/tcKpS2xT8qV8QDr8oLKA18sQxWp8BMPrNp0epmwun/gwgxoyQrJUB5YgZQJBAOiVXHiTnc3KwvIkdOEPmlfePFnkD4zzcv2UwTlHWgCyM/L8SCAFclXmSiJfKSZZS7o0kIeJJ6xe3Mf4/HSlhdMCQQCnTow+TnlEhDTPtWa+TUgzOys83Q/VLikqKmDzkWJ7I12+WX6AbxxEHLD+THn0JGrlvzTEIZyCe0sjQy4LzQNzAkEAr2SjfVJkuGJlrNENSwPHMugmvusbRwH3/38ET7udBdVdE6poga1Z0al+0njMwVypnNwy+eLWhkhrWmpLh3OjfQJAI3BV8JS6xzKh5SVtn/3Kv19XJ0tEIUnn2lCjvLQdAixZnQpj61ydxie1rggRBQ/5vLSlvq3H8zOelNeUF1fT1QJADNo+tkHVXLY9H2kdWFoYTvuLexHAgrsnHxONOlSA5hcVLd1B3p9utOt3QeDf6x2i1lqhTH2w8gzjvsnx13tWqg==\n-----END RSA PRIVATE KEY-----\n"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuiou
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - wen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - lib/fuiou.rb
+- lib/fuiou/result.rb
 - lib/fuiou/service.rb
 - lib/fuiou/sign.rb
 - lib/fuiou/version.rb