change name

app/controllers/application_controller.rb

 class ApplicationController < ActionController::Base
 class ApplicationController < ActionController::Base
   rescue_from StandardError, with: :rescue_all
   rescue_from StandardError, with: :rescue_all
-  include Token
+  include TokenValidate
 
 
   def rescue_all(e)
   def rescue_all(e)
     ErrorLog.error(e)
     ErrorLog.error(e)

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

-module Token
+module TokenValidate
   extend ActiveSupport::Concern
   extend ActiveSupport::Concern
   ACCESS_TOEKN_EXPIRE_TIME = 7200
   ACCESS_TOEKN_EXPIRE_TIME = 7200
     
     

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

 module Huawei
 module Huawei
-  class Base
+  class Pusher
     ACCESS_TOKEN_KEY = "push:huawei_push:access_token".freeze
     ACCESS_TOKEN_KEY = "push:huawei_push:access_token".freeze
     TOKEN_URL = 'https://login.cloud.huawei.com/oauth2/v2/token'.freeze
     TOKEN_URL = 'https://login.cloud.huawei.com/oauth2/v2/token'.freeze
     PUSH_URL = 'https://api.push.hicloud.com/pushsend.do'.freeze
     PUSH_URL = 'https://api.push.hicloud.com/pushsend.do'.freeze

app/services/igetui/android_pusher.rb

-module Igetui
-  class AndroidPusher
-    include Singleton
-
-    def self.pusher
-      $android_pusher ||=
-        IGeTui.pusher(
-          Settings.platform_settings.igetui.android['app_id'],
-          Settings.platform_settings.igetui.android['app_key'],
-          Settings.platform_settings.igetui.android['master_secret']
-        )
-    end
-  end
-  
-end
\ No newline at end of file

app/services/igetui/ios_pusher.rb

-module Igetui
-  class IosPusher
-    include Singleton
-    
-    def self.pusher
-      $android_pusher ||=
-        IGeTui.pusher(
-          Settings.platform_settings.igetui.ios['app_id'],
-          Settings.platform_settings.igetui.ios['app_key'],
-          Settings.platform_settings.igetui.ios['master_secret']
-        )
-    end
-  end
-
-end
\ No newline at end of file

app/services/igetui/base.rb → app/services/igetui/pusher.rb

 module Igetui
 module Igetui
-  class Base
+  class Pusher
     
     
     def initialize(user_device_ids, opts)
     def initialize(user_device_ids, opts)
       opts = HashWithIndifferentAccess.new(opts)
       opts = HashWithIndifferentAccess.new(opts)
@@ -26,9 +26,9 @@ module Igetui
     def pusher(device_platform)
     def pusher(device_platform)
       case device_platform
       case device_platform
         when 'android'
         when 'android'
-          Igetui::AndroidPusher.pusher
+          $android_pusher
         when 'ios'
         when 'ios'
-          Igetui::IosPusher.pusher
+          $ios_pusher
       end
       end
     end
     end
 
 

app/services/push_tool_client.rb

@@ -16,8 +16,8 @@ class PushToolClient
     igetui_android_device_ids = @igetui_push_device_collections['android'].map(&:device_id)
     igetui_android_device_ids = @igetui_push_device_collections['android'].map(&:device_id)
     igetui_ios_device_ids = @igetui_push_device_collections['ios'].map(&:device_id)
     igetui_ios_device_ids = @igetui_push_device_collections['ios'].map(&:device_id)
 
 
-    Igetui::Base.new(igetui_android_device_ids, @opts.merge(device_platform: 'android')).perform if igetui_android_device_ids.present?
-    Igetui::Base.new(igetui_ios_device_ids, @opts.merge(device_platform: 'ios')).perform if igetui_ios_device_ids.present?
+    Igetui::Pusher.new(igetui_android_device_ids, @opts.merge(device_platform: 'android')).perform if igetui_android_device_ids.present?
+    Igetui::Pusher.new(igetui_ios_device_ids, @opts.merge(device_platform: 'ios')).perform if igetui_ios_device_ids.present?
 
 
     #现在好像不用了
     #现在好像不用了
     # Push::IgetuiIos.push(@push_collections[:igetui_ios], @opts) if @push_collections[:apns].present?
     # Push::IgetuiIos.push(@push_collections[:igetui_ios], @opts) if @push_collections[:apns].present?
@@ -26,7 +26,7 @@ class PushToolClient
     xiaomi_device_ids = @push_device_collections['xiaomi'].map(&:device_id)
     xiaomi_device_ids = @push_device_collections['xiaomi'].map(&:device_id)
     huawei_device_ids = @push_device_collections['huawei'].map(&:device_id)
     huawei_device_ids = @push_device_collections['huawei'].map(&:device_id)
 
 
-    Xiaomi::Base.new(xiaomi_device_ids, @opts[:message]).perform if xiaomi_device_ids.present?
-    Huawei::Base.new(huawei_device_ids, @opts[:message]).perform if huawei_device_ids.present?
+    Xiaomi::Pusher.new(xiaomi_device_ids, @opts[:message]).perform if xiaomi_device_ids.present?
+    Huawei::Pusher.new(huawei_device_ids, @opts[:message]).perform if huawei_device_ids.present?
   end
   end
 end
 end
\ No newline at end of file

config/initializers/pusher.rb

+$android_pusher ||=
+  IGeTui.pusher(
+    Settings.platform_settings.igetui.android['app_id'],
+    Settings.platform_settings.igetui.android['app_key'],
+    Settings.platform_settings.igetui.android['master_secret']
+  )
+
+
+$ios_pusher ||=
+  IGeTui.pusher(
+    Settings.platform_settings.igetui.ios['app_id'],
+    Settings.platform_settings.igetui.ios['app_key'],
+    Settings.platform_settings.igetui.ios['master_secret']
+  )
\ No newline at end of file