作者 李宇航

合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3153
... ... @@ -4,6 +4,7 @@ namespace App\Console\Commands\Ai;
use App\Http\Logic\Aside\Project\ProjectLogic;
use App\Models\Ai\AiBlog;
use App\Models\Ai\AiBlogKeyword;
use App\Models\Ai\AiBlogOpenLog;
use App\Models\Project\AiBlogTask as AiBlogTaskModel;
use App\Models\Project\Project;
... ... @@ -77,17 +78,25 @@ class AiBlogAutoPublish extends Command
$this->output("项目{$project->id}未到执行时间" . $next_auto_date);
continue;
}
//核心关键词+网站关键词+白帽关键词
$main_keywords = ProjectKeyword::where('project_id', $project->id)->value('main_keyword');
$main_keywords = explode("\r\n", $main_keywords);
$seo_keywords = ProjectKeyword::where('project_id', $project->id)->value('seo_keywords');
$seo_keywords = explode("\r\n", $seo_keywords);
ProjectServer::useProject($project->id);
$site_keywords = WebSetting::where('project_id', $project->id)->value('keyword');
DB::disconnect('custom_mysql');
$site_keywords = explode(",", $site_keywords);
$keywords = array_filter(array_merge($main_keywords, $site_keywords, $seo_keywords));
$keywords = array_map('trim', $keywords);
$aiKeywordModel = new AiBlogKeyword();
$keywords = $aiKeywordModel->getValue(['project_id'=>$this->user['project_id']],'keywords');
if(!empty($keywords)){
//核心关键词+网站关键词+白帽关键词
$main_keywords = ProjectKeyword::where('project_id', $project->id)->value('main_keyword');
$main_keywords = explode("\r\n", $main_keywords);
$seo_keywords = ProjectKeyword::where('project_id', $project->id)->value('seo_keywords');
$seo_keywords = explode("\r\n", $seo_keywords);
ProjectServer::useProject($project->id);
$site_keywords = WebSetting::where('project_id', $project->id)->value('keyword');
DB::disconnect('custom_mysql');
$site_keywords = explode(",", $site_keywords);
$keywords = array_filter(array_merge($main_keywords, $site_keywords, $seo_keywords));
$keywords = array_map('trim', $keywords);
}else{
$keywords = explode("\r\n", $keywords);
$keywords = array_map('trim', $keywords); // 清理空格
$keywords = array_filter($keywords); // 移除空值
}
if (empty($keywords)) {
$this->output("项目{$project->id}未获取到关键词");
continue;
... ...
... ... @@ -15,6 +15,9 @@ class CountController extends BaseController
* @time :2023/5/23 17:23
*/
public function count(CountLogic $countLogic){
if($this->user['project_id'] == 5172){
$this->user['project_id'] = 3298;
}
$data = [];
//TODO::昨日数据统计
$data['yesterday'] = $countLogic->yesterday_count();
... ...
... ... @@ -11,6 +11,10 @@ namespace App\Http\Logic\Bside\Ai;
use App\Http\Logic\Bside\BaseLogic;
use App\Models\Ai\AiBlogKeyword;
use App\Models\Project\ProjectKeyword;
use App\Models\WebSetting\WebSetting;
use App\Services\ProjectServer;
use Illuminate\Support\Facades\DB;
class AiBlogKeywordLogic extends BaseLogic
{
... ... @@ -32,6 +36,22 @@ class AiBlogKeywordLogic extends BaseLogic
public function getKeywordInfo()
{
$data = $this->model->read(['project_id'=>$this->user['project_id']]);
if($data === false){
//核心关键词+网站关键词+白帽关键词
$main_keywords = ProjectKeyword::where('project_id', $this->user['project_id'])->value('main_keyword');
$main_keywords = explode("\r\n", $main_keywords);
$seo_keywords = ProjectKeyword::where('project_id', $this->user['project_id'])->value('seo_keywords');
$seo_keywords = explode("\r\n", $seo_keywords);
$site_keywords = WebSetting::where('project_id', $this->user['project_id'])->value('keyword');
$site_keywords = explode(",", $site_keywords);
$keywords = array_filter(array_merge($main_keywords, $site_keywords, $seo_keywords));
$keywords = array_map('trim', $keywords);
$keywords_string = implode("\n", $keywords);
$data = [
'project_id'=>$this->user['project_id'],
'keywords'=>$keywords_string
];
}
return $this->success($data);
}
... ...