my_alipay 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e765c3809b95c8376c319675b8700c146d838b3e
-  data.tar.gz: c0160973abcce049ac80f7681756cff93704422d
+  metadata.gz: f7291f13df6dc9dacdd574500ad29cbdf40cd0a6
+  data.tar.gz: 3cdf65d10dc52155c0ce5cc92815355b5f4d021b
 SHA512:
-  metadata.gz: 922040f0fd80588e41392143a8527d1aa2431d627c3d07c208fe5424e0be71e2e7600602adb45e3bf3e465f8c14bdf46682392be13c7af3cf28a960d47ca9ebe
-  data.tar.gz: 769376c99c23db099173081493ca18c1647c58e300b7a8876f37c36c4c1d7300d669d129754c1f6519ed86f3ef4da988203548af6632901ca136b65524b789b3
+  metadata.gz: 87fb064c53ae8a6d64b82b50a0f0cabe46ec1351e8aef7dc5c4b02f4c15c4531c41f50abd2b4e8fc1907573a98daec47679a10841a18942780b8f9d85f2207af
+  data.tar.gz: a61849d084951189162aabd2bfbea378a879f48d582225ec1c4c36764f65d9a4407a322c91d3235e1356ce7aee1acd762b533d43f73dc567063f7296f874697a

data/README.md

@@ -57,8 +57,13 @@ params ={
 
 url = MyAlipay::Wap::Service.create_alipay_trade_wap_pay_url params
 
-#跳转到支付页面
-redirect_to url #或者在html页面跳转  window.location.href = url
+
+#显示支付页面方式
+# 1.跳转到支付页面
+redirect_to url 
+
+# 2. 或者在html页面跳转,显示支付页面
+window.location.href = url
 
 ```
 

data/lib/my_alipay/{wap/notify.rb → notify.rb}

@@ -1,8 +1,9 @@
+#通知验签
 module MyAlipay
   module Wap
     module Notify
 
-      def self.wap_notify params
+      def self.verify? params
         params.stringify_keys
         params.delete('sign_type')
         params.delete('controller')

data/lib/my_alipay/page/service.rb

@@ -0,0 +1,16 @@
+module MyAlipay
+  module Page
+    module Service
+      GATEWAY_URL = 'https://openapi.alipayde.com/gateway.do'
+
+      #电脑网站支付url
+      def self.create_alipay_trade_page_pay_url(params, options = {})
+        sign_params = MyAlipay::Sign.generate params,{method: 'alipay.trade.page.pay'}
+        MyAlipay.gateway_url + '?' + sign_params[:sign_str] + "&sign=#{ERB::Util.url_encode(sign_params[:sign])}"
+      end
+
+
+
+    end
+  end
+end

data/lib/my_alipay/sign/md5.rb

@@ -0,0 +1,7 @@
+module MyAlipay
+  module Sign
+    class Md5
+
+    end
+  end
+end

data/lib/my_alipay/sign/rsa2.rb

@@ -0,0 +1,17 @@
+module MyAlipay
+  module Sign
+    class Rsa2
+      #rsa2 SHA256
+      def self.sign(key, string)
+        #如果秘钥key开头没有-----BEGIN PRIVATE KEY-----和-----END PRIVATE KEY-----需要base64解码，如果有则不需要进行解码
+        rsa = OpenSSL::PKey::RSA.new(Base64.decode64(key))
+        digest = OpenSSL::Digest::SHA256.new
+        sign = Base64.strict_encode64(rsa.sign(digest, string))
+        {sign_str: string, sign: sign}
+      end
+
+    end
+  end
+end
+
+#sign_string = "app_id=2016080200146859&biz_content={\"subject\":\"测试数据\",\"out_trade_no\":\"123456\",\"total_amount\":\"100\",\"product_code\":\"QUICK_WAP_PAY\"}&charset=UTF-8&method=alipay.trade.wap.pay&sign_type=RSA2&timestamp=2014-07-24 03:07:50&version=1.0"

data/lib/my_alipay/sign.rb

@@ -0,0 +1,41 @@
+module MyAlipay
+  module Sign
+
+    def self.generate(params, options = {})
+      method = options[:method] || 'alipay.trade.wap.pay'
+      sign_type = options[:sign_type] || MyAlipay.sign_type
+      if method == 'alipay.trade.wap.pay'
+        #手机支付
+        params[:biz_content] = params[:biz_content].merge({product_code: "QUICK_WAP_PAY"}).to_json
+      elsif method == 'alipay.trade.page.pay'
+        #电脑网站支付
+        params[:biz_content] = params[:biz_content].merge({product_code: "FAST_INSTANT_TRADE_PAY"}).to_json
+      end
+      params = {
+          app_id: MyAlipay.app_id,
+          method: method,
+          charset: 'UTF-8',
+          #format: 'JSON',
+          sign_type: 'RSA2',
+          timestamp: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          version: '1.0',
+          biz_content: ''
+      }.merge(params)
+      hash_str = params.stringify_keys #{a:1,b:2} 转换成 {'a'= '1','b'='2'}
+      sign_str = MyAlipay::Utils.params_to_string hash_str
+
+      case sign_type
+        when 'RSA2'
+          sign = Rsa2.sign(MyAlipay.app_private_key, sign_str)
+        when 'MD5'
+          sign = 'MD5'
+        else
+          raise ArgumentError, "invalid sign_type #{sign_type}, allow value: 'MD5', 'RSA2'"
+      end
+
+      return sign
+
+    end
+
+  end
+end

data/lib/my_alipay/version.rb

@@ -1,3 +1,3 @@
 module MyAlipay
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/my_alipay/wap/service.rb

@@ -1,12 +1,12 @@
 module MyAlipay
   module Wap
     module Service
-      GATEWAY_URL = 'https://openapi.alipaydev.com/gateway.do'
+      GATEWAY_URL = 'https://openapi.alipayde.com/gateway.do'
       #ALIPAYCONFIG = YAML.load_file("config/myalipay.yml")[Rails.env].with_indifferent_access.freeze
 
       #手机支付url
       def self.create_alipay_trade_wap_pay_url(params, options = {})
-        sign_params = MyAlipay::Wap::Sign.generate_wap_sign params
+        sign_params = MyAlipay::Sign.generate params,{method: 'alipay.trade.wap.pay'}
         MyAlipay.gateway_url + '?' + sign_params[:sign_str] + "&sign=#{ERB::Util.url_encode(sign_params[:sign])}"
       end
 

data/lib/my_alipay.rb

@@ -1,9 +1,13 @@
 require 'my_alipay/version'
 require 'my_alipay/utils'
-require 'my_alipay/wap/sign'
+require 'my_alipay/sign'
+require 'my_alipay/notify'
+require 'my_alipay/sign/rsa2'
+require 'my_alipay/sign/md5'
 require 'my_alipay/wap/service'
-require 'my_alipay/wap/notify'
 require 'my_alipay/wap/test'
+require  'my_alipay/page/service'
+
 
 module MyAlipay
   @debug_mode = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_alipay
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - yancheng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,11 +52,14 @@ files:
 - bin/console
 - bin/setup
 - lib/my_alipay.rb
+- lib/my_alipay/notify.rb
+- lib/my_alipay/page/service.rb
+- lib/my_alipay/sign.rb
+- lib/my_alipay/sign/md5.rb
+- lib/my_alipay/sign/rsa2.rb
 - lib/my_alipay/utils.rb
 - lib/my_alipay/version.rb
-- lib/my_alipay/wap/notify.rb
 - lib/my_alipay/wap/service.rb
-- lib/my_alipay/wap/sign.rb
 - lib/my_alipay/wap/test.rb
 - my_alipay.gemspec
 homepage: https://github.com/yanchengv/my_alipay

data/lib/my_alipay/wap/sign.rb

@@ -1,31 +0,0 @@
-module MyAlipay
-  module Wap
-    module Sign
-
-      #rsa2 SHA256
-      def self.generate_wap_sign(params)
-        params[:biz_content] = params[:biz_content].to_json
-        params = {
-            app_id: MyAlipay.app_id,
-            method: 'alipay.trade.wap.pay',
-            charset: 'UTF-8',
-            #format: 'JSON',
-            sign_type: 'RSA2',
-            timestamp: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
-            version: '1.0',
-            biz_content: ''
-        }.merge(params)
-
-        hash_str =  params.stringify_keys #{a:1,b:2} 转换成 {'a'= '1','b'='2'}
-        sign_str = MyAlipay::Utils.params_to_string hash_str
-        #sign_str = "app_id=2016080200146859&biz_content={\"subject\":\"测试数据\",\"out_trade_no\":\"123456\",\"total_amount\":\"100\",\"product_code\":\"QUICK_WAP_PAY\"}&charset=UTF-8&method=alipay.trade.wap.pay&sign_type=RSA2&timestamp=2014-07-24 03:07:50&version=1.0"
-        #如果秘钥key开头没有-----BEGIN PRIVATE KEY-----和-----END PRIVATE KEY-----需要base64解码，如果有则不需要进行解码
-        rsa = OpenSSL::PKey::RSA.new(Base64.decode64(MyAlipay.app_private_key))
-        digest = OpenSSL::Digest::SHA256.new
-        sign = Base64.strict_encode64(rsa.sign(digest, sign_str))
-        {sign_str: sign_str,sign: sign}
-      end
-
-    end
-  end
-end