reapal 0.2.2 → 0.3.0

data/lib/reapal/form/certificate_form.rb

@@ -0,0 +1,43 @@
+# coding: utf-8
+
+module Reapal
+  module Form
+    module CertificateForm
+
+      # 2.5 卡密鉴权
+      #
+      # @param flow_id [String] 订单号
+      # @param bind_id [String] 绑卡 ID，调用充值签约接口时，获取的bindId
+      # @param contract [String] 借款人协议号
+      # @param return_url [String] 回调 url
+      # @param notify_url [String] 通知 url
+      # @param terminal_type [String] 终端类型，默认手机端。PC端：web 手机端：mobile
+      #
+      # @return [ Hash ] 结果集
+      #   * :form_method
+      #     * :method
+      #     * :url
+      #   * :form_data
+      #     * :merchant_id
+      #     * :encryptkey
+      #     * :data
+      #
+      def withdraw_apply_form(flow_id, bind_id, contract, return_url, notify_url, terminal_type='mobile')
+        service = 'reapal.trust.certificate'
+        post_path = '/reagw/service/depwit.htm'
+
+        params = {
+          orderNo: flow_id,
+          contracts: contract,
+          terminalType: terminal_type,
+          returnUrl: return_url,
+          notifyUrl: notify_url,
+          applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+        }
+
+        get_form_data(service, params, post_path)
+      end
+
+    end
+  end
+end

data/lib/reapal/form/find_trade_password_form.rb

@@ -9,7 +9,7 @@ module Reapal
       # @param contract [String] 用户协议
       # @param return_url [String] 回调 url
       # @param notify_url [String] 通知 url
-      # @param buyway [String] 设备通道，默认手机端。00：PC端；01：手机端；02：Pad端；03：其它
+      # @param busway [String] 设备通道，默认手机端。00：PC端；01：手机端；02：Pad端；03：其它
       #
       # @return [ Hash ] 结果集
       #   * :form_method
@@ -32,15 +32,7 @@ module Reapal
           applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
         }
 
-        form_data = Http.get_body(service, params, @config)
-
-        {
-          form_method: {
-            method: :post,
-            url: config[:server_url] + post_path,
-          },
-          form_data: form_data
-        }
+        get_form_data(service, params, post_path)
       end
 
     end

data/lib/reapal/form/form_helper.rb

@@ -0,0 +1,35 @@
+# coding: utf-8
+module Reapal
+  module Form
+    module DataHelper
+
+      # 跳转到富民 Form 类的 api，统一返回处理
+      #
+      # @param service [ String ] 富民的服务
+      # @param params [ Hash ] 参数
+      # @param post_path [ String ] post url
+      #
+      # @return [ Hash ] 结果集
+      #   * form_method
+      #     * url
+      #     * method
+      #   * form_data
+      #     * :merchant_id
+      #     * :encryptkey
+      #     * :data
+      #
+      def get_form_data(service, params, post_path)
+        request = Http.get_body(service, params, @config)
+
+        {
+          form_method: {
+            :url => @config[:server_url] + post_path,
+            :method => :post,
+          },
+          form_data: request
+        }
+      end
+
+    end # DataHelper
+  end
+end

data/lib/reapal/form/mobile_modify_form.rb

@@ -10,7 +10,7 @@ module Reapal
       # @param new_phone [String] 新手机号
       # @param return_url [String] 回调 url
       # @param notify_url [String] 通知 url
-      # @param buyway [String] 设备通道，默认手机端。00：PC端；01：手机端；02：Pad端；03：其它
+      # @param busway [String] 设备通道，默认手机端。00：PC端；01：手机端；02：Pad端；03：其它
       #
       # @return [ Hash ] 结果集
       #   * :form_method
@@ -34,15 +34,7 @@ module Reapal
           applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
         }
 
-        form_data = Http.get_body(service, params, @config)
-
-        {
-          form_method: {
-            method: :post,
-            url: config[:server_url] + post_path,
-          },
-          form_data: form_data
-        }
+        get_form_data(service, params, post_path)
       end
 
     end

data/lib/reapal/form/withdraw_apply_form.rb

@@ -12,7 +12,7 @@ module Reapal
       # @param charge [Number] 手续费，2位小数
       # @param return_url [String] 回调 url
       # @param notify_url [String] 通知 url
-      # @param buyway [String] 设备通道，默认手机端。00：PC端；01：手机端；02：Pad端；03：其它
+      # @param busway [String] 设备通道，默认手机端。00：PC端；01：手机端；02：Pad端；03：其它
       #
       # @return [ Hash ] 结果集
       #   * :form_method
@@ -38,15 +38,7 @@ module Reapal
           applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
         }
 
-        form_data = Http.get_body(service, params, @config)
-
-        {
-          form_method: {
-            method: :post,
-            url: config[:server_url] + post_path,
-          },
-          form_data: form_data
-        }
+        get_form_data(service, params, post_path)
       end
 
     end

data/lib/reapal/http/communicate.rb

@@ -6,6 +6,7 @@ module Reapal
     VERSION = '1.0' # 版本号
 
     def self.post(service, params, config, post_path, version=VERSION)
+      version = VERSION if version.nil?
       post_body = get_body(service, params, config, version)
       uri = URI(config[:server_url] + post_path)
 
@@ -16,7 +17,7 @@ module Reapal
 
       begin
         response = Net::HTTP.post_form(uri, post_body)
-        Reapal.logger.info "[#{service}] 返回的报文为：\n#{response.body}"
+        Reapal.logger.info "[#{service}] 返回的报文为：\n#{response.body.force_encoding('utf-8')}"
 
         if response.is_a?(Net::HTTPSuccess)
           response_raw_body = unpack_body(response.body, config)
@@ -95,7 +96,7 @@ module Reapal
     end
 
     private
-    
+
     def self.unpack_body(body_string, config)
       begin
         # 返回是 json 字符串格式
@@ -119,7 +120,7 @@ module Reapal
 
     # 正确的返回字符串例子：
     #    'version=1.0&service=reapal.trust.onekeyContract&signType=0&sign=cdab41a05d595d6a5f5a818af2b39398&resData={"contracts":"RB1711167FYG9U29","userName":"王五","userIdentity":"330602198711160034","userMobile":"18357101332","orderNo":"5a0d488fe0c016049a000001","resultCode":"0007","processTime":"2017-11-16 16:13:04"}'
-    # 
+    #
     # 异常的返回字符串例子：
     #    '{"orderNo":"FFSS1","errorCode":"0107","service":"reapal.trust.onekeyContract","errorMsg":"姓名不能为空"}'
     def self.parse_data_string(data_string)
@@ -134,7 +135,7 @@ module Reapal
           result[sub_arr[0].to_sym] = sub_arr[1]
         }
       end
-      
+
       result
     end
 

data/lib/reapal/http/decode.rb

@@ -0,0 +1,29 @@
+# coding: utf-8
+module Reapal
+  module Http
+    module Decode
+
+      def self.decode_notify_data(encryptkey_arg, data_arg, config)
+        # 1. 拿到用来加密的16位随机字符串
+        random_key = Encrypt::RSA.decrypt(encryptkey_arg,
+                                          config[:private_key])
+
+        # 2. 用16位随机字符串解密返回的数据
+        data_string = Encrypt::AES.decrypt(data_arg, random_key)
+
+        data = Utils.symbolize_keys(JSON.parse(data_string))
+        data[:resData] = Utils.symbolize_keys(JSON.parse(data[:resData]))
+
+        # 3. 验签，错误时候 sign 是没有值的
+        if data[:resData][:errorCode] || (data[:sign] && Sign::MD5.verify?(data[:resData].to_json, config[:md5_key], data[:sign]))
+          data[:data_valid] = true
+        else
+          data[:data_valid] = false
+        end
+
+        data
+      end
+
+    end
+  end
+end

data/lib/reapal/http/error_code/common.rb

@@ -0,0 +1,13 @@
+# coding: utf-8
+# API 公共错误相关
+module Reapal
+  module Http
+    module ErrorCode
+
+      def self.common
+        ['0001']
+      end
+
+    end # module ErrorCode
+  end
+end

data/lib/reapal/http/error_code/money.rb

@@ -0,0 +1,44 @@
+# coding: utf-8
+# 支付/提现 API 错误相关
+module Reapal
+  module Http
+    module ErrorCode
+
+      def self.deposit_common
+        @_deposit_common ||= %w(0001 0004)
+      end
+
+      def self.deposit
+        @_deposit ||= %w(0000 0001 0003 0004 0005 0201 0202 0203 0204 0205
+                         0206 0207 0208 0209 1701 1702 1703 1704 1705 1706
+                         1707 1708 1709 1710 1711 1712 1713 1714 1801 1802
+                         1803 1804 1805 1901)
+      end
+
+      def self.deposit_apply_api
+        @_deposit_apply_api ||= %w(1701 1702 1703 1704 1705 1706
+                                   1707 1708 1709 1710 1711 1712
+                                   1713 1714) | deposit_common
+      end
+
+      def self.deposit_confirm_api
+        @_deposit_confirm_api ||= %w(1901) | deposit_common
+      end
+
+      def self.deposit_sms_api
+        @_deposit_sms_api ||= [] | deposit_common
+      end
+
+      def self.deposit_query
+        @_deposit_query ||= %w(0208) | deposit_common
+      end
+
+      def self.withdraw_query
+        @_withdraw_query ||= %w(0301 0302 0303 0304 0305 0306 0307 0308 0309
+          0310 0311 0312 0313 0314 0315 0316 0317 0318 0319 0320 0321 0322
+          0333 0324 0326 0327 0328 0329 0330 0331 0332 0333 0334 0335 0336
+          0337 0338 0339 0340)
+      end
+    end # module ErrorCode
+  end
+end

data/lib/reapal/http/error_code/order.rb

@@ -0,0 +1,17 @@
+# coding: utf-8
+# 订单查询 API 错误相关
+module Reapal
+  module Http
+    module ErrorCode
+
+      def self.query_by_single_flow_id
+        @_query_by_single_flow_id ||= ['0001'] | tender_common
+      end
+
+      def self.query_by_flow_id
+        @_query_by_flow_id ||= ['0001'] | tender_common
+      end
+
+    end # module ErrorCode
+  end
+end

data/lib/reapal/http/error_code/tender.rb

@@ -0,0 +1,69 @@
+# coding: utf-8
+# 投标 API 错误相关
+module Reapal
+  module Http
+    module ErrorCode
+
+      def self.tender_common
+        @_tender_common ||= %w(0400 0401 0402 0405 0406 0407 0408 0409 0410
+                               0411 0412 0413 0414 0415 0416 0417 0418 0419
+                               0420 0421 0422 0423 0424 0425 0426 0427 0428
+                               0429 0430 0431 0432 0433 0434 0435 0436 0437
+                               0438 0439 0440 0441 0442 0443 0444 0445 0446
+                               0447 0448 0449 0450)
+      end
+
+      def self.tender_cancel
+        @_tender_cancel ||= %w(0700 0701 0702 0703 0704 0705 0706 0707 0708
+                               0709 0710 0711 0712 0713 0714 0715 0716 0717
+                               0718 0719 1501 1502 1503 1504 1505 1506 1507
+                               1508)
+      end
+
+
+      def self.tender_apply
+        @_tender_apply ||= %w(0500 0501 0502 0503 0504 0505 0506 0507 0508
+                              0509 0510 0511 0512 0513 0514 0515 0516 0517
+                              0518 0519 0520 0521 0522 0523 0524 0525 0526
+                              0527 0528 0529 0530 0531 0532 0533 0534 0535
+                              0536)
+      end
+
+      def self.tender_repayment_project
+        @_tender_repayment_project ||= [] | tender_common
+      end
+
+      def self.tender_repayment_complete
+        @_tender_repayment_complete ||= [] | tender_common
+      end
+
+      def self.tender_auth_query
+        @_tender_auth_query ||= [] | tender_common
+      end
+
+      def self.tender_auth_cancel
+        @_tender_auth_cancel ||= [] | tender_common
+      end
+
+      def self.tender_finish
+        @_tender_finish ||= %w(0800 0801 0802 0803 0804 0805 0806 0807) | tender_common
+      end
+
+      def self.tender_onekey_invest
+        @_tender_onekey_invest ||= %w(0600 0601 0602 0603 0604 0605 0606 0607 0608 0609) | tender_common
+      end
+
+      def self.tender_onekey_refund
+        @_tender_onekey_refund ||= %w(0900 0901 0902 0903 0904 0905 0906 0907 0908 0909 0910
+                                      0911 0912 0913 0914 0915 0916 0917 0918 0919 0920 0921
+                                      0922 0923 0001) | tender_common
+      end
+
+      def self.tender_onekey_single_transfer
+        @_tender_onekey_single_transfer ||= %w(1000 1001 1002 1003 1004 1005 1006 1007 1008
+                                               1009 1010 1011 1012 1013 0001) | tender_common
+      end
+
+    end # module ErrorCode
+  end
+end

data/lib/reapal/http/error_code/user.rb

@@ -0,0 +1,45 @@
+# coding: utf-8
+# 用户 API 错误相关
+module Reapal
+  module Http
+    module ErrorCode
+
+      def self.contract_common
+        ['0103']
+      end
+
+      def self.contract_create
+        ['0101', '0102', '0103', '0104', '0105', '0106', '0107', '0108', '0109',
+         '0110', '0111', '0112', '0113', '0114', '0115', '0116', '0117', '0118',
+         '0119', '0120', '0121', '0122', '0123', '0124', '0125', '0126', '0127',
+         '0128', '0129', '0130', '0131', '0132', '0150', '0151', '0152', '0153',
+         '0154', '0155', '0156', '0157', '0158', '0159', '0160', '0161', '0162',
+         '0163', '0164', '0165', '0166', '0167']
+      end
+
+      def self.contract_query
+        ['0113']
+      end
+
+      def self.mobile
+        @_mobile ||= ['1108']
+      end
+
+      def self.bind_card
+        @_bind_card ||= %w(9060 9065 9083 9084 9085 0017 0210 0302 0303 0328
+                           0329 0330 0332 0333 0335 0339 0340 0341 0342 0343
+                           0344 0345 0346 0347 0348 0350 0351 0352 0358 0359
+                           0360 0362 0363)
+      end
+
+      def self.sub_account
+        @_sub_account ||= %w(0001 1601 1602 1603 1604 1605 1606 1607)
+      end
+
+      def self.sub_account_query
+        @_sub_account_query ||= %w(1608 1609 1610 1611)
+      end
+
+    end # module ErrorCode
+  end
+end

data/lib/reapal/utils.rb

@@ -23,8 +23,8 @@ module Reapal
     # @example
     #   JytPay::Utils.gen_flow_id
     #
-    # @param [ Integer ] 时间（默认是 now）
-    # @return [ String ] flow id
+    # @param time [ Integer ] 时间（默认是 now）
+    # @return [ String ]
     def self.gen_flow_id(time=Time.now.to_i)
       machine_id = Digest::MD5.digest(::Mac.addr).unpack("N")[0]
       process_id = Process.pid % 0xFFFF

data/lib/reapal/version.rb

@@ -1,3 +1,3 @@
 module Reapal
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapal
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-25 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,16 +124,27 @@ files:
 - bin/console
 - bin/setup
 - lib/reapal.rb
-- lib/reapal/api/asset/tender_all_cancel.rb
-- lib/reapal/api/asset/tender_apply.rb
-- lib/reapal/api/asset/tender_auth_cancel.rb
-- lib/reapal/api/asset/tender_auth_query.rb
-- lib/reapal/api/asset/tender_finish.rb
-- lib/reapal/api/asset/tender_repayment_complete.rb
-- lib/reapal/api/asset/tender_repayment_project.rb
-- lib/reapal/api/error_codes.rb
-- lib/reapal/api/money/.keep
-- lib/reapal/api/order/.keep
+- lib/reapal/api/api_helper.rb
+- lib/reapal/api/money/deposit_apply_api.rb
+- lib/reapal/api/money/deposit_confirm_api.rb
+- lib/reapal/api/money/deposit_query.rb
+- lib/reapal/api/money/deposit_sms_api.rb
+- lib/reapal/api/money/sub_account.rb
+- lib/reapal/api/money/sub_account_query.rb
+- lib/reapal/api/money/withdraw_query.rb
+- lib/reapal/api/order/query_by_flow_id.rb
+- lib/reapal/api/order/query_by_single_flow_id.rb
+- lib/reapal/api/order/tender_serial_no_query.rb
+- lib/reapal/api/tender/tender_all_cancel.rb
+- lib/reapal/api/tender/tender_apply.rb
+- lib/reapal/api/tender/tender_auth_cancel.rb
+- lib/reapal/api/tender/tender_auth_query.rb
+- lib/reapal/api/tender/tender_finish.rb
+- lib/reapal/api/tender/tender_onkey_invest.rb
+- lib/reapal/api/tender/tender_onkey_refund.rb
+- lib/reapal/api/tender/tender_onkey_single_transfer.rb
+- lib/reapal/api/tender/tender_repayment_complete.rb
+- lib/reapal/api/tender/tender_repayment_project.rb
 - lib/reapal/api/user/balance_query.rb
 - lib/reapal/api/user/bank_card_add_sms.rb
 - lib/reapal/api/user/bank_card_add_sms_again.rb
@@ -141,7 +152,9 @@ files:
 - lib/reapal/api/user/bind_card_query.rb
 - lib/reapal/api/user/contract_query.rb
 - lib/reapal/api/user/mobile_query.rb
+- lib/reapal/api/user/modify_bind_bank_card.rb
 - lib/reapal/api/user/onekey_batch_contract.rb
+- lib/reapal/api/user/onekey_com_contract.rb
 - lib/reapal/api/user/onekey_contract.rb
 - lib/reapal/api/user/undo_bind_bank_card.rb
 - lib/reapal/client.rb
@@ -149,13 +162,18 @@ files:
 - lib/reapal/encrypt/rsa.rb
 - lib/reapal/extensions.rb
 - lib/reapal/form/business_auth_form.rb
+- lib/reapal/form/certificate_form.rb
 - lib/reapal/form/find_trade_password_form.rb
+- lib/reapal/form/form_helper.rb
 - lib/reapal/form/mobile_modify_form.rb
-- lib/reapal/form/signle_tender_transfer_form.rb
-- lib/reapal/form/tender_invest_form.rb
-- lib/reapal/form/tender_refund_form.rb
 - lib/reapal/form/withdraw_apply_form.rb
 - lib/reapal/http/communicate.rb
+- lib/reapal/http/decode.rb
+- lib/reapal/http/error_code/common.rb
+- lib/reapal/http/error_code/money.rb
+- lib/reapal/http/error_code/order.rb
+- lib/reapal/http/error_code/tender.rb
+- lib/reapal/http/error_code/user.rb
 - lib/reapal/http/response.rb
 - lib/reapal/railtie.rb
 - lib/reapal/sign/md5.rb