imperituroard 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f4803bd76c090876b654425c6a5a76237ce07da
-  data.tar.gz: afc8920cded7afea1bab18ebc83ab992915f1329
+  metadata.gz: e940fef724694620f92446e776b76f186aefb9f2
+  data.tar.gz: 7684c9da421ec5e068e1992aa69d9908d8617398
 SHA512:
-  metadata.gz: fa6fd8bb0af774f0acd9a01cd74bb1851f5c437eb06c981a86767d1c0151261f3b62f4bba1624d835bc2902147229d2828f9a1ff8291134ada8786cc3a8acebc
-  data.tar.gz: 19874621621215547e23187b1643f3422d44228d071e357fada3b91e7f0cb35f76e4df8c4b5c5c28bd6194a06f9a9c8f17106a3bc19b6ee5e4c5e0871a7b3ced
+  metadata.gz: 192b9dc5e4d12006aa68c10cd50455edffb5c6d0ed0452022437653c7780c506e40a99bf2a084c1ce264fd4f5214e8511e37f4e8c32e505a8b54638be9422bab
+  data.tar.gz: 65d41e4c02a8f54585dd6652e9637e60b0b60204788d7e0bcfd50ed7632ee3c9959dc7f50a26745189a11cf8104f1859843d67cedb0ed47602df6463a3d8b559

data/lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb

@@ -74,6 +74,11 @@ class HuaIot
       request.body = URI.encode_www_form(data)
       res = https.request(request)
       out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+      fff = {:func => "get_token",
+             :iot_fun => "",
+             :req_header => {:content_type => 'application/x-www-form-urlencoded'
+             }}
+      client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
     rescue
       out_resp = {:code => 500, :message => "failed get token"}
     end
@@ -106,6 +111,10 @@ class HuaIot
       request.body = URI.encode_www_form(data)
       res = https.request(request)
       out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+      fff = {:func => "token_logout",
+             :iot_fun => "logout"
+      }
+      client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
     rescue
       out_resp = {:code => 500, :message => "failed logout token"}
     end
@@ -131,7 +140,6 @@ class HuaIot
     request['app_key'] = app_id
     request.body = {nodeId: node_id}.to_json
     res = https.request(request)
-    p res.body.to_s
     {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
   end
 
@@ -220,15 +228,11 @@ class HuaIot
       request['Authorization'] = 'Bearer ' + token
       request['app_key'] = app_id
       res = https.request(request)
-      p "res.code"
-      p res.code
-      p res.body
       if res.body != nil
         out_resp = {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
       else
         out_resp = {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
       end
-
       fff = {:func => "dev_delete",
              :iot_fun => "2.2.12",
              :req_header => {:authorization => 'Bearer ' + token,
@@ -239,7 +243,6 @@ class HuaIot
     rescue
       out_resp = {:code => 500, :message => "dev_delete: Unknown IOT error"}
     end
-    p out_resp
     out_resp
   end
 
@@ -310,6 +313,7 @@ class HuaIot
 
   #2.9.6 Querying Directly Connected Devices and Their Mounted Devices in Batches
   def querying_device_direct_conn(app_id, secret, dev_list)
+    output_str = {}
     token = get_token(app_id, secret)[:body]["accessToken"]
     path = "/iocm/app/dm/v1.1.0/queryDevicesByIds"
     url_string = "https://" + platformip + ":" + platformport + path
@@ -323,9 +327,18 @@ class HuaIot
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
-    request.body = {deviceIds: dev_list}.to_json
+    req_body = {deviceIds: dev_list}
+    request.body = req_body.to_json
     res = https.request(request)
-    {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    output_str = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    fff = {:func => "querying_device_direct_conn",
+           :iot_fun => "2.9.6",
+           :req_header => {:authorization => 'Bearer ' + token,
+                           :content_type => 'application/json',
+                           :app_key => app_id
+           }}
+    client_iot_mongo.audit_iot_logger(fff, url_string, req_body, output_str)
+    output_str
   end
 
 
@@ -390,7 +403,8 @@ class HuaIot
       request.content_type = 'application/json'
       request['Authorization'] = 'Bearer ' + token
       request['app_key'] = app_id
-      request.body = {location: address}.to_json
+      req_b = {location: address}
+      request.body = req_b.to_json
       res = https.request(request)
       p res.code
       p res.body
@@ -399,6 +413,13 @@ class HuaIot
       else
         out_resp = {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
       end
+      fff = {:func => "dev_modify_location_v2",
+             :iot_fun => "2.2.11",
+             :req_header => {:authorization => 'Bearer ' + token,
+                             :content_type => 'application/json',
+                             :app_key => app_id
+             }}
+      client_iot_mongo.audit_iot_logger(fff, url_string, req_b, out_resp)
     rescue
       out_resp = {:code => 500, :message => "dev_modify_location_v2: Unknown IOT error"}
     end

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler