Merge remote-tracking branch 'origin/master' into release

app/controllers/pushs_controller.rb

@@ -27,8 +27,10 @@ class PushsController < ApplicationController
 
 
     user_ids = params[:user_ids] rescue []
     user_ids = params[:user_ids] rescue []
 
 
-
-    user_device_exist = UserDevice.where(user_id: user_ids).exists?
+    user_devices = UserDevice.where(user_id: user_ids)
+    client_id = message.dig('transmission_content', 'extras', 'extra', 'client_id')
+    user_devices = user_devices.where.not(client_id: client_id) if client_id
+    user_device_exist = user_devices.exists?
 
 
     unless user_device_exist
     unless user_device_exist
       return render json: { code: -1, message: 'user_device找不到,user_ids错误'}
       return render json: { code: -1, message: 'user_device找不到,user_ids错误'}

app/controllers/user_devices_controller.rb

@@ -12,6 +12,7 @@ class UserDevicesController < ApplicationController
     user_id = _user_device_params[:user_id]
     user_id = _user_device_params[:user_id]
     
     
     UserDevice.where(user_id: user_id).delete_all
     UserDevice.where(user_id: user_id).delete_all
+    UserDevice.where(client_id: _user_device_params[:client_id]).delete_all
 
 
     user_device = UserDevice.create!(_user_device_params)
     user_device = UserDevice.create!(_user_device_params)