merge master

app/services/push.rb

@@ -13,7 +13,7 @@ module Push
     #   huawei: []
     #   huawei: []
     # }
     # }
     def push(device_ids_opts, message, igetui_opts = {}, app_type = nil)
     def push(device_ids_opts, message, igetui_opts = {}, app_type = nil)
-      Settings.platform = app_type if app_type.present?
+      Settings.platform = app_type || Settings::DEFAULT
       Push::Log.info("*************** push_service ***************:\n device_ids_opts: #{device_ids_opts}, message: #{message}, igetui_opts: #{igetui_opts}  platform: #{Settings.platform}")
       Push::Log.info("*************** push_service ***************:\n device_ids_opts: #{device_ids_opts}, message: #{message}, igetui_opts: #{igetui_opts}  platform: #{Settings.platform}")
       message = message.with_indifferent_access
       message = message.with_indifferent_access
       igetui_opts = igetui_opts.with_indifferent_access
       igetui_opts = igetui_opts.with_indifferent_access

app/services/push/huawei.rb

@@ -11,7 +11,12 @@ module Push
       def push(device_tokens, message)
       def push(device_tokens, message)
         handle_token_res if access_token.blank?
         handle_token_res if access_token.blank?
         device_tokens.each_slice(BATCH_PUSH_MAX) do |device_token_array|
         device_tokens.each_slice(BATCH_PUSH_MAX) do |device_token_array|
-          res_push(message, device_token_array)
+          res = res_push(message, device_token_array)
+          # 容错处理，华为的token异常问题，重新获取发送。
+          if res['code'] == '80300002'
+            handle_token_res
+            res_push(message, device_token_array)
+          end
         end
         end
       rescue StandardError => err
       rescue StandardError => err
         Push::Log.error(err)
         Push::Log.error(err)

config/settings.yml.example

@@ -70,7 +70,7 @@ defaults: &defaults
       package_name: 'com.lixiaoyun.aike'
       package_name: 'com.lixiaoyun.aike'
     
     
     huawei:
     huawei:
-      app_id: 'com.lixiaoyun.aike'
+      app_id: '100860035'
       app_secret: 'd9afda45c37b604fac74885ad67efa6a1c47b552910fbc6e180389d6e59c2b82'
       app_secret: 'd9afda45c37b604fac74885ad67efa6a1c47b552910fbc6e180389d6e59c2b82'