推送服务代码重构一期

config/database.yml

 #   gem 'sqlite3'

app/controllers/pushs_controller.rb

   # igetui_opts 个推推送的额外选项
   def push
     param! :app_name, String, required: true
-    param! :device_ids_opts, String, required: true
+    # param! :device_ids_opts, String, required: true
     param! :message, String, required: true
     param! :igetui_opts, String
     param! :app_type, String
     param! :sync_push, String
+    param! :user_ids, Array, required: true
 
     igetui_opts = JSON.parse(params[:igetui_opts]) rescue {}
     message = JSON.parse(params[:message]) rescue {}
-    device_ids_opts = JSON.parse(params[:device_ids_opts]) rescue {}
+    user_ids = JSON.parse(params[:user_ids]) rescue {}

app/services/push_sync_client.rb

+  end
+
+  def push_sync?
+    if @sync_push
+      timeout_seconds = $redis.get('push_timeout').to_i
+      if timeout_seconds > 0
+        Timeout.timeout(timeout_seconds) {
+          ::PushWorker.new.perform(@opts)
+        }
+      else
+        ::PushWorker.new.perform(@opts)
+      end
+    else
+      ::PushWorker.perform_async(@opts)
+    end
+  end

app/controllers/pushs_controller.rb

-  # app_name 应用名称
-  # user_device_ids 设备ids
-  # message 推送信息的json 字符串
-  # igetui_opts 个推推送的额外选项
-  def push
-    param! :app_name, String, required: true
-    param! :device_ids_opts, String, required: true
+
+    igetui_opts = JSON.parse(params[:igetui_opts]) rescue {}
+    message = JSON.parse(params[:message]) rescue {}
+
+    db_role = fetch_db_role
+    user_device_exist = false
+    ActiveRecord::Base.connected_to(role: db_role) do
+      user_device_exist = UserDevice.where(user_id: params[:user_id]).exists?
+      byebug

app/controllers/pushs_controller.rb

-  # user_device_ids 设备ids
-  # message 推送信息的json 字符串
-  # igetui_opts 个推推送的额外选项
-  def push
-    param! :app_name, String, required: true
-    param! :device_ids_opts, String, required: true
+
+    igetui_opts = JSON.parse(params[:igetui_opts]) rescue {}
+    message = JSON.parse(params[:message]) rescue {}
+
+    db_role = fetch_db_role
+    user_device_exist = false
+    ActiveRecord::Base.connected_to(role: db_role) do
+      user_device_exist = UserDevice.where(user_id: params[:user_id]).exists?
+      byebug
+      stale?(last_modified: UserDevice.where(user_id: params[:user_id]).last.updated_at)

app/services/token.rb → app/controllers/concerns/token_validate.rb

-module Token
+module TokenValidate
+  extend ActiveSupport::Concern
   ACCESS_TOEKN_EXPIRE_TIME = 7200
-  class << self
-    def key(app_name)
-      "push:api:#{app_name}:access_token"
-    end
+    
+  def validate_token(app_name, token)
+    !! (token == get_token(app_name))

app/controllers/pushs_controller.rb

 class PushsController < ApplicationController
   include ActionController::HttpAuthentication::Token
-  skip_before_action :verify_authenticity_token
+  # skip_before_action :verify_authenticity_token

app/services/push_tool_client.rb

+#push功能的代理选择用哪种推送工具1.个推 2.小米 3.华为
+class PushToolClient
+  
+  def initialize(opts={})
+    opts = HashWithIndifferentAccess.new(opts)
+    @user_ids = opts[:user_ids]
+    @opts = opts
+  end
+
+  def do_push
+    Settings.platform = @opts[:app_type] || Settings::DEFAULT

app/models/user_device.rb

+class UserDevice < ApplicationRecord
+  self.table_name = 'user_devices'
+  connects_to database: { dev: :dev_development, test: :test_development, staging: :staging_development, production: :production }
+  
+  
+  # 当前app端传递的platform的值:
+  # android: igetui, xiaomi, huawei
+  # iso: igetui 目前还不清楚为啥不用apns,暂时不修改
+  enum platform: %i[igetui apns xiaomi huawei]
+  
+  enum device_platform: %i[ios android]
+  
+  # 用于区分当前的应用，为了推送准备， 因为推送需要根据不同的应用使用不同的 id,secret等。
+  enum app_type: %i[ik_duli lx_duli lx_yun]

app/services/push_tool_client.rb

+    Igetui::Pusher.new(igetui_ios_client_ids, @opts.merge(device_platform: 'ios')).perform if igetui_ios_client_ids.present?
+
+    #现在好像不用了
+    # Push::IgetuiIos.push(@push_collections[:igetui_ios], @opts) if @push_collections[:apns].present?
+    # Push::IgetuiAndroid.push(@push_collections[:igetui_android], @opts) if @push_collections[:apns].present?
+
+    Xiaomi::Pusher.new(xiaomi_client_ids, @opts[:message]).perform if xiaomi_client_ids.present?
+    Huawei::Pusher.new(huawei_client_ids, @opts[:message]).perform if huawei_client_ids.present?
+  end
+  
+  def fetch_client_ids
+    igetui_android_client_ids = igetui_ios_client_ids = xiaomi_client_ids = huawei_client_ids = []
+    
+    if (@opts[:device_ids_opts].is_a? Hash) && @user_ids.blank?
+      push_devices = @opts[:device_ids_opts].keys.map(&:to_s)
+      if push_devices.include? "igetui"

app/workers/push_worker.rb

   include Sidekiq::Worker
   sidekiq_options queue: :push
 
-  def perform(device_ids_opts, message, igetui_opts, platform = nil)
-    Push.push(device_ids_opts, message, igetui_opts, platform)
+  def perform(opts)

app/services/push/huawei.rb → app/services/huawei/pusher.rb

-        end
-        params_str
+      }
+      ::Log.info("huawei_payload: #{payload}, device_tokens: #{device_tokens}")
+      params = {
+        access_token: CGI.escape(access_token),
+        nsp_svc: CGI.escape('openpush.message.api.send'),
+        nsp_ts: CGI.escape(Time.now.to_i.to_s),
+        device_token_list: CGI.escape(device_tokens.to_s),
+        payload: CGI.escape(payload.to_json)
+      }
+      params_str = ''
+      params.each_with_index do |(key,value), index|
+        params_str += "#{key}=#{value}"
+        params_str += '&' if index + 1 < params.size
       end

[李福中]

database.yml 不要直接放代码的项目里

[李福中]

前面已经校验了必填

param! :user_ids, Array, required: true

那

user_ids = JSON.parse(params[:user_ids]) rescue {}

这一行就是多余的了，并且 rescue 返回的类型最好也是 Array

[李福中]

以 ? 结尾的方法一般只是单纯返回 boolean 类型的值，可以把 push_sync? 方法里代码整个移动到 do_push 方法中去。

[李福中]

byebug 这行代码需要去掉

[李福中]

stale?(last_modified: UserDevice.where(user_id: params[:user_id]).last.updated_at) 这行代码写在这里是什么意思呢？ 一般http缓存设置会写在方法的最后一行。

[李福中]

!! 这个完全没必要吧？ 如果方法返回 boolean 的话，一般以问题结尾。

[李福中]

不是很明白，为什么 skip_before_action :verify_authenticity_token 这一行可以注释了。

校验 user_device_exist 这个可以写在 before_action 里。

[John Shannon]

这里会覆盖掉全局变量，是不是用一个局部变量代替更好

[于子洵]

还有爱客云

[于子洵]

用这个方法Hash#key?(key)是不是更好？

[于子洵]

如果发布前，队列里面有任务没有执行完。发布后，再次执行的时候，会报错吧？这种情况可以接受吗？

[Ghost User]

看过线上队列机会没有积压

[于子洵]

可以用Hash#to_param

params.to_param