ll_pay 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 791510ce280d6c3f20c4e96e6714cd0aa85665ed
-  data.tar.gz: 59919fc5997650a09c8af3f623233f954913d899
+  metadata.gz: bcedd354ff169462ae37deb0692af982e7c9ef6b
+  data.tar.gz: 49b924a08cf20be00e1985ec301bce7f23e2341d
 SHA512:
-  metadata.gz: 2ac0d647acd857a3e446ec78442c04da6faaca2c013f6d8ba8fd92f14f73c3e099ba75fd324d50fd2a1881212a49166345884d282816b31feb26b89954ca2ddf
-  data.tar.gz: 7e89e51c6abbbc516a1616ee8a8014bd484b60c34a7796e02406d4c1b9ebec2808151f09b187561830284dad5abe3ae5071d9d11988b20c75e683115eeb7e925
+  metadata.gz: 29a8a7d4607768e556524966faed7e286c6e784b157e5d5f3f6deaaeddf65d72524710f5ea57fefb38141c0bcd58465fad6a833d7ef1a9a392775f3ea81929db
+  data.tar.gz: 868cc82455b22c4737cc10dbe77784cb625622f77978ef49fd3270dc1bdfadfde5bb8714b73ddfb10e49e88ea3a9820dea7696f288bc7401d705fe4bf70b7fe4

data/.codeclimate.yml

@@ -0,0 +1,16 @@
+---
+engines:
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - "**.rb"
+exclude_paths:
+- spec/

data/README.md

@@ -44,3 +44,13 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ll_pay.
 
+
+[version-badge]: https://badge.fury.io/rb/ll_pay.svg
+[rubygems]: https://rubygems.org/gems/ll_pay
+[travis-badge]: https://travis-ci.org/bayetech/ll_pay.svg
+[travis]: https://travis-ci.org/bayetech/ll_pay
+[codeclimate-badge]: https://codeclimate.com/github/bayetech/ll_pay/badges/gpa.svg
+[codeclimate]: https://codeclimate.com/github/bayetech/ll_pay
+[codecoverage-badge]: https://codeclimate.com/github/bayetech/ll_pay/badges/coverage.svg
+[codecoverage]: https://codeclimate.com/github/bayetech/ll_pay/coverage
+

data/lib/ll_pay/notify.rb

@@ -1,7 +1,18 @@
 module LlPay
   module Notify
     def self.verify?(params, options = {})
-      Sign.verify?(params, options) && LlPay.oid_partner == params[:oid_partner]
+      sign_params = {
+        'oid_partner' => params['oid_partner'],
+        'sign_type'   => params['sign_type'],
+        'dt_order' => params['dt_order'],
+        'no_order' => params['no_order'],
+        'oid_paybill' => params['oid_paybill'],
+        'money_order' => params['money_order'],
+        'result_pay' => params['result_pay'],
+        'bank_code' => params['bank_code']
+      }
+
+      LlPay::Sign.verify?(params, options) && LlPay.oid_partner == params[:oid_partner]
     end
   end
 end

data/lib/ll_pay/query_order.rb

@@ -9,10 +9,10 @@ module LlPay
 
       if sign_type == 'RSA'
         query_order_hash[:sign_type] = 'RSA'
-        query_order_hash[:sign] = LlPay::Sign::RSA.sign(LlPay.rsa_pri_key, params_to_string(query_order_hash))
+        query_order_hash[:sign] = LlPay::Sign::RSA.sign(LlPay.rsa_pri_key, LlPay::Sign.params_to_string(query_order_hash))
       else
         query_order_hash[:sign_type] = 'MD5'
-        query_order_hash[:sign] = LlPay::Sign::MD5.sign(LlPay.md5_key, params_to_string(query_order_hash))
+        query_order_hash[:sign] = LlPay::Sign::MD5.sign(LlPay.md5_key, LlPay::Sign.params_to_string(query_order_hash))
       end
 
       http_response = HTTP.post('https://yintong.com.cn/queryapi/orderquery.htm',
@@ -21,7 +21,7 @@ module LlPay
       response_hash = JSON.parse(http_response.body.to_s)
 
       if http_response.code == 200
-        if response_hash['ret_code'] == 0000 && LlPay::Sign.verify?(params_to_string(response_hash))
+        if response_hash['ret_code'] == 0000 && LlPay::Sign.verify?(LlPay::Sign.params_to_string(response_hash))
           return response_hash
         else
           return response_hash
@@ -30,11 +30,5 @@ module LlPay
         return
       end
     end
-
-    def self.params_to_string(params)
-      params.sort.map do |k, v|
-        "#{k}=#{v}" if v.to_s != '' && k.to_s != 'sign'
-      end.compact.join('&')
-    end
   end
 end

data/lib/ll_pay/service.rb

@@ -3,16 +3,29 @@ require 'json'
 module LlPay
   module Service
 
-    SECURITY_PAY_REQUIRED_PARAMS = %w(notify_url no_order dt_order busi_partner money_order valid_order user_id)
+    SECURITY_PAY_REQUIRED_PARAMS = %w(busi_partner dt_order info_order money_order name_goods no_order notify_url oid_partner risk_item sign_type valid_order)
     def self.securitypay_pay_json(params, options = {})
-      params = LlPay::Utils.stringify_keys(params)
-      options = LlPay::Utils.stringify_keys(options)
+      # params = LlPay::Utils.stringify_keys(params)
+      # options = LlPay::Utils.stringify_keys(options)
 
-      params[:sign_type] = options[:sign_type] || LlPay.sign_type
+      check_required_params(params, SECURITY_PAY_REQUIRED_PARAMS)
 
-      params = { oid_partner: LlPay.oid_partner }.merge(params)
+      params['sign_type'] = options['sign_type'] || LlPay.sign_type
 
-      params[:sign] = LlPay::Sign.generate(params)
+      params = { 'oid_partner' => LlPay.oid_partner }.merge(params)
+
+      sign_params = { 'busi_partner' => params['busi_partner'],
+                      'dt_order' => params['dt_order'],
+                      'money_order' => params['money_order'],
+                      'no_order' => params['no_order'],
+                      'notify_url' => params['notify_url'],
+                      'oid_partner' => params['oid_partner'],
+                      'risk_item' => params['risk_item'],
+                      'sign_type' => params['sign_type'],
+                      'valid_order' => params['valid_order']
+                    }
+
+      params['sign'] = LlPay::Sign.generate(sign_params)
 
       params.to_json
     end

data/lib/ll_pay/sign/rsa.rb

@@ -11,7 +11,7 @@ module LlPay
 
       def self.verify?(pubkey, string, sign)
         rsa = OpenSSL::PKey::RSA.new(pubkey)
-        rsa.verify('sha1', Base64.strict_decode64(sign), string)
+        rsa.verify('sha1', Base64.strict_decode64(sign), string.force_encoding("utf-8"))
       end
     end
   end

data/lib/ll_pay/sign.rb

@@ -9,6 +9,7 @@ module LlPay
       sign_type = params[:sign_type]
       md5_key = options[:md5_key] || LlPay.md5_key
       rsa_pri_key = options[:rsa_pri_key] || LlPay.rsa_pri_key
+      params[:oid_partner] = LlPay.oid_partner
       string = params_to_string(params)
 
       case sign_type

data/lib/ll_pay/version.rb

@@ -1,3 +1,3 @@
 module LlPay
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/ll_pay.rb

@@ -9,7 +9,14 @@ require 'll_pay/utils'
 
 module LlPay
   # 银通公钥
-  YT_PUB_KEY = "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCSS/DiwdCf/aZsxxcacDnooGph3d2JOj5GXWi+q3gznZauZjkNP8SKl3J2liP0O6rU/Y/29+IUe+GTMhMOFJuZm1htAtKiu5ekW0GlBMWxf4FPkYlQkPE0FtaoMP3gYfh+OwI+fIRrpW3ySn3mScnc6Z700nU/VYrRkfcSCbSnRwIDAQAB\n-----END PUBLIC KEY-----".freeze
+  YT_PUB_KEY = <<-EOF
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCSS/DiwdCf/aZsxxcacDnooGph3d2JOj5GXWi+
+q3gznZauZjkNP8SKl3J2liP0O6rU/Y/29+IUe+GTMhMOFJuZm1htAtKiu5ekW0GlBMWxf4FPkYlQ
+kPE0FtaoMP3gYfh+OwI+fIRrpW3ySn3mScnc6Z700nU/VYrRkfcSCbSnRwIDAQAB
+-----END PUBLIC KEY-----
+    EOF
+
   @sign_type = 'MD5'
 
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ll_pay
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - houdelin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -79,6 +79,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"