合并分支 'lyh-server' 到 'master'
Lyh server 查看合并请求 !1991
正在显示
1 个修改的文件
包含
33 行增加
和
17 行删除
| @@ -20,6 +20,7 @@ use App\Models\Project\Project; | @@ -20,6 +20,7 @@ use App\Models\Project\Project; | ||
| 20 | use App\Models\Project\ProjectAiSetting; | 20 | use App\Models\Project\ProjectAiSetting; |
| 21 | use App\Models\Visit\Visit; | 21 | use App\Models\Visit\Visit; |
| 22 | use App\Models\WebSetting\WebSetting; | 22 | use App\Models\WebSetting\WebSetting; |
| 23 | +use App\Services\AiBlogService; | ||
| 23 | use App\Services\ProjectServer; | 24 | use App\Services\ProjectServer; |
| 24 | use Illuminate\Console\Command; | 25 | use Illuminate\Console\Command; |
| 25 | use Illuminate\Support\Facades\Artisan; | 26 | use Illuminate\Support\Facades\Artisan; |
| @@ -42,7 +43,7 @@ class lyhDemo extends Command | @@ -42,7 +43,7 @@ class lyhDemo extends Command | ||
| 42 | protected $description = '更新路由'; | 43 | protected $description = '更新路由'; |
| 43 | 44 | ||
| 44 | public function handle(){ | 45 | public function handle(){ |
| 45 | - $projectIds = DB::table('gl_project_ai_setting') | 46 | + $projectIds = DB::table('gl_project_ai_setting_copy1') |
| 46 | ->whereIn('mch_id', function ($query) { | 47 | ->whereIn('mch_id', function ($query) { |
| 47 | $query->select('mch_id') | 48 | $query->select('mch_id') |
| 48 | ->from('gl_project_ai_setting') | 49 | ->from('gl_project_ai_setting') |
| @@ -56,24 +57,39 @@ class lyhDemo extends Command | @@ -56,24 +57,39 @@ class lyhDemo extends Command | ||
| 56 | $projectIds[] = 2201; | 57 | $projectIds[] = 2201; |
| 57 | $projectIds[] = 2260; | 58 | $projectIds[] = 2260; |
| 58 | $projectIds[] = 2259; | 59 | $projectIds[] = 2259; |
| 59 | - | ||
| 60 | - $projectAiSettingModel = new ProjectAiSetting(); | ||
| 61 | - $projectAiSettingModel->del(['project_id'=>['in',$projectIds]]); | ||
| 62 | - $projectModel = new Project(); | ||
| 63 | - $logic = new ProjectLogic(); | ||
| 64 | - $lists = $projectModel->list(['delete_status' => 0,'extend_type'=>0,'id'=>['in',$projectIds]], 'id', ['id']); | ||
| 65 | - foreach ($lists as $val) { | ||
| 66 | - //清空作者 | ||
| 67 | - ProjectServer::useProject($val['id']); | ||
| 68 | - AiBlogAuthor::truncate(); | 60 | + foreach ($projectIds as $item){ |
| 61 | + $projectAiSettingModel = new ProjectAiSetting(); | ||
| 62 | + $settingInfo = $projectAiSettingModel->read(['project_id'=>$item]); | ||
| 63 | + ProjectServer::useProject($item); | ||
| 64 | + $aiBlogService = new AiBlogService(); | ||
| 65 | + $aiBlogService->mch_id = $settingInfo['mch_id']; | ||
| 66 | + $aiBlogService->key = $settingInfo['key']; | ||
| 67 | + $result = $aiBlogService->createAuthor(); | ||
| 68 | + $aiBlogTaskModel = new AiBlogTask(); | ||
| 69 | + if($result['status'] == 200){ | ||
| 70 | + //查看当前是否已有未执行的 | ||
| 71 | + $aiBlogTaskModel->add(['project_id'=>$item,'status'=>1,'type'=>1]); | ||
| 72 | + } | ||
| 69 | DB::disconnect('custom_mysql'); | 73 | DB::disconnect('custom_mysql'); |
| 70 | - //重新创建项目拉取作者 | ||
| 71 | - $info = $logic->getProjectInfo($val['id']); | ||
| 72 | - echo date('Y-m-d H:i:s') . '开始--项目的id:'. $val['id'] . PHP_EOL; | ||
| 73 | - $logic->setAiBlog($info['id'],$info['main_lang_id'],$info['is_ai_blog'] ?? 0, | ||
| 74 | - $info['company']??"", $info['deploy_optimize']['company_en_name'] ?? '', | ||
| 75 | - $info['deploy_optimize']['company_en_description'] ?? '',$info['is_ai_video'] ?? 0,$info['is_related_video'] ?? 0); | ||
| 76 | } | 74 | } |
| 75 | + | ||
| 76 | +// $projectAiSettingModel = new ProjectAiSetting(); | ||
| 77 | +// $projectAiSettingModel->del(['project_id'=>['in',$projectIds]]); | ||
| 78 | +// $projectModel = new Project(); | ||
| 79 | +// $logic = new ProjectLogic(); | ||
| 80 | +// $lists = $projectModel->list(['delete_status' => 0,'extend_type'=>0,'id'=>['in',$projectIds]], 'id', ['id']); | ||
| 81 | +// foreach ($lists as $val) { | ||
| 82 | +// //清空作者 | ||
| 83 | +// ProjectServer::useProject($val['id']); | ||
| 84 | +// AiBlogAuthor::truncate(); | ||
| 85 | +// DB::disconnect('custom_mysql'); | ||
| 86 | +// //重新创建项目拉取作者 | ||
| 87 | +// $info = $logic->getProjectInfo($val['id']); | ||
| 88 | +// echo date('Y-m-d H:i:s') . '开始--项目的id:'. $val['id'] . PHP_EOL; | ||
| 89 | +// $logic->setAiBlog($info['id'],$info['main_lang_id'],$info['is_ai_blog'] ?? 0, | ||
| 90 | +// $info['company']??"", $info['deploy_optimize']['company_en_name'] ?? '', | ||
| 91 | +// $info['deploy_optimize']['company_en_description'] ?? '',$info['is_ai_video'] ?? 0,$info['is_related_video'] ?? 0); | ||
| 92 | +// } | ||
| 77 | return true; | 93 | return true; |
| 78 | } | 94 | } |
| 79 | 95 |
-
请 注册 或 登录 后发表评论