fuiou 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72dfa9486a1fa6c267c40fc3d59a99d56c83b11a2583100e8cdb20844da84550
-  data.tar.gz: 6a4b2fde41c36b61b76eba7179e985d35d2891aa7f62a5fec11c772513039a90
+  metadata.gz: 63ddfaa26a81d4d8b26ca34ea0b9c4d8a79561332faa5c7f28c2f496dfcdc633
+  data.tar.gz: 3f208f05b5b18f6b9514ff14ce4ef594d4bf868dde3b9354ebc786e54c0af5fa
 SHA512:
-  metadata.gz: 3854f45fe089348f71272c9dce4d4b1d09cbe67b35fca2f5c00b74d1f8bc52a8c662342c452bd3ca4c086e778c0a660ce02655c75655b99a404d517093b6e575
-  data.tar.gz: 7ca9b032194e67832c9cfd3fb7f2db740162256cd2e45c2bf58029f3fef7c2f5a7d0b0e34df045aa6e5aeb07be0a35e6b4bd05069ae2de5d0aeaaf3ef560028b
+  metadata.gz: d27a1b8865e54199e2a60ee7795a003a0972fcb78ca2ea61c6c181943ef80025ca8a579873ffbcd713fbaeda84cac036726d28d6dfb1a912a39cf36f474ae653
+  data.tar.gz: b1fc939daa45bda38ef3c0b5f97d4d57a03195f3e123bdb22c270cedaf1e28ac984d6845cc39fa22dfc3b35d5bf943c8d96500787e5e7db89c80e70edaf9b59d

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,10 @@ module Fuiou
     # ins_private_key 机构号私钥
     # ins_public_key 机构号公钥
     # notify_url 回调通知地址
+    # fuiou_21_url 统一下单地址
+    # fuiou_30_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
   end
 end

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,7 +23,7 @@ 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
 
       private
@@ -39,7 +37,7 @@ module Fuiou
             charset: ENCODE_TYPE_GBK
           }
         )
-        Hash.from_xml(CGI.unescape(resp.body))["xml"]
+        Fuiou::Result.parse(resp.body)
       end
 
       def xmlify_payload(params)

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.1".freeze
+  VERSION = "0.1.2".freeze
 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.1
+  version: 0.1.2
 platform: ruby
 authors:
 - wen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2021-07-24 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