jdpay 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec31d9771e22fdd3030e3bda86d6aead0632998
-  data.tar.gz: 23fbf0018d9e831a09ff890dd1ff0ba069d59d40
+  metadata.gz: 7fe7a62e58b00e9412db3ab2724832fb20cc0b81
+  data.tar.gz: 8fabca79ce4fa1ade33bfce3f92c0ada42152b98
 SHA512:
-  metadata.gz: 72d2ff2bbce889934299a613cfb37f836db2df5a987300d61f4b0d326eabf614a6420bf7c8c9931629619a23977bc56738a1dda560e3ab9ebea9eb897ebfeb00
-  data.tar.gz: 9bd84ae9f8c89e4ddc97a46fbb2dbcc5f0a975ba0267d8f850c3384eafab6aae7f4422e519a083140915ea8f4a0c465b99abde11d9046866918f07244badea10
+  metadata.gz: 5268db2187764dec74b0e7ef7ca07825050cf390de9dc51e95ef4cb4065f62a4d243f32a367cd157b108175e79d4e935d0ef8538953a9abc630a2f683d06fd99
+  data.tar.gz: 66038f010c0a8ed0608fab65ed871f577bc3d536fc7f98d05247b7b34b36dabd53a16aef6abd87f8c1464c3cecdfd28ec2c2d5bcd0d65ecf21f2996954b78b99

data/README.md

@@ -250,7 +250,7 @@ JdPay::Service.user_relation(params, options = {})
 #### Example
 
 ```ruby
-  # refund required keys [:userId]
+  # user_relation required keys [:userId]
   params = { userId: '12345678' }
   JdPay::Service.user_relation(params)
 ```
@@ -269,7 +269,7 @@ JdPay::Service.cancel_user(params, options = {})
 #### Example
 
 ```ruby
-  # refund required keys [:userId]
+  # cancel_user required keys [:userId]
   params = { userId: '12345678' }
   JdPay::Service.cancel_user(params)
 ```
@@ -358,4 +358,4 @@ Donate to maintainer let him make this gem better.
 [donate link](https://ruby-china.org/hemengzhi88).<br/>
 
 <img src="https://raw.githubusercontent.com/genkin-he/md_photos/master/alipay.jpg" alt="alipay" width="200" align='left'>
-<img src="https://raw.githubusercontent.com/genkin-he/md_photos/master/wx_pay.png" alt="wx_pay" width="220" align='left'>
+<!-- <img src="https://raw.githubusercontent.com/genkin-he/md_photos/master/wx_pay.png" alt="wx_pay" width="220" align='left'> -->

data/lib/jd_pay/des.rb

@@ -3,22 +3,20 @@ module JdPay
     class << self
       def encrypt_3des(str, options = {})
         des = OpenSSL::Cipher::Cipher.new('des-ede3')
-        str = format_str_data(str)
         des.encrypt
         des.key = decode_key(options)
         des.iv = des.random_iv
-        str = des.update(str)
+        str = des.update(format_str_data(str))
         to_hex(str.bytes)
       end
 
       def decrypt_3des(encrypt_str, options = {})
-        encrypt_str = to_decimal(encrypt_str)
         des2 = OpenSSL::Cipher::Cipher.new('des-ede3')
         des2.decrypt
         des2.key = decode_key(options)
         des2.iv = des2.random_iv
         des2.padding = 0
-        result = (des2.update(encrypt_str) + des2.final).bytes
+        result = (des2.update(to_decimal(encrypt_str)) + des2.final).bytes
         result.first(valid_size(result.shift(4))).map(&:chr).join.force_encoding('utf-8').encode('utf-8')
       end
 
@@ -36,7 +34,7 @@ module JdPay
 
       # 有效数据长度数组
       def valid_size_array(num)
-        size_array = [num >> 24 & 0xff, num >> 16 & 0xff, num >> 8 & 0xff, num & 0xff]
+        [num >> 24 & 0xff, num >> 16 & 0xff, num >> 8 & 0xff, num & 0xff]
       end
 
       # 根据数组算出有效数据值

data/lib/jd_pay/service.rb

@@ -72,7 +72,7 @@ module JdPay
         JdPay::Result.new(Hash.from_xml(invoke_remote(QRCODE_PAY_URL, make_payload(params), options)), options)
       end
 
-      USER_RELATION_REQUIRED_FIELDS = [:useId]
+      USER_RELATION_REQUIRED_FIELDS = [:userId]
       def user_relation(params, options = {})
         params = {
           version: "V2.0",

data/lib/jd_pay/version.rb

@@ -1,3 +1,3 @@
 module JdPay
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/jd_pay/service_test.rb

@@ -24,6 +24,7 @@ class JdPay::ServiceTest < Minitest::Test
       tradeName: '测试商品',
       amount: '1',
       orderType: '0',
+      userId: '123456',
       notifyUrl: 'http://making.dev/notify'
     }
     assert_equal @result, JdPay::Service.uniorder(params)
@@ -111,6 +112,7 @@ class JdPay::ServiceTest < Minitest::Test
     EOF
     assert_equal Hash.from_xml(expect_xml), JdPay::Service.user_relation({userId: "123"})
   end
+
   def test_cancel_user
     xml_str = <<-EOF
     <jdpay>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jdpay
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Genkin He
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An unofficial simple jdpay gem.
@@ -176,3 +176,4 @@ test_files:
 - test/jd_pay/util_test.rb
 - test/jd_pay_test.rb
 - test/test_helper.rb
+has_rdoc: