Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
app_push
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ikcrm_server
app_push
Commits
e4384966
Commit
e4384966
authored
4 years ago
by
liangyuzhe
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into release
parents
6264a6e1
cb8dd3b0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
app/controllers/pushs_controller.rb
+1
-1
app/services/push_tool_client.rb
+4
-4
lib/tasks/data_migrations/version_v1.rake
+14
-0
No files found.
app/controllers/pushs_controller.rb
View file @
e4384966
...
...
@@ -83,7 +83,7 @@ class PushsController < ApplicationController
params
[
:sync_push
]
||=
false
push_sync
(
params
[
:sync_push
],
{
device_ids_opts:
device_ids_opts
,
message:
message
,
app_type:
params
[
:app_type
],
igetui_opts:
igetui_opts
.
merge
(
pusher_type:
'push_message_to_list'
)})
NotificationStatistic
.
create_by_params
(
igetui_opts
,
message
,
device_ids_opts
,
params
[
:app_type
])
#
NotificationStatistic.create_by_params(igetui_opts, message, device_ids_opts, params[:app_type])
render
json:
{
code:
0
,
message:
'success'
,
data:
{
remind:
"请使用新的api,此api近期将不再维护,请尽快迁移到新的api,新api地址 http://apidoc.weiwenjia.com/docs/internal-dev-api/internal-dev-api-1boq6ctdm8m57"
}}
...
...
This diff is collapsed.
Click to expand it.
app/services/push_tool_client.rb
View file @
e4384966
...
...
@@ -17,14 +17,14 @@ class PushToolClient
if
igetui_android_client_ids
.
present?
igetui_android_client_ids
.
each_pair
do
|
app_type
,
ids
|
Igetui
::
Pusher
.
new
(
ids
,
@opts
.
merge
(
device_platform:
'android'
,
app_type:
app_type
)).
perform
NotificationStatistic
.
static_notification
(
@opts
.
merge
(
app_type:
app_type
),
ids
,
'igetui'
,
'android'
)
#
NotificationStatistic.static_notification(@opts.merge(app_type: app_type), ids,'igetui', 'android' )
end
end
if
igetui_ios_client_ids
.
present?
igetui_ios_client_ids
.
each_pair
do
|
app_type
,
ids
|
Igetui
::
Pusher
.
new
(
ids
,
@opts
.
merge
(
device_platform:
'ios'
,
app_type:
app_type
)).
perform
NotificationStatistic
.
static_notification
(
@opts
.
merge
(
app_type:
app_type
),
ids
,
'igetui'
,
'ios'
)
#
NotificationStatistic.static_notification(@opts.merge(app_type: app_type), ids,'igetui', 'ios' )
end
end
...
...
@@ -37,7 +37,7 @@ class PushToolClient
xiaomi_client_ids
.
each_pair
do
|
app_type
,
ids
|
message
=
@opts
[
:message
].
merge
(
@opts
[
:message
][
:transmission_content
]
||
{})
Xiaomi
::
Pusher
.
new
(
ids
,
message
,
app_type
).
perform
NotificationStatistic
.
static_notification
(
@opts
.
merge
(
app_type:
app_type
),
ids
,
'xiaomi'
)
#
NotificationStatistic.static_notification(@opts.merge(app_type: app_type), ids,'xiaomi')
end
end
...
...
@@ -46,7 +46,7 @@ class PushToolClient
huawei_client_ids
.
each_pair
do
|
app_type
,
ids
|
message
=
@opts
[
:message
].
merge
(
@opts
[
:message
][
:transmission_content
]
||
{})
Huawei
::
Pusher
.
new
(
ids
,
message
,
app_type
).
perform
NotificationStatistic
.
static_notification
(
@opts
.
merge
(
app_type:
app_type
),
ids
,
'huawei'
)
#
NotificationStatistic.static_notification(@opts.merge(app_type: app_type), ids,'huawei')
end
end
end
...
...
This diff is collapsed.
Click to expand it.
lib/tasks/data_migrations/version_v1.rake
0 → 100644
View file @
e4384966
namespace
:data_migrations
do
namespace
:version
do
desc
"batch delete notification_statistics data"
task
:v1_batch_delete_notification_statistics_data
=>
:environment
do
last_object
=
NotificationStatistic
.
where
(
"notification_statistics.created_at >= ?"
,
'2020-05-30 16:00:00'
).
first
puts
"rake begin time is
#{
Time
.
now
.
to_s
}
"
NotificationStatistic
.
in_batches
(
of:
10000
,
finish:
last_object
)
{
|
records
|
records
.
delete_all
}
if
last_object
.
present?
puts
"rake end time is
#{
Time
.
now
.
to_s
}
"
end
end
end
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment