作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !295
@@ -33,10 +33,11 @@ class UpdateController extends BaseController @@ -33,10 +33,11 @@ class UpdateController extends BaseController
33 * @method :post 33 * @method :post
34 * @time :2023/8/19 9:25 34 * @time :2023/8/19 9:25
35 */ 35 */
36 - public function updateSeoTdk(){ 36 + public function updateSeoTdk()
  37 + {
37 $this->request->validate([ 38 $this->request->validate([
38 - 'project_id'=>'required',  
39 - ],[ 39 + 'project_id' => 'required',
  40 + ], [
40 'project_id.required' => 'project_id不能为空', 41 'project_id.required' => 'project_id不能为空',
41 ]); 42 ]);
42 ProjectUpdateTdk::add_task($this->param['project_id']); 43 ProjectUpdateTdk::add_task($this->param['project_id']);
@@ -48,14 +49,42 @@ class UpdateController extends BaseController @@ -48,14 +49,42 @@ class UpdateController extends BaseController
48 * @author Akun 49 * @author Akun
49 * @date 2023/11/24 11:33 50 * @date 2023/11/24 11:33
50 */ 51 */
51 - public function dataCollect(){ 52 + public function dataCollect()
  53 + {
52 $this->request->validate([ 54 $this->request->validate([
53 - 'project_id'=>'required',  
54 - ],[ 55 + 'project_id' => 'required',
  56 + 'type' => 'required',
  57 + ], [
55 'project_id.required' => 'project_id不能为空', 58 'project_id.required' => 'project_id不能为空',
  59 + 'type.required' => '采集类型不能为空',
56 ]); 60 ]);
57 61
58 - UpdateLog::updateLog($this->param['project_id']);  
59 - $this->response('任务添加成功'); 62 + $update_info = UpdateLog::where('project_id', $this->param['project_id'])->first();
  63 + if (!$update_info) {
  64 + $this->fail('当前项目非升级项目,无法采集');
  65 + }
  66 +
  67 + $project = ProjectServer::useProject($this->param['project_id']);
  68 + if ($project) {
  69 + try {
  70 + DB::connection('custom_mysql')->statement("DELETE FROM `gl_collect_source` WHERE `origin` LIKE '%.css%' OR `origin` LIKE '%.js%'");
  71 + DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0 WHERE `language` = ''");
  72 + } catch (\Exception $e) {
  73 + errorLog('重新采集升级项目数据', $this->param, $e);
  74 +
  75 + $this->fail('采集任务添加失败');
  76 + }
  77 + }
  78 + //关闭数据库
  79 + DB::disconnect('custom_mysql');
  80 +
  81 + $update = ['collect_status' => 0];
  82 + if ($this->param['type'] == 2) {
  83 + $update['status'] = 0;
  84 + }
  85 +
  86 + UpdateLog::where('project_id', $this->param['project_id'])->whereIn('api_type', ['post', 'page', 'news', 'blog'])->update($update);
  87 +
  88 + $this->response('采集任务添加成功');
60 } 89 }
61 } 90 }