kuai_jie_qian 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b31b5d737f12e893068a9a8f03a904c903f7dd4
-  data.tar.gz: 2b63a115fe87d393763b523c274fd85979a83c8d
+  metadata.gz: b0c8c7da33b874568b4364f198384555ff7906bb
+  data.tar.gz: abc08626958873da930b3a10fc140b9a6ce478b2
 SHA512:
-  metadata.gz: 7b0a021b7dd7f7787f541e68d7a187d6f5cce0401ced840b89f6099aff0c3ee1545a32d117527d03ec95bfa12d9afe47a301832806687da9656707833bd94ee4
-  data.tar.gz: 453d503b7c55d965fab8b5731ed247f1e8976fde4d37960c861b25977e178f80c9029acd9d39a4240c8c7632c1df5dae75b6330dc342646c8bc1b2f3bbc20b0c
+  metadata.gz: dad7cc8d77a81c56d46c40c0daa01a5a2635016b0e6d93188e4d866f59832d901d9bc5d77e36415bf19af72aa54ae124b8ad25cc3b445e636349809d679186e7
+  data.tar.gz: c859df6d305b82b00029d28ecf8e174d300c4fd6af9b0b30a221ae044381c3bc2ba7e3ea693100d5fefd721e1b85de7ee1b1d5e68e57db4bcba08f188136bbcc

data/kuai_jie_qian.gemspec

@@ -40,6 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rest-client', '~> 2.0', '>= 2.0.2'
   spec.add_dependency 'pdfkit', '~> 0.8.2'
   spec.add_dependency 'wkhtmltopdf-binary', '~> 0.12.3.1'
-  spec.add_dependency 'grim'
   spec.add_dependency 'rmagick', '~>2.16.0'
 end

data/lib/kuai_jie_qian.rb

@@ -4,8 +4,7 @@ require "json"
 require "rest-client"
 require "pdfkit"
 require "base64"
-require "grim"
-require 'RMagick'
+require 'rmagick'
 
 require "kuai_jie_qian/version"
 require "kuai_jie_qian/logger"

data/lib/kuai_jie_qian/client_method/merchant_sign.rb

@@ -6,7 +6,6 @@ module KuaiJieQian
       #
       # 平台自身签署摘要(文件流)
       # @param file_stream [file] 文件流
-      # @param sign_type [String] 签章类型，Single（单页签章）、Multi（多页签章）、Edges（签骑缝章）、Key（关键字签章）
       # @param seal_position_info [hash] 签章信息
       #   * pos_page [String] 签署页码, 若为多页签章，支持页码格式“1-3,5,8“, 坐标定位时不可空
       #   * pos_type [Integer] 默认0（若为关键字定位，签章类型（signType）必须指定为关键字定位才生效）
@@ -14,15 +13,16 @@ module KuaiJieQian
       #   * pos_x [Float] 签署位置X坐标
       #   * pos_y [Float] 签署位置Y坐标
       #   * width [Float] 印章展现高度
+      # @param sign_type [String] 签章类型，Single（单页签章）、Multi（多页签章）、Edges（签骑缝章）、Key（关键字签章）
       #
       # @return [ Hash ] 结果集
       #   * errCode [Integer] 错误码
       #   * msg [String] 错误信息
       #   * errShow [Boolean] 错误信息是否显示
       #   * signServiceId [String] 签署记录id
-      #   * stream [String] 签署后的文件base64
+      #   * stream [String] 签署后的文件 base64
       #
-      def merchant_sign(file_stream, sign_type, seal_position_info)
+      def merchant_sign(file_stream, seal_position_info, sign_type="Key")
         path = "tech-sdkwrapper/timevale/sign/selfStreamSign"
 
         params = {
@@ -31,7 +31,9 @@ module KuaiJieQian
           :signPos => seal_position_info.to_json,
         }
 
-        KuaiJieQian::Http.post(@config[:host], @config[:project_config][:projectId], path, params, nil)
+        result = KuaiJieQian::Http.post(@config[:host], @config[:project_config][:projectId], path, params, nil)
+
+        Base64.decode64(result[:stream])
       end
       #
       # 平台自身签署摘要(本地)

data/lib/kuai_jie_qian/client_method/user_register.rb

@@ -16,67 +16,51 @@ module KuaiJieQian
       #   * seal_data [String] 电子印章图片base64数据
       #
       def user_register(name, id, color, template_type, reg_type)
-        account_id = if 'PERSONAL' == reg_type
-                       create_person_account(name, id)
-                     else
-                       create_company_account(name, id, reg_type)
-                     end
-
-        seal_data = create_company_seal(account_id, color, template_type)
+        account_id = create_account(name, id, reg_type)
+        seal_data = create_seal(reg_type, account_id, color, template_type)
 
         return { :account_id => account_id, :seal_data => seal_data}
       end
 
-
       private
 
-      # 创建个人用户账号
-      def create_person_account(user_name, id)
-        path = "tech-sdkwrapper/timevale/account/addPerson"
-        params = {
-        	"name": user_name,
-        	"idNo": id
-        }
+      def create_account(user_name, id, reg_type)
+        if 'PERSONAL' == reg_type
+          path = "tech-sdkwrapper/timevale/account/addPerson"
+          params = {
+            name: user_name,
+            idNo: id
+          }
+        else
+          path = "tech-sdkwrapper/timevale/account/addOrganize"
+          params = {
+            name: user_name,
+            organCode: id,
+            regType: reg_type
+          }
+        end
+        
         account_data = KuaiJieQian::Http.post(@config[:host], @config[:project_config][:projectId], path, params)
+        
         return account_data[:accountId]
       end
 
-      #创建个人用户印章
-      def create_person_seal(account_id, color, template_type)
-        path = "tech-sdkwrapper/timevale/seal/addPersonSeal"
+      def create_seal(reg_type, account_id, color, template_type)
+        path = if 'PERSONAL' == reg_type
+                 "tech-sdkwrapper/timevale/seal/addPersonSeal"
+               else
+                 "tech-sdkwrapper/timevale/seal/addOrganizeSeal"
+               end
+        
         params = {
-          "accountId": account_id,
-          "color": color,
-          "templateType": template_type
+          accountId: account_id,
+          color: color,
+          templateType: template_type
         }
         seal_data = KuaiJieQian::Http.post(@config[:host], @config[:project_config][:projectId], path, params)
-        return seal_data[:sealData]
-      end
 
-      #创建企业用户账号
-      def create_company_account(name, id, reg_type)
-        path = "tech-sdkwrapper/timevale/account/addOrganize"
-        params = {
-        "name": name ,
-        "organCode": id,
-        "regType": reg_type
-      }
-      account_data = KuaiJieQian::Http.post(@config[:host], @config[:project_config][:projectId], path, params)
-      return account_data[:accountId]
-      end
-
-      #创建企业用户印章
-      def create_company_seal(account_id, color, template_type)
-        path = "tech-sdkwrapper/timevale/seal/addOrganizeSeal"
-        params = {
-          "accountId": account_id,
-          "color": color,
-          "templateType": template_type
-        }
-        seal_data = KuaiJieQian::Http.post(@config[:host], @config[:project_config][:projectId], path, params)
         return seal_data[:sealData]
       end
-
     end # end module
   end
 end

data/lib/kuai_jie_qian/client_method/user_sign.rb

@@ -8,7 +8,6 @@ module KuaiJieQian
       # @param account_id [String] 签署账户标识
       # @param seal_data [String] 印章图片base64
       # @param file_stream [file] 文件流
-      # @param sign_type [String] 签章类型，Single（单页签章）、Multi（多页签章）、Edges（签骑缝章）、Key（关键字签章）
       # @param seal_position_info [hash] 签章信息
       #   * pos_page [String] 签署页码, 若为多页签章，支持页码格式“1-3,5,8“, 坐标定位时不可空
       #   * pos_type [Integer] 默认0（若为关键字定位，签章类型（signType）必须指定为关键字定位才生效）
@@ -16,6 +15,7 @@ module KuaiJieQian
       #   * pos_x [Float] 签署位置X坐标
       #   * pos_y [Float] 签署位置Y坐标
       #   * width [Float] 印章展现高度
+      # @param sign_type [String] 签章类型，Single（单页签章）、Multi（多页签章）、Edges（签骑缝章）、Key（关键字签章）
       #
       # @return [ Hash ] 结果集
       #   * errCode [Integer] 错误码
@@ -24,7 +24,7 @@ module KuaiJieQian
       #   * signServiceId [String] 签署记录id
       #   * stream [String] 签署后的文件base64
       #
-      def user_sign(account_id, seal_data, file_stream, sign_type, seal_position_info)
+      def user_sign(account_id, seal_data, file_stream, seal_position_info, sign_type="Key")
         path = "tech-sdkwrapper/timevale/sign/userStreamSign"
 
         params = {
@@ -35,8 +35,9 @@ module KuaiJieQian
           "signPos": seal_position_info.to_json
         }
 
-        KuaiJieQian::Http.post(@config[:host], @config[:project_config][:projectId], path, params, nil)
+        result = KuaiJieQian::Http.post(@config[:host], @config[:project_config][:projectId], path, params, nil)
 
+        Base64.decode64(result[:stream])
       end
 
       def user_sign_with_file(account_id, seal_data, file_info, sign_type, sign_pos)

data/lib/kuai_jie_qian/http.rb

@@ -17,11 +17,11 @@ module KuaiJieQian
         request_body = params
       end
 
-      KuaiJieQian.logger.info "post [#{final_url}] with header: [#{header}], params: [#{params}]"
+      # KuaiJieQian.logger.info "post [#{final_url}] with header: [#{header}], params: [#{params}]"
 
       response = RestClient.post(final_url, request_body, header)
 
-      KuaiJieQian.logger.debug "post [#{final_url}] got result: [#{response}]\n"
+      # KuaiJieQian.logger.info "post [#{final_url}] got result: [#{response}]\n"
 
       begin
         res = Utils.symbolize_keys(JSON.parse(response))
@@ -29,7 +29,7 @@ module KuaiJieQian
         raise "post [#{final_url}] 解析结果出错"
       end
 
-      KuaiJieQian.logger.debug "res: [#{res}]\n"
+      # KuaiJieQian.logger.debug "res: [#{res}]\n"
       res
     end
 

data/lib/kuai_jie_qian/utils.rb

@@ -21,12 +21,35 @@ module KuaiJieQian
       kit.to_pdf
     end
 
-    def self.pdf_to_png(file)
-      pdf = Grim.reap(file)
-      png = pdf[0].save(file.split(".").first + '.png',
-                        {:quality => 90, :alpha => "remove", :colorspace => "RGB"}
-                      )
+    def self.pdf_to_png(pdf_file_path, png_path_dir, png_name)
+      pngs = []
 
+      pdf = Magick::ImageList.new(pdf_file_path){self.background_color = 'white'}
+
+      pdf.each_with_index{ |obj, i|
+        png_file_fullname ="#{png_path_dir}/#{png_name}_#{i+1}.png"
+        res = obj.write(png_file_fullname)
+        pngs << {fullname: png_file_fullname, successd: !res.nil?}
+      }
+
+      # pdf = Grim.reap(pdf_file_path)
+
+      # KuaiJieQian.logger.info pdf_file_path
+      # KuaiJieQian.logger.info pdf
+
+      # count = pdf.count
+
+      # KuaiJieQian.logger.info count
+
+      # (0..count-1).each{ |i|
+      #   png_file_fullname ="#{png_path_dir}/#{png_name}_#{i+1}.png"
+      #   KuaiJieQian.logger.info i
+      #   successd = pdf[i].save(png_file_fullname,
+      #                         {:quality => 90, :alpha => "remove", :colorspace => "RGB"})
+      #   pngs << {fullname: png_file_fullname, successd: successd}
+      # }
+
+      pngs
     end
 
   end # end module

data/lib/kuai_jie_qian/version.rb

@@ -1,3 +1,3 @@
 module KuaiJieQian
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuai_jie_qian
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,20 +134,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.3.1
-- !ruby/object:Gem::Dependency
-  name: grim
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement