k3cloud-sdk 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c129198e6a505d9b23108206100c842f1b0f94c0af6e23d7861653959ad45aa
-  data.tar.gz: dba6a6547c17d7e80fbf0aacee553a4c9f96f9c81c69d26867a52732ffdad93b
+  metadata.gz: a4eb5a3114bbb90e9d4ef2ccc079b87c8fa4ff8982c5567475f638a8f8e50bbe
+  data.tar.gz: e346af656cd09b7bb3f0c745ded7f41655dfe2584f380ddfa24816f9e37ede47
 SHA512:
-  metadata.gz: 53fd09b1ea66c3c07c282fbc61ba19b98a34976e91786bd92f3e9f692f69e782ce3d7680011db3191575a11a5746a87b5d173027768217f92fbd86dfeca89d13
-  data.tar.gz: d3878ab3f399a20c9d915feb73f0cd0b0c2b23148924b71640a9239a4f77cd29b3988549397be8cbc7b3152b2de97429d791bf6f3efa4638fc62c3698c91e876
+  metadata.gz: 38be2feabc87804721feb2ceeb5dc6f551f73f1fca676f597c683614e28f7e930f398ecb15a1754c291c69bb01ff019bdbad2af8d849e2f7e5370459a3460a12
+  data.tar.gz: 769f509e8a9e7a430571c7feedd2e1d4ab305b8d5c62f973a1aaf1b73baa86e2f44ac625374c3575f5e8a324fe4fbc4728004e3d1e551ca5b3bba574aa2f5657

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    k3cloud-sdk (0.4.4)
+    k3cloud-sdk (0.4.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/k3cloud/configuration.rb

@@ -32,15 +32,15 @@ module K3cloud
     attr_accessor :connect_timeout, :request_timeout
 
     def initialize(options = {})
-      @acct_id = options[:acct_id]
-      @user_name = options[:user_name]
-      @password = options[:password]
-      @app_id = options[:app_id]
-      @app_secret = options[:app_secret]
-      @server_url = options[:server_url]
-      @org_num = options[:org_num]
-      @connect_timeout = options[:connect_timeout]
-      @request_timeout = options[:request_timeout]
+      @acct_id          = options[:acct_id]
+      @user_name        = options[:user_name]
+      @password         = options[:password]
+      @app_id           = options[:app_id]
+      @app_secret       = options[:app_secret]
+      @server_url       = options[:server_url]
+      @org_num          = options[:org_num]
+      @connect_timeout  = options[:connect_timeout]
+      @request_timeout  = options[:request_timeout]
 
       yield(self) if block_given?
     end

data/lib/k3cloud/errors/k3cloud_error.rb

@@ -24,7 +24,7 @@ module K3cloud
       kd_error.inner_exception = K3cloudError.parse(parsed_json["InnerException"].to_json)
       kd_error
     rescue StandardError => e
-      K3cloud.logger.error("k3cloud Failed to parse exception message: #{e.message}")
+      K3cloud.logger.error({ errmsg: "Failed to parse exception message. #{e.message}", backtrace: "#{e.backtrace}", type: 'error', lever: 'ERROR' })
       nil
     end
   end

data/lib/k3cloud/http.rb

@@ -4,52 +4,56 @@ require "k3cloud/errors/response_error"
 require "net/http"
 require "net/https"
 require "uri"
+require "json"
 
 module K3cloud
   # HTTP Client
   class Http
-    attr_accessor :url, :header, :body, :connect_timeout, :request_timeout
+    attr_accessor :url, :header, :body, :connect_timeout, :request_timeout, :status_code
 
-    def initialize(url, header, body, connect_timeout, request_timeout)
+    def initialize(url, header, body, connect_timeout = 120, request_timeout = 120)
       @url = url
-      @header = header
+      @header = header || {}
       @body = body
-      @connect_timeout = connect_timeout || 2
-      @request_timeout = request_timeout || 2
+      @connect_timeout = connect_timeout
+      @request_timeout = request_timeout
     end
 
     def post
-      uri = URI(@url)
+      uri = URI.parse(@url)
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = (uri.scheme == "https")
-      http.open_timeout = @connect_timeout * 60
-      http.read_timeout = @request_timeout * 60
-      request = Net::HTTP::Post.new(uri)
+      # SSL/TLS configuration
+      if uri.scheme == "https"
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      http.open_timeout = @connect_timeout
+      http.read_timeout = @request_timeout
+      request = Net::HTTP::Post.new(uri.request_uri)
       request.initialize_http_header(@header)
       request["Content-Type"] = "application/json"
-      request["User-Agent"] = "Kingdee/Ruby WebApi SDK"
-      request.body = @body.to_json
-      max_retries = 5 # 最大重试次数
-      retry_count = 0
-      sleep_interval = 5 # 重试间隔时间，单位秒
-
-      begin
-        response = http.request(request)
-        if response.code.to_i != 200 && response.code.to_i != 206
-          raise K3cloud::ResponseError, "status: #{response.code}, desc: #{response.body}"
-        end
-        response.body
-      rescue Errno::ETIMEDOUT, Net::OpenTimeout, Net::ReadTimeout => e
-        K3cloud.logger.error("Request timed out: #{e.message}")
-        if retry_count < max_retries
-          retry_count += 1
-          K3cloud.logger.info("Request timed out. Retrying #{retry_count}/#{max_retries} in #{sleep_interval} seconds...")
-          sleep(sleep_interval)
-          retry
-        else
-          raise K3cloud::ResponseError, "Request failed after #{max_retries} retries: #{e.message}, backtrace: #{e.backtrace}"
-        end
-      end
+      request["User-Agent"] = generate_user_agent
+      request.body = @body.is_a?(String) ? @body : @body.to_json
+
+      response = http.request(request)
+      @status_code = response.code.to_i
+      raise K3cloud::ResponseError, "status: #{response.code}, desc: #{response.body}" if @status_code >= 400
+
+      response.body
+    rescue Errno::ETIMEDOUT, Net::OpenTimeout, Net::ReadTimeout => e
+      raise K3cloud::ResponseError, "Request timed out: #{e.message}"
+    rescue Net::HTTPServerError => e
+      raise K3cloud::ResponseError, "Server error: #{e.message}"
+    rescue => e
+      raise K3cloud::ResponseError, "Unexpected error: #{e.message}"
+    end
+
+    private
+
+    # Generate User-Agent string with client info
+    def generate_user_agent
+      "Kingdee/Ruby WebApi SDK(v#{K3cloud::VERSION}) (Ruby #{RUBY_VERSION}; #{RUBY_PLATFORM})"
     end
   end
 end

data/lib/k3cloud/k3cloud_api.rb

@@ -42,7 +42,8 @@ module K3cloud
 
     # 单据查询
     def execute_bill_query(data)
-      execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery", [data])
+      rows = execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery", [data])
+      handle_query_result(rows)
     end
 
     # 删除
@@ -131,5 +132,16 @@ module K3cloud
     def switch_org(data)
       execute("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.SwitchOrg", [data])
     end
+
+    private
+
+    def handle_query_result(rows)
+      if !rows[0].nil? && (result = rows[0][0]).is_a?(Hash)
+        K3cloud.logger.error({ errmsg: result, type: 'error', lever: 'ERROR' })
+        []
+      else
+        []
+      end
+    end
   end
 end

data/lib/k3cloud/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module K3cloud
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/lib/k3cloud/web_api_client.rb

@@ -37,14 +37,8 @@ module K3cloud
     private
 
     def execute_json(service_name, parameters)
-      url = @config.server_url
-      url = if url.nil? || url.empty?
-              "https://api.kingdee.com/galaxyapi/"
-            else
-              url.to_s.strip.chomp("/")
-            end
-      url = "#{url}/#{service_name}.common.kdsvc"
-      K3cloud.logger.info("request_url: #{url}")
+      url = build_url(service_name)
+      K3cloud.logger.info("Request URL: #{url}")
 
       header = build_header(url_path(url))
       body = { parameters: parameters }
@@ -52,6 +46,15 @@ module K3cloud
       request.post
     end
 
+    def build_url(service_name)
+      base_url = if @config.server_url.nil? || @config.server_url.empty?
+              "https://api.kingdee.com/galaxyapi/"
+            else
+              @config.server_url.to_s.strip.chomp("/")
+            end
+      "#{base_url}/#{service_name}.common.kdsvc"
+    end
+
     def url_path(url)
       if url.start_with?("http")
         index = url.index("/", 10)
@@ -92,7 +95,7 @@ module K3cloud
       end
       header
     rescue StandardError => e
-      K3cloud.logger.info("#{e.backtrace}")
+      K3cloud.logger.error({ errmsg: "Build header exception.", backtrace: "#{e.backtrace}", type: 'error', lever: 'ERROR' })
       {}
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k3cloud-sdk
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - zevinto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-19 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies: []
 description: Ruby Gem for K3cloud OpenApi that uses cryptographic signature technology
   to avoid plaintext transmission of keys and enables automatic login.
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Ruby Gem for K3cloud API.