周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 f828c3f7a2615e6b7a41bafcb81cc7c60b575c9c 2 个父辈 f5a3b80a a1a477e8

Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 4 个修改的文件 包含 10 行增加 和 7 行删除
... ... @@ -69,7 +69,7 @@ class ProjectImport extends Command
$task->status = ImportTask::STATUS_COM;//导入完成
$task->save();
$this->send_mail($task->user_id, $task->created_at, $task->type, 0, 0, '文件编码格式错误，仅支持UTF-8和GBK编码格式');
$this->send_mail($task->user_id, $task->created_at, $task->type, 0, 0, 0, '文件编码格式错误，仅支持UTF-8和GBK编码格式');
return true;
} elseif ($file_code_type === 'GBK') {
$is_gbk = 1;
... ... @@ -89,13 +89,14 @@ class ProjectImport extends Command
$task->status = ImportTask::STATUS_COM;//导入完成
$task->save();
$this->send_mail($task->user_id, $task->created_at, $task->type, 0, 0, '读取文件数据失败');
$this->send_mail($task->user_id, $task->created_at, $task->type, 0, 0, 0, '读取文件数据失败');
return true;
}
$total_count = 0; //总条数
$success_count = 0; //成功导入条数
$repeat_count = 0; //过滤已存在条数
$fail_count = 0;
if (count($line_of_text) > 1) {
//设置数据库
... ... @@ -132,6 +133,7 @@ class ProjectImport extends Command
}
}
} catch (\Exception $e) {
$fail_count += 1;
echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', title: ' . $v[0] . ', import fail, error: ' . $e->getMessage() . PHP_EOL;
}
}
... ... @@ -146,7 +148,7 @@ class ProjectImport extends Command
$task->success_count += $success_count;
$task->save();
$this->send_mail($task->user_id, $task->created_at, $task->type, $success_count, $repeat_count, '');
$this->send_mail($task->user_id, $task->created_at, $task->type, $success_count, $fail_count, $repeat_count, '');
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;
... ... @@ -190,7 +192,7 @@ class ProjectImport extends Command
}
//发送站内通知
protected function send_mail($user_list, $time, $type, $success_count, $repeat_count, $reason)
protected function send_mail($user_list, $time, $type, $success_count, $repeat_count, $fail_count, $reason)
{
if ($type == ImportTask::TYPE_NEWS) {
$type_content = '新闻';
... ... @@ -202,6 +204,7 @@ class ProjectImport extends Command
$title = '导入结果通知';
$content = '您于 ' . $time . ' 添加的 ' . $type_content . ' 导入任务已执行完成， 成功导入数据：' . $success_count . ' 条';
$repeat_count && $content .= '，过滤已存在数据：' . $repeat_count . ' 条';
$fail_count && $content .= '，导入失败：' . $fail_count . ' 条';
$reason && $content .= '，原因：' . $reason;
$mail_model = new Mail();
... ...
... ... @@ -295,7 +295,7 @@ class BlogLogic extends BaseLogic
]
);
//更新路由
$route = RouteMap::setRoute($data[1] ?: $data[0], RouteMap::SOURCE_BLOG, $id, $project_id);
$route = RouteMap::setRoute((isset($data[1]) && $data[1]) ? $data[1] : $data[0], RouteMap::SOURCE_BLOG, $id, $project_id);
$this->edit(['url' => $route], ['id' => $id]);
return true;
... ...
... ... @@ -331,7 +331,7 @@ class NewsLogic extends BaseLogic
]
);
//更新路由
$route = RouteMap::setRoute($data[1] ?: $data[0], RouteMap::SOURCE_NEWS, $id, $project_id);
$route = RouteMap::setRoute((isset($data[1]) && $data[1]) ? $data[1] : $data[0], RouteMap::SOURCE_NEWS, $id, $project_id);
$this->edit(['url' => $route], ['id' => $id]);
return true;
... ...
... ... @@ -549,7 +549,7 @@ class ProductLogic extends BaseLogic
]
);
//更新路由
$route = RouteMap::setRoute($data[1] ?: $data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
$route = RouteMap::setRoute((isset($data[1]) && $data[1]) ? $data[1] : $data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
$this->edit(['route' => $route], ['id' => $id]);
return true;
... ...