wireway 202009261101 → 202009261823

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9237eaee0fd2deb0be287b9fbdc82c055547985a059d4f60c36f22ca6ebd56c
-  data.tar.gz: f524f667e4a0c2b4feb00fc4194c2647ceeaee07dcfeb8a5b4961b526e48caa2
+  metadata.gz: fe78d0e055c3c3f939469f26705ad12ce8279b73831d7ccb269b805c590bdfd4
+  data.tar.gz: 0c6b60c52344c59943ed2a9dda5ad7eba360839f0505f49b72d567e999622615
 SHA512:
-  metadata.gz: 2b72a87f14671df8d89f55673f3321f27f27742fb848d293a7880f7e038f526ae7f90a8aab5cfe9f0de9f9f54dd6615a6fcac97baff50fd157cd059673029bbf
-  data.tar.gz: 3d3e2e50c7bef6c6e0ccb1a8990b0f0fe6d94d6a6d47db85e4067dd3461fe094226277a1f04b2c17ce14404b29c39d19e3145bf925cff60a4ed85dc4b2f30e49
+  metadata.gz: 451e827ce40582528b4d0b0f900f46f5e11598d566327c1c8ef1ec20c8253679263b5dd5a297e0a057cae3894aa05ffb0e1cfda092879c9680fc86d37e7c1f86
+  data.tar.gz: 16edffb414030b9225ba1158fd25b8311bd23ed59b004f8c7cca35275143e93cac9ee98723a53c1ba71898d750387e8e272303ca3f7468324b6f75cbbd0ec3d1

data/README.md

@@ -27,4 +27,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,9 +11,9 @@ module Wireway
       def node_addresses
         return $wireway_node_addresses unless $wireway_node_addresses == 404
 
-        hosts = ['172.28.81.156:3113']
+        nodes = ['123.57.155.17:3113']
         route = '/satcom/other/c919/node_addresses.json'
-        res = get(addresses: hosts, route: route) do |result|
+        res = get(addresses: nodes, route: route) do |result|
           hash = JSON.parse(result[1][:body]).deep_symbolize_keys 
           [true, hash]
         end
@@ -41,11 +41,23 @@ module Wireway
 
         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]
+          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'
+
+        post(addresses: node_addresses[: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(addresses:, route:, params: {})
         result = round_robin(addresses: addresses) do |address|

data/app/models/wireway/spark.rb

@@ -3,13 +3,20 @@ 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)
+    # 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
-        return [false, '请求异常', {errors: {message: $!.to_s, path: $@}}]
+        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 
 

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wireway
 version: !ruby/object:Gem::Version
-  version: '202009261101'
+  version: '202009261823'
 platform: ruby
 authors:
 - ff4c00
@@ -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