k3cloud-sdk 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9f13e7dae26d950dec804b2dcfc315d6f8a5ed08e23b69c9443d17f8a0bde77
-  data.tar.gz: 43c42ac730bf506a61b5ea51a33036579096c34fa06345fb598e27b7011622c3
+  metadata.gz: e3d5427f36e12e1e388da43eccf61e2663c52603d480eb6fef15c3ea3891ea60
+  data.tar.gz: 8ff167a6fe22be81d5949ebe59c0b3ab8b95dff4fa33ee266922af94e01d4460
 SHA512:
-  metadata.gz: 033b860f4d85d5ce6e4b8599e8cd8ba9f95c065c470b4618a39205fb28852bf4dedd701a06f8ee2b6a357d33d910efb9ecc249baa2e353e932ddc1d4f3c458dc
-  data.tar.gz: '082ff58a369c49835fe6c71f7abaebf580401d9f3ee3bef41e0451511b72ee32daffa5d4c90a5c5966cc9ca18506cd535618b51ae9e22c00a9869838729c23b2'
+  metadata.gz: 24e064b03a1e76e2bc604a3c441e8132877110296895b99498a37535383fd1d0bd8f5e9a4c542e29e4076bb2f2a9e18682e00842c50ac12e151acd83e0b11476
+  data.tar.gz: 1f808f707ff27c324763c4aa56f08285fa6b684a31a696bc496e55cdaacbc4cdad6aabd87b3b3616e4f5a60318b3eed57d4a6fc63e3209d7a8ad2de539e0db98

data/Gemfile.lock

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

data/lib/k3cloud/errors/k3cloud_error.rb

@@ -14,7 +14,7 @@ class K3cloudError < StandardError
 
   def self.parse(json)
     index = json.index("{")
-    json = json[index..] if index >= 0
+    json = json[index..-1] if index >= 0
 
     parsed_json = JSON.parse(json)
     kd_error = K3cloudError.new

data/lib/k3cloud/http.rb

@@ -29,10 +29,10 @@ module K3cloud
       request["User-Agent"] = "Kingdee/Ruby WebApi SDK"
       request.body = @body.to_json
       response = http.request(request)
+      if response.code != 200 && response.code != 206
+        raise StandardError, "status: #{response.code}, desc: #{response.body}"
+      end
       response.body
-    rescue StandardError => e
-      K3cloud.logger.warn "#{e.message} => K3cloud::HTTP.post('#{@url}')"
-      nil
     end
   end
 end

data/lib/k3cloud/utils/md5_utils.rb

@@ -11,7 +11,7 @@ module MD5Utils
     result = ""
 
     s.each_byte do |byte|
-      result += (byte & 0xFF | -256).to_s(16)[6..]
+      result += (byte & 0xFF | -256).to_s(16)[6..-1]
     end
 
     result

data/lib/k3cloud/version.rb

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

data/lib/k3cloud/web_api_client.rb

@@ -16,38 +16,22 @@ module K3cloud
     end
 
     def execute(service_name, parameters)
-      url = @config.server_url
-      if url.nil? || url.empty?
-        url = "https://api.kingdee.com/galaxyapi/"
-      else
-        url = url.to_s.strip.chomp("/")
-        url = "#{url}/#{service_name}.common.kdsvc"
-      end
-
-      header = build_header(get_url_path(url))
-      body = {
-        "format" => 1,
-        "useragent" => "ApiClient",
-        "parameters" => parameters,
-        "v" => "1.0"
-      }
-      request = Http.new(url, header, body, @config.connect_timeout, @config.request_timeout)
-      result = request.post
-
-      if result&.start_with?("response_error:")
+      result = execute_json(service_name, parameters)
+      if result.start_with?("response_error:")
         error = K3cloudError.parse(result)
-        raise StandardError, result if error.nil?
-
-        message = error.inner_ex_wrapper.nil? ? error.message : "#{error.message} --> #{error.inner_ex_wrapper.message}"
-        raise StandardError, message
+        if error.nil?
+          raise StandardError, result
+        else
+          message = error.inner_ex_wrapper.nil? ? error.message : "#{error.message} --> #{error.inner_ex_wrapper&.message}"
+          raise StandardError, message
+        end
       else
         begin
-          if result.include?(',"IsSuccess":false,')
-            raise StandardError, result
-          else
-            JSON.parse(result)
-          end
-        rescue JSON::ParserError => e
+          json = JSON.parse(result)
+          raise StandardError, json if result.include?(',"IsSuccess":false,')
+
+          json
+        rescue StandardError => e
           raise StandardError, "JSON parse error, response: [#{result}]", e
         end
       end
@@ -55,10 +39,26 @@ module K3cloud
 
     private
 
-    def get_url_path(url)
+    def execute_json(service_name, parameters)
+      url = @config.server_url
+      if url.nil? || url.empty?
+        url = "https://api.kingdee.com/galaxyapi/"
+      else
+        url = url.to_s.strip.chomp("/")
+      end
+      url = "#{url}/#{service_name}.common.kdsvc"
+      K3cloud.logger.info("request_url: #{url}")
+
+      header = build_header(url_path(url))
+      body = { parameters: parameters }
+      request = Http.new(url, header, body, @config.connect_timeout, @config.request_timeout)
+      request.post
+    end
+
+    def url_path(url)
       if url.start_with?("http")
         index = url.index("/", 10)
-        index.nil? ? url : url[index..]
+        index > -1 ? url[index..-1] : url
       else
         url
       end
@@ -94,6 +94,9 @@ module K3cloud
         header[ConstDefine::X_KD_SIGNATURE] = kd_signature
       end
       header
+    rescue StandardError => e
+      K3cloud.logger.info("#{e.backtrace}")
+      {}
     end
 
     def decode_sec(sec)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k3cloud-sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - zevinto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies: []
 description: Ruby Gem for K3cloud API.
 email: