wireway 202009251743 → 202012021613

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94f2c70d3374c7d5012262e2c7c0789bf516dbd37101615a03774be406dbd5d
-  data.tar.gz: d6235b22333696d6c2dd41824a0f653387ad42ae0c70b9a4b111e18d16f556f0
+  metadata.gz: f3560a2e7a16cf646a436dd381ffc4dedb3de1a7b46f332cf95a0f569bad57c4
+  data.tar.gz: 2b6c7a4db9d7738ba057bbdb405e0069abe67fef70c7e4bc268e87839e9d86e3
 SHA512:
-  metadata.gz: 91c3e345d45b034aad5406994e0b655646e55da42372e635a8dd9e27d30efd46aaf1fdb12ceb4fe8bbb7ad864ae8cb1ded43aff2f5c46766043875d5ba5cab3b
-  data.tar.gz: 96349bd30a3e1eebd4ac5a6ef7e7fafc5a05228b9165892ed546ceed9235b94a6aa00964db2f1899247c5945d56c834bf34516680863404f831be4815cc35ca5
+  metadata.gz: 6ae23df57e3f022fe2f5aa0f0f52ec11323c4bc22298454b0cc636a5c644fe73515ffef6ac2bcc3f370c6827d44cf1e07240fd1e96db33b532e26cb34ae40ed2
+  data.tar.gz: f5a2426012577837d8608d2087dbb912537a0ff3c23d1fbc9fe56fed8e3bc154df8f2792924156e4f3efc911de7e0884dc748f4ca5dc66a32b2b6ddaf7e39495

data/README.md

@@ -1,3 +1,15 @@
+
+<!-- TOC -->
+
+- [说明](#说明)
+  - [执照](#执照)
+  - [插件作用](#插件作用)
+  - [行为准则](#行为准则)
+  - [关于C919](#关于c919)
+  - [使用示例](#使用示例)
+
+<!-- /TOC -->
+
 # 说明
 
 ## 执照
@@ -27,4 +39,14 @@ C919为系列Gem组件的集合,具体组成部分及相关示例[参考](https:
 ```ruby
 Wireway::Spark.satcom(api_code: :finance_fund_base_info, code: '161725')
 # => [true, {:基金全称=>"招商中证白酒指数分级证券投资基金", :基金简称=>"招商中证白酒指数分级", :基金代码=>"161725（前端）", :基金类型=>"股票指数", :发行日期=>"2015年05月12日", :"成立日期/规模"=>"2015年05月27日 / 3.965亿份", :资产规模=>"129.25亿元（截止至：2020年06月30日）", :份额规模=>"184.0866亿份（截止至：2020年08月26日）", :基金经理人=>"侯昊", :基金托管人=>"中国银行", :成立来分红=>"每份累计0.00元（0次）", :管理费率=>"1.00%（每年）", :托管费率=>"0.22%（每年）", :销售服务费率=>"---（每年）", :最高认购费率=>"0.80%（前端）", :业绩比较基准=>"中证白酒指数收益率×95%+金融机构人民币活期存款基准利率(税后)×5%", :跟踪标的=>"中证白酒指数", :母子基金=>"161725（母）150269 150270（子）", :是否配对转换=>"是", :是否转LOF=>"否", :封闭期=>"无", :提前结束条款=>"无", :定期折算日=>"每个会计年度的12月15日(遇节假日顺延)", :不定期折算条件=>"当招商中证白酒份额的基金份额净值达到1.500元;当招商中证白酒B份额的基金份额参考净值达到0.250元。", :固定收益份额年化收益率=>"一年期定期存款利率(税后)+3%", :亏损临界点=>"无", :保收益临界点=>"无", :超额收益临界点=>"无"}]
+```
+
+或无需引用Gem直接发起Post请求:
+
+```bash
+curl --location --request POST '123.57.155.17:3114/wireway/restful/request_api' \
+--header 'Content-Type: application/x-www-form-urlencoded' \
+--data-urlencode 'platform=satcom' \
+--data-urlencode 'api_code=finance_fund_base_info' \
+--data-urlencode 'code=161725'
 ```

data/app/controllers/wireway/application_controller.rb

@@ -1,5 +1,6 @@
 module Wireway
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
+    skip_before_action :verify_authenticity_token
   end
 end

data/app/controllers/wireway/restful_controller.rb

@@ -0,0 +1,13 @@
+module Wireway
+  class RestfulController < ApplicationController
+    def request_api
+      # TODO 初步了解为rails5的安全机制 去除存在风险 暂时先这样
+      args = params.permit!.to_hash.reject!{|key| ["action", "controller"].include?(key)}.deep_symbolize_keys
+
+      res = Wireway::Spark.send(args[:platform], args)
+      tmp = {success: res[0], result: res[1]}
+      (tmp.merge!(res[2]) rescue nil) if res[2].present?
+      render json: tmp.merge!(tmp)
+    end
+  end
+end

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

@@ -11,21 +11,15 @@ module Wireway
       def node_addresses
         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]]
+        nodes = ['123.57.155.17:3113']
+        route = '/satcom/other/c919/node_addresses.json'
+        res = get(addresses: nodes, 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
+        return res unless res[0]
+        $wireway_node_addresses = res[1].map{|key, value| [key, value[:nodes]]}.to_h
       end 
 
       def dashboard(**args)
@@ -33,10 +27,11 @@ module Wireway
           response_type: 'json',
         }.merge!(args)
         route = '/dashboard/restful/request_api'
-
-        post(addresses: node_addresses[:dashboard], route: route, params: params) do |res|
-          return res if (params[:response_type] != 'json')
-          body = JSON.parse(res[1][:body]).deep_symbolize_keys 
+        res = node_addresses
+        return res unless res[0]
+        post(addresses: res[1][:dashboard], route: route, params: params) do |result|
+          return result if (params[:response_type] != 'json')
+          body = JSON.parse(result[1][:body]).deep_symbolize_keys 
           return [false, body[:result]] unless body[:success]
           [true, body[:html_content]]
         end 
@@ -45,43 +40,71 @@ module Wireway
       def satcom(**args)
         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 
-          return [false, body[:result]] unless body[:success]
+        res = node_addresses
+        return res unless res[0]
+        post(addresses: res[1][:satcom], 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[:result]]
         end
       end
 
+      def wireway(**args)
+        params = {
+          local: false
+        }.merge!(args)
+        route = '/wireway/restful/request_api'
+        res = node_addresses
+        return res unless res[0]
+        post(addresses: res[1][:wireway], 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[: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

@@ -3,10 +3,21 @@ 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)
+    # 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)
+        res = target.send(method_name, args)
+      rescue
+        error_msg = [false, '请求异常', {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

data/config/routes.rb

@@ -1,2 +1,7 @@
 Wireway::Engine.routes.draw do
+  resources :restful, only:[] do 
+    collection do
+      post :request_api
+    end 
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wireway
 version: !ruby/object:Gem::Version
-  version: '202009251743'
+  version: '202012021613'
 platform: ruby
 authors:
 - ff4c00
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,6 +86,7 @@ files:
 - app/assets/javascripts/wireway/application.js
 - app/assets/stylesheets/wireway/application.css
 - app/controllers/wireway/application_controller.rb
+- app/controllers/wireway/restful_controller.rb
 - app/helpers/wireway/application_helper.rb
 - app/jobs/wireway/application_job.rb
 - app/mailers/wireway/application_mailer.rb