lanmao 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fb9d6c75b1a564e976855ea056aded6334dc027
-  data.tar.gz: afb203332578bf14eff346c2f9e42f71f01e86cb
+  metadata.gz: 8380f0c51719efea1617de41d1e12fe9e61240b7
+  data.tar.gz: 42f342ffcb5d985cc1d7e9728428a6f7bc160d88
 SHA512:
-  metadata.gz: fff7e1075da4f5eaca292e34e6166eefe681767dde85d0930e3143f0f896eb567c83bbd5311220e6290317a5b61a98d25050b06751e81b00ae94c70a15f23f16
-  data.tar.gz: b67fa97980854416b9d09c34227f201224114ae5055e44633efa5e7987f853defb7c81be127deba1c44e5e1a82c55d9c3798c01725cd5da0a3cdfaa34565dd0f
+  metadata.gz: 23d955c27c0438bd1e140f4818e75113f71b3c008127644a9a1f32e248eb843fc042a7143ba06dbebf1129a7126a5bf3bf0271dca806f351a431f567561f4e3c
+  data.tar.gz: ae843e35a747a680f24eba63dfb354a53b2c2e6e6dae5f66e5c800fb4bc382f80b3599c417664b6959753569a4e986abff4f4a1a3d63a03961bb06db4617a96f

data/lib/lanmao/api/api_helper.rb

@@ -49,6 +49,33 @@ module Lanmao
         res
       end
 
+      def download_post(service, params, type)
+        request = Http::Request.new(params, @config, service, type)
+        response = request.post
+        res = {
+          result: 'P', # 默认
+          request_params: params,
+          response: response,
+          flow_id: nil,
+          code: nil,
+          error_code: nil,
+          error_msg: nil,
+          data: nil,
+        }
+        result = JSON.parse(response).with_indifferent_access rescue {}
+        if "1" == result[:code]
+          res[:result] = "F"
+          res[:code] = result[:code]
+          res[:error_code] = result[:errorCode]
+          res[:error_msg] = result[:errorMessage]
+        else
+          res[:result] = "S"
+          res[:data] = response
+        end
+
+        res
+      end
+
     end # CommunicateResultHelper
   end
 end

data/lib/lanmao/api/trade/download_checkfile.rb

@@ -22,7 +22,7 @@ module Lanmao
             fileDate: file_date
           }
 
-          res = operate_post(:operate, service, params, :service)
+          res = download_post(service, params, :download)
 
           res
         end

data/lib/lanmao/form/form_helper.rb

@@ -5,7 +5,7 @@ module Lanmao
 
       # 跳转到新网 Form 类的 api，统一返回处理
       #
-      # @param service [ String ] 富民的服务
+      # @param service [ String ] 新网的服务
       # @param params [ Hash ] 参数
       #
       # @return [ Hash ] 结果集

data/lib/lanmao/form/money/withdraw_form.rb

@@ -17,7 +17,7 @@ module Lanmao
         #       * :amount [Number] 金额
         #       * :balance [Number] 操作后账户余额
         #
-        def withdraw_form(flow_id, platform_user_no, expired, redirect_url, amount, withdraw_type='NORMAL', withdraw_form='IMMEDIATE', commission=0.0)
+        def withdraw_form(flow_id, platform_user_no, expired, redirect_url, amount, withdraw_type='NORMAL', withdraw_form='IMMEDIATE', commission=nil)
 
           service = "WITHDRAW"
 

data/lib/lanmao/http/request.rb

@@ -6,17 +6,19 @@ module Lanmao
       require 'active_support/all'
 
       def initialize(params, config, service, type)
-        Time.zone = "Beijing"
         @params = params
         @params[:timestamp] = Time.now.in_time_zone("Beijing").strftime('%Y%m%d%H%M%S') # 时间戳
 
         @config = config
         @service = service
+        @type = type
 
         @url = if :gateway == type                # 网关模式
                  @config[:path] + "/gateway"
                elsif :service == type             # 直连模式
                  @config[:path] + "/service"
+               elsif :download == type             # 对账文件下载模式
+                 @config[:path] + "/download"
                else
                  @config[:path]
                end
@@ -60,16 +62,22 @@ module Lanmao
         # 5. send http request
         Lanmao.logger.info "#{identifier} 发送的报文为：\n#{post_body}\n"
         http_response = RestClient.post(@url, post_body)
+
         Lanmao.logger.info "#{identifier} 返回的报文为：\n#{http_response.body.force_encoding('utf-8')}\n"
 
+        # 直接返回，数据以字节流形式在 response body 中输出，无签名
+        return http_response.body if @type == :download
+
         # 6. create response
         @response = Lanmao::Http::Response.new(service: @service,
                                                flow_id: flow_id,
                                                http_response: http_response,
                                                raw_body: http_response.body,
                                                data: Utils.symbolize_keys(JSON.parse(http_response.body)),
-                                               data_valid: true)
-                                               # data_valid: Sign.verify(res, @config))
+                                               # data_valid: true
+                                               data_valid: Sign::RSA.verify(http_response.body, http_response.headers[:sign],  @config)
+                                             )
+
       end
 
       def flow_id

data/lib/lanmao/sign/rsa.rb

@@ -3,12 +3,24 @@ module Lanmao
   module Sign
     module RSA
 
+      #签名
       def self.sign(content, private_key)
-        sign = private_key.sign('sha1', content.force_encoding("utf-8"))
+        sign = private_key.sign("sha1", content.force_encoding("utf-8"))
         signature = Base64.encode64(sign)
         signature = signature.delete("\n").delete("\r")
       end
 
+      ## 验签
+      def self.verify(data, sign, config)  ##如何从data里分离出原始数据和签名数据
+        if sign
+          sign = Base64.decode64(sign)
+          digester = OpenSSL::Digest::SHA1.new
+          config[:public_key].verify(digester, sign, data)
+        else
+          true
+        end
+      end # verify
+
     end
   end
 end

data/lib/lanmao/version.rb

@@ -1,3 +1,3 @@
 module Lanmao
-  VERSION = "0.8.0"
+  VERSION = "0.9.1"
 end

data/lib/lanmao.rb

@@ -18,6 +18,7 @@ require "lanmao/sign/rsa"
 require "lanmao/http/request"
 require "lanmao/http/response"
 
+
 # 自动加载所有 api
 Dir["#{File.dirname(__FILE__)}/lanmao/api/**/*.rb"].each { |file| require file }
 # 自动加载所有 form

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanmao
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler