wireway 202012021617 → 202012161641

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d07a6ca738f27ad3c9fd623c8bdbce18acb7860e27f3afc1410de25ec57496f
-  data.tar.gz: 49e48b8cbe49c109dbfa937ba7104908dabc559d38e3e72db457fb46e55f79cd
+  metadata.gz: 8330c413fc8bd8b3bddd33990d1c124c2974ad0a9a45c4ec7e8b220f933dc417
+  data.tar.gz: db406a9c62ad0fbb1c0d42f4f41f20490e35ca6e7b95957f9424d881bd78728f
 SHA512:
-  metadata.gz: 83fcb9122548dcd969db7524ae4dc1cddd325d27ab9476a0403df1079dc9908d3edfa4ea0e9228227b1e5e8df0ad326bfef23379981cf92bb7bf5c12e35364b8
-  data.tar.gz: ae11a93a1377341c08f7e1c31f27300d48e20402541a5cd49a1eb05c0a704624a4558fdef54c6f56c0de48bb46fadb4b03623dab47a6a629ffab91d4a7eb9eda
+  metadata.gz: 4d84f15fe9da85b6348362085c0b0e574061448262b50701f209b2b234bbfbfcf92806e223fabba2b8b3d67eecd6f73094a777cd415acca2fb0f718465e8a72f
+  data.tar.gz: a42d73253abb53f7ac68c6ba95225bee4cb164238e2548d2c1233af639201da95f81b0169f44cb41dbcd77e84bd9e1ce488c544860e2afe3f6e348815eb7fc47

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

@@ -62,7 +62,19 @@ module Wireway
           return [false, body[:result], body[:errors]].compact unless body[:success]
           [true, body[:result]]
         end
-      end 
+      end
+
+      def black_box(**args)
+        params = {}.merge!(args)
+        route = '/black_box/restful/request_api'
+        res = node_addresses
+        return res unless res[0]
+        res = post(addresses: res[1][:black_box], route: route, params: params) do |result|
+          body = JSON.parse(result[1][:body]).deep_symbolize_keys
+          return [false, body[:result], body[:errors]].compact unless body[:success]
+          [true, body]
+        end
+      end
 
       def get(addresses:, route:, params: {})
         result = round_robin(addresses: addresses) do |address|
@@ -75,7 +87,7 @@ module Wireway
         begin
           yield result
         rescue
-          return [false, '运行时结果处理异常', {errors: {message: $!.to_s, path: $@}}]
+          return [false, '[Wireway]运行时结果处理异常', {errors: {message: $!.to_s, path: $@}}]
         end
       end 
 
@@ -88,7 +100,7 @@ module Wireway
         begin
           yield result
         rescue
-          return [false, '运行时结果处理异常', {errors: {message: $!.to_s, path: $@}}]
+          return [false, '[Wireway]运行时结果处理异常', {errors: {message: $!.to_s, path: $@}}]
         end
       end 
 
@@ -109,7 +121,7 @@ module Wireway
         def get_response
           begin
             response = yield
-            return [false, "响应码异常:#{response.code}", {response: response}] unless (response.code == 200)
+            return [false, "[Wireway]响应码异常:#{response.code}", {response: response}] unless (response.code == 200)
 
             hash = {code: 200}
             res = handle_body_encode(body: response.body)
@@ -117,7 +129,7 @@ module Wireway
 
             hash.merge!({body: res[1]})
           rescue
-            return [false, '请求异常', {errors: {message: $!.to_s, path: $@}}]
+            return [false, '[Wireway]请求异常', {errors: {message: $!.to_s, path: $@}}]
           end
           
           [true, hash]

data/app/models/wireway/spark.rb

@@ -1,24 +1,21 @@
 module Wireway
   module Spark
-    
-    # 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')
-    # Wireway::BusinessLogic::Restful::node_addresses
-    # Wireway::Spark.wireway(platform: :satcom, api_code: :finance_fund_base_info, code: '161725')
     def self.method_missing(method_name, local: true, **args)
       begin
         target = Wireway::BusinessLogic::Restful
-        return [false, '未找到相关定义方法'] unless target.respond_to?(method_name)
+        unless [true, 'true', 1, '1', 'yes'].include?(local)
+          return [false, "未找到名称为:#{method_name}的方法定义."] unless target.respond_to?(method_name)
+        end
         res = target.send(method_name, args)
       rescue
-        error_msg = [false, '请求异常', {errors: {message: $!.to_s, path: $@}}]
+        error_msg = [false, '[Wireway]请求异常', {errors: {message: $!.to_s, path: $@}}]
         return error_msg unless [true, 'true', 1, '1', 'yes'].include?(local)
         # 当以Gem形式的组件无法处理请求时,尝试请求线上版组件是否可以正常处理请求
         # 即当gem出现问题时会请求线上服务 有利于断点排查
         args.merge!(platform: method_name)
         res = target.wireway(args)
       end
-    end 
+    end
 
   end
 end

data/app/models/wireway/standard.rb

@@ -0,0 +1,145 @@
+module Wireway
+  # 接口请求参数标准
+  module Standard
+    extend self
+
+      # 全自检项检查
+      def inspect_all(ideal:, reality:)
+        ideal_reality = {ideal: ideal, reality: reality}
+
+        res = default_value(ideal_reality)
+        return res unless res[0]
+
+        res = value_type(ideal_reality)
+        return res unless res[0]
+        
+        res = attribute_necessary(ideal_reality)
+        return res unless res[0]
+
+        # res = check_data_format(described: described, reality: reality)
+        # return res unless res[0]
+        [true, '']
+      end 
+
+      # 参数项检查
+      def attribute_necessary(ideal:, reality:)
+        # 检查必须参数是否缺失
+        necessary_standards = ideal.select{|standard| standard[:necessary] == true}
+        necessary_standards.each do |standard|
+          key = standard[:key]
+          unless (reality[key.to_sym] || reality[key]).present?
+            return [false, "#{standard[:name]}(#{key})为必须项,不能为空"]
+          end 
+        end 
+        
+        # 检查参数值是否符合正则式要求
+        reality.each do |key, value|
+          standard = ideal.select{|standard| [key, key.to_sym, key.to_s].uniq.include?(standard[:key])}[0]
+          # return [false, "未找到关于参数:#{key} 的定义"] unless standard
+          next unless standard
+
+          if standard[:regular] && (value.to_s =~ standard[:regular]).nil?
+            tmp = "参数:#{standard[:name]}(#{key})的参数值(#{value})不满足要求"
+            tmp+= ", 请参考: #{standard[:explain]}" if standard[:explain].present?
+            tmp+= ", 示例值: #{standard[:example]}" if standard[:example].present?
+            tmp+= ", 默认值: #{standard[:default]}" if standard[:default].present?
+            tmp+='.'
+            return [false, tmp] 
+          end 
+        end 
+
+        [true, '']
+      end 
+
+      # 参数默认值检查
+      def default_value(ideal:, reality:)
+        ideal.select{|standard| !standard[:default].nil?}.each do |standard|
+          unless reality[standard[:key].to_sym].present?
+            reality.merge!({standard[:key].to_sym => standard[:default]})
+          end
+        end 
+
+        [true, '']
+      end
+
+      # 参数值格式检查
+      def value_type(ideal:, reality:)
+        ideal.each do |standard|
+          unless standard[:value_type].present?
+            return [false, "自描述参数标准检查异常: #{standard[:name]}(#{standard[:key]})未设置对应参数值类型(value_type)."]
+          end 
+        end
+
+        ideal.each do |standard|
+          old_value = reality[standard[:key].to_sym]
+
+          case standard[:value_type].to_sym
+          when :string_or_array, :array_or_string
+            new_value = (JSON.parse(old_value) rescue false)
+            new_value = old_value.split(/, |,/) unless new_value
+          when :array
+            error_msg = [false, "参数:#{standard[:key]},参数类型不符合Json数组要求."]
+            next if old_value.is_a?(Array)
+
+            new_value = (JSON.parse(old_value) rescue (return error_msg))
+            return error_msg unless new_value.is_a?(Array)
+          when :key_value
+            error_msg = [false, "参数:#{standard[:key]},参数类型不符合Json键值对要求."]
+            next if old_value.is_a?(Hash)
+
+            new_value = (JSON.parse(old_value) rescue (return error_msg))
+            return error_msg unless new_value.is_a?(Hash)
+          when :boolean
+            new_value = [true, 'true', '1', 1].include?(old_value)
+          when :integer
+            max_value = standard[:max]
+            return [false, "参数:#{standard[:key]},参数值:#{old_value} 大于接口定义最大值:#{max_value}."] if max_value.present? && (old_value.to_i > max_value)
+            next if old_value.is_a?(Integer)
+            if old_value == '0'
+              new_value = 0
+            else
+              return [false, "参数:#{standard[:key]},参数类型不符合数字要求."] if ((old_value.to_i rescue 0) == 0)
+              new_value = old_value.to_i
+            end
+          else
+            next
+          end 
+
+          unless (old_value == new_value)
+            reality.merge!({standard[:key].to_sym => new_value})
+          end 
+        end
+
+        [true, '']
+      end 
+
+      def check_data_format(described:, reality:)
+        data_format = {}
+        if (reality[:data_format] == ['original']) && (reality[:key_type] == 'zh')
+          described[:data_structure].map do |key, value| 
+            data_format.merge!([[value, key]].to_h)
+          end
+          reality[:data_format] = data_format
+          return [true, ''] 
+        elsif (reality[:data_format] == ['original'])
+          described[:data_structure].each do |key, value| 
+            data_format.merge!([[key, key]].to_h)
+          end
+          reality[:data_format] = data_format
+          return [true, ''] 
+        end 
+        
+        data_format = reality[:data_format]
+        data_format = data_format.map(&:to_sym)
+        data_structure = {}
+        described[:data_structure].map{|key, value| data_structure.merge!([[key, key], [value.to_sym, key]].to_h)}
+        hit_items = data_structure.select{|key, value| data_format.include?(key)}
+        missed = (data_format - hit_items.keys).join(',')
+        return [false, "所提供数据格式中:#{missed},未找到对应匹配数据项"] if missed.present?
+        
+        reality[:data_format] = hit_items
+        [true, '']
+      end 
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wireway
 version: !ruby/object:Gem::Version
-  version: '202012021617'
+  version: '202012161641'
 platform: ruby
 authors:
 - ff4c00
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,6 +93,7 @@ files:
 - app/models/wireway/application_record.rb
 - app/models/wireway/business_logic/restful.rb
 - app/models/wireway/spark.rb
+- app/models/wireway/standard.rb
 - app/views/layouts/wireway/application.html.erb
 - config/routes.rb
 - lib/tasks/wireway_tasks.rake