wireway 202009251743 → 202009260916

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94f2c70d3374c7d5012262e2c7c0789bf516dbd37101615a03774be406dbd5d
-  data.tar.gz: d6235b22333696d6c2dd41824a0f653387ad42ae0c70b9a4b111e18d16f556f0
+  metadata.gz: cc36a1205a1ce8c38095ccac73fcff1807c07434105769785a2b7db98450ff60
+  data.tar.gz: f5a4cd7ecbce2efab9f053ed8fe28abc535e46ae494c81ecb2bd5ff862f4e11d
 SHA512:
-  metadata.gz: 91c3e345d45b034aad5406994e0b655646e55da42372e635a8dd9e27d30efd46aaf1fdb12ceb4fe8bbb7ad864ae8cb1ded43aff2f5c46766043875d5ba5cab3b
-  data.tar.gz: 96349bd30a3e1eebd4ac5a6ef7e7fafc5a05228b9165892ed546ceed9235b94a6aa00964db2f1899247c5945d56c834bf34516680863404f831be4815cc35ca5
+  metadata.gz: 9a679323899c8252c4a9d09e5d6f82b42d6e291f08d64d7af73bb495fcf67370ef5c1046d6b514d9b02cda4a22d0f75801cb32a87b3c88f6966b62340713ed59
+  data.tar.gz: 593a2e97789b881197610b6a737ec07afc53506d587f2ceac862e54062dcc2441b6fe67008fc2aaf8545fc61c67ca7138f9519ccb63983c9d88d41e882165292

data/app/models/wireway/business_logic/restful.rb

@@ -12,20 +12,13 @@ module Wireway
         return $wireway_node_addresses unless $wireway_node_addresses == 404
 
         hosts = ['172.28.81.156:3113']
-        route = '/satcom/restful/request_api'
-        params = {
-          api_code: 'other_c919_node_addresses',
-          key_type: 'en'
-        }
-        
-        result = post(addresses: hosts, route: route, params: params) do |res|
-          body = JSON.parse(res[1][:body]).deep_symbolize_keys 
-          return [false, body[:result]] unless body[:success]
-          [true, body[:result]]
+        route = '/satcom/other/c919/node_addresses.json'
+        res = get(addresses: hosts, route: route) do |result|
+          hash = JSON.parse(result[1][:body]).deep_symbolize_keys 
+          [true, hash]
         end
-        raise result[1] unless result[0]
-
-        $wireway_node_addresses = result[1].map{|key, value| [key, value[:nodes]]}.to_h
+        raise res[1] unless res[0]
+        $wireway_node_addresses = res[1].map{|key, value| [key, value[:nodes]]}.to_h
       end 
 
       def dashboard(**args)
@@ -34,9 +27,9 @@ module Wireway
         }.merge!(args)
         route = '/dashboard/restful/request_api'
 
-        post(addresses: node_addresses[:dashboard], route: route, params: params) do |res|
+        post(addresses: node_addresses[:dashboard], route: route, params: params) do |result|
           return res if (params[:response_type] != 'json')
-          body = JSON.parse(res[1][:body]).deep_symbolize_keys 
+          body = JSON.parse(result[1][:body]).deep_symbolize_keys 
           return [false, body[:result]] unless body[:success]
           [true, body[:html_content]]
         end 
@@ -46,42 +39,56 @@ module Wireway
         params = {}.merge!(args)
         route = '/satcom/restful/request_api'
 
-        post(addresses: node_addresses[:satcom], route: route, params: params) do |res|
-          body = JSON.parse(res[1][:body]).deep_symbolize_keys 
+        post(addresses: node_addresses[:satcom], route: route, params: params) do |result|
+          body = JSON.parse(result[1][:body]).deep_symbolize_keys 
           return [false, body[:result]] unless body[:success]
           [true, body[:result]]
         end
       end
 
 
-      def get(url:, params: {})
-        get_response do 
-          full_url = [url, URI.encode_www_form(params)]
+      def get(addresses:, route:, params: {})
+        result = round_robin(addresses: addresses) do |address|
+          full_url = [address+route, URI.encode_www_form(params)]
           full_url.delete_if{|item| !item.present? }
           RestClient.get(full_url.join("?"))
         end
+        return result unless (result[0] && block_given?)
+        
+        begin
+          yield result
+        rescue
+          return [false, '运行时结果处理异常', {errors: {message: $!.to_s, path: $@}}]
+        end
       end 
 
       def post(addresses:, route:, params: {})
-        res = nil
-        addresses.each do |addresses|
-          res = get_response do 
-            RestClient.post "#{addresses}/#{route}", params
-          end
-          # TODO: 后期应该优化判断是服务不可以用还是传递参数问题倒是返回false
-          # 或者当一定比例节点均无法正常响应时即判定为参数问题
-          break if res[0]
-        end 
-        return res unless (block_given? || res[0])
-        
+        result = round_robin(addresses: addresses) do |address|
+          RestClient.post "#{address}/#{route}", params
+        end
+        return result unless (result[0] && block_given?)
+
         begin
-          yield res
+          yield result
         rescue
           return [false, '运行时结果处理异常', {errors: {message: $!.to_s, path: $@}}]
         end
       end 
 
       private
+        def round_robin(addresses:)
+          res = nil
+          addresses.each do |address|
+            res = get_response do
+              yield address
+            end
+            # TODO: 后期应该优化判断是服务不可以用还是传递参数问题倒是返回false
+            # 或者当一定比例节点均无法正常响应时即判定为参数问题
+            break if res[0]
+          end 
+          res
+        end
+
         def get_response
           begin
             response = yield

data/app/models/wireway/spark.rb

@@ -4,9 +4,13 @@ module Wireway
     # Wireway::Spark.dashboard(api_code: :publish_other_request_assets, rely_assets: ["bootstrap_4", "jQuery_3_5_1", "chart_js"])
     # Wireway::Spark.satcom(api_code: :finance_fund_base_info, code: '161725')
     def self.method_missing(method_name, **args)
-      target = Wireway::BusinessLogic::Restful
-      return [false, '未找到相关定义方法'] unless target.respond_to?(method_name)
-      res = target.send(method_name, args)
+      begin
+        target = Wireway::BusinessLogic::Restful
+        return [false, '未找到相关定义方法'] unless target.respond_to?(method_name)
+        res = target.send(method_name, args)
+      rescue
+        return [false, '请求异常', {errors: {message: $!.to_s, path: $@}}]
+      end
     end 
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wireway
 version: !ruby/object:Gem::Version
-  version: '202009251743'
+  version: '202009260916'
 platform: ruby
 authors:
 - ff4c00
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails