正在显示
1 个修改的文件
包含
12 行增加
和
5 行删除
| @@ -58,7 +58,7 @@ class ProjectImport extends Command | @@ -58,7 +58,7 @@ class ProjectImport extends Command | ||
| 58 | $task->status = ImportTask::STATUS_COM;//导入完成 | 58 | $task->status = ImportTask::STATUS_COM;//导入完成 |
| 59 | $task->save(); | 59 | $task->save(); |
| 60 | 60 | ||
| 61 | - $this->send_mail($task->user_id, $task->created_at, 0, 0, '文件编码格式错误,仅支持UTF-8和GBK编码格式'); | 61 | + $this->send_mail($task->user_id, $task->created_at, $task->type, 0, 0, '文件编码格式错误,仅支持UTF-8和GBK编码格式'); |
| 62 | return true; | 62 | return true; |
| 63 | } elseif ($file_code_type === 'GBK') { | 63 | } elseif ($file_code_type === 'GBK') { |
| 64 | $is_gbk = 1; | 64 | $is_gbk = 1; |
| @@ -78,7 +78,7 @@ class ProjectImport extends Command | @@ -78,7 +78,7 @@ class ProjectImport extends Command | ||
| 78 | $task->status = ImportTask::STATUS_COM;//导入完成 | 78 | $task->status = ImportTask::STATUS_COM;//导入完成 |
| 79 | $task->save(); | 79 | $task->save(); |
| 80 | 80 | ||
| 81 | - $this->send_mail($task->user_id, $task->created_at, 0, 0, '读取文件数据失败'); | 81 | + $this->send_mail($task->user_id, $task->created_at, $task->type, 0, 0, '读取文件数据失败'); |
| 82 | return true; | 82 | return true; |
| 83 | } | 83 | } |
| 84 | 84 | ||
| @@ -137,7 +137,7 @@ class ProjectImport extends Command | @@ -137,7 +137,7 @@ class ProjectImport extends Command | ||
| 137 | $task->success_count += $success_count; | 137 | $task->success_count += $success_count; |
| 138 | $task->save(); | 138 | $task->save(); |
| 139 | 139 | ||
| 140 | - $this->send_mail($task->user_id, $task->created_at, $success_count, $repeat_count, ''); | 140 | + $this->send_mail($task->user_id, $task->created_at, $task->type, $success_count, $repeat_count, ''); |
| 141 | 141 | ||
| 142 | echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import end, total count: ' . $total_count . ', success count: ' . $success_count . PHP_EOL; | 142 | echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import end, total count: ' . $total_count . ', success count: ' . $success_count . PHP_EOL; |
| 143 | 143 | ||
| @@ -159,10 +159,17 @@ class ProjectImport extends Command | @@ -159,10 +159,17 @@ class ProjectImport extends Command | ||
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | //发生站内通知 | 161 | //发生站内通知 |
| 162 | - protected function send_mail($user_list, $time, $success_count, $repeat_count, $reason) | 162 | + protected function send_mail($user_list, $time, $type, $success_count, $repeat_count, $reason) |
| 163 | { | 163 | { |
| 164 | + if ($type == ImportTask::TYPE_NEWS) { | ||
| 165 | + $type_content = '新闻'; | ||
| 166 | + } elseif ($type == ImportTask::TYPE_BLOG) { | ||
| 167 | + $type_content = '博客'; | ||
| 168 | + } else { | ||
| 169 | + $type_content = '产品'; | ||
| 170 | + } | ||
| 164 | $title = '导入结果通知'; | 171 | $title = '导入结果通知'; |
| 165 | - $content = '您于 ' . $time . ' 添加的导入任务已执行完成, 成功导入数据:' . $success_count . ' 条'; | 172 | + $content = '您于 ' . $time . ' 添加的 ' . $type_content . ' 导入任务已执行完成, 成功导入数据:' . $success_count . ' 条'; |
| 166 | $repeat_count && $content .= ',过滤已存在数据:' . $repeat_count . ' 条'; | 173 | $repeat_count && $content .= ',过滤已存在数据:' . $repeat_count . ' 条'; |
| 167 | $reason && $content .= ',原因:' . $reason; | 174 | $reason && $content .= ',原因:' . $reason; |
| 168 | 175 |
-
请 注册 或 登录 后发表评论