正在显示
1 个修改的文件
包含
6 行增加
和
2 行删除
| @@ -21,7 +21,9 @@ use App\Models\Product\Keyword; | @@ -21,7 +21,9 @@ use App\Models\Product\Keyword; | ||
| 21 | use App\Models\Product\Product; | 21 | use App\Models\Product\Product; |
| 22 | use App\Models\Project\Project; | 22 | use App\Models\Project\Project; |
| 23 | use App\Models\RouteMap\RouteMap; | 23 | use App\Models\RouteMap\RouteMap; |
| 24 | +use App\Services\ProjectServer; | ||
| 24 | use Illuminate\Console\Command; | 25 | use Illuminate\Console\Command; |
| 26 | +use Illuminate\Support\Facades\DB; | ||
| 25 | use Illuminate\Support\Facades\Redis; | 27 | use Illuminate\Support\Facades\Redis; |
| 26 | use PhpOffice\PhpSpreadsheet\IOFactory; | 28 | use PhpOffice\PhpSpreadsheet\IOFactory; |
| 27 | use function Aws\default_http_handler; | 29 | use function Aws\default_http_handler; |
| @@ -60,11 +62,13 @@ class UpdateProjectTdk extends Command | @@ -60,11 +62,13 @@ class UpdateProjectTdk extends Command | ||
| 60 | $noticeLogModel->edit(['status'=>$noticeLogModel::STATUS_FAIL],['id'=>$task_id]); | 62 | $noticeLogModel->edit(['status'=>$noticeLogModel::STATUS_FAIL],['id'=>$task_id]); |
| 61 | continue; | 63 | continue; |
| 62 | } | 64 | } |
| 65 | + ProjectServer::useProject($project_id); | ||
| 63 | $url = $info['data']['url'] ?? ''; | 66 | $url = $info['data']['url'] ?? ''; |
| 64 | if(empty($url)){ | 67 | if(empty($url)){ |
| 65 | echo date('Y-m-d H:i:s').'未获取到项目更新文件.项目id为:'.$project_id.PHP_EOL; | 68 | echo date('Y-m-d H:i:s').'未获取到项目更新文件.项目id为:'.$project_id.PHP_EOL; |
| 66 | //未获取到文件,跳过 | 69 | //未获取到文件,跳过 |
| 67 | $noticeLogModel->edit(['status'=>$noticeLogModel::STATUS_SUCCESS],['id'=>$task_id]); | 70 | $noticeLogModel->edit(['status'=>$noticeLogModel::STATUS_SUCCESS],['id'=>$task_id]); |
| 71 | + DB::disconnect('custom_mysql'); | ||
| 68 | continue; | 72 | continue; |
| 69 | } | 73 | } |
| 70 | // 下载到 Laravel storage 的临时路径 | 74 | // 下载到 Laravel storage 的临时路径 |
| @@ -79,9 +83,9 @@ class UpdateProjectTdk extends Command | @@ -79,9 +83,9 @@ class UpdateProjectTdk extends Command | ||
| 79 | }catch (\Exception $e){ | 83 | }catch (\Exception $e){ |
| 80 | echo '文件打不开'.PHP_EOL; | 84 | echo '文件打不开'.PHP_EOL; |
| 81 | $noticeLogModel->edit(['status'=>$noticeLogModel::STATUS_FAIL],['id'=>$task_id]); | 85 | $noticeLogModel->edit(['status'=>$noticeLogModel::STATUS_FAIL],['id'=>$task_id]); |
| 86 | + DB::disconnect('custom_mysql'); | ||
| 82 | continue; | 87 | continue; |
| 83 | } | 88 | } |
| 84 | - // 假设第一行是表头 | ||
| 85 | $dataRows = array_slice($rows, 1); | 89 | $dataRows = array_slice($rows, 1); |
| 86 | foreach ($dataRows as $item){ | 90 | foreach ($dataRows as $item){ |
| 87 | //获取路由 | 91 | //获取路由 |
| @@ -89,7 +93,7 @@ class UpdateProjectTdk extends Command | @@ -89,7 +93,7 @@ class UpdateProjectTdk extends Command | ||
| 89 | $route = basename($route); | 93 | $route = basename($route); |
| 90 | $this->updateTdk($route,$item); | 94 | $this->updateTdk($route,$item); |
| 91 | } | 95 | } |
| 92 | - dd($dataRows); | 96 | + DB::disconnect('custom_mysql'); |
| 93 | } | 97 | } |
| 94 | } | 98 | } |
| 95 | return true; | 99 | return true; |
-
请 注册 或 登录 后发表评论