周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 10affa9d1a7f25bcb2e1c07581355af62250a2bb 1 个父辈 8c8a832f

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 22 行增加 和 9 行删除
@@ -138,9 +138,18 @@ class AiBlogAutoPublish extends Command @@ -138,9 +138,18 @@ class AiBlogAutoPublish extends Command
138 { 138 {
139 while (true) { 139 while (true) {
140 $this->output('上线的推广项目自动开启'); 140 $this->output('上线的推广项目自动开启');
  141 +
141 $projects = Project::whereIn('type', [Project::TYPE_TWO, Project::TYPE_FOUR]) 142 $projects = Project::whereIn('type', [Project::TYPE_TWO, Project::TYPE_FOUR])
142 - ->whereNotNull('uptime')->where('is_ai_blog', 0) 143 + ->whereIn('id', function ($query) {
  144 + //按推广时间
  145 + $query->select('project_id')
  146 + ->from('gl_project_deploy_optimize')
  147 + ->where('start_date', '<=', date('Y-m-d'))
  148 + ->where('start_date', '<>', '');
  149 + })
  150 + ->where('is_ai_blog', 0)
143 ->get(); 151 ->get();
  152 +
144 foreach ($projects as $project) { 153 foreach ($projects as $project) {
145 //未开启过 自动开启 154 //未开启过 自动开启
146 if (!AiBlogOpenLog::isOpened($project->id)) { 155 if (!AiBlogOpenLog::isOpened($project->id)) {
@@ -167,7 +167,8 @@ class ProjectLogic extends BaseLogic @@ -167,7 +167,8 @@ class ProjectLogic extends BaseLogic
167 //双向绑定服务器,需放到保存项目的上方 167 //双向绑定服务器,需放到保存项目的上方
168 $this->setServers($this->param['serve_id'],$this->param['id']); 168 $this->setServers($this->param['serve_id'],$this->param['id']);
169 //ai_blog 169 //ai_blog
170 - $this->setAiBlog($this->param['id'],$this->param['main_lang_id'],$this->param['is_ai_blog'],$this->param['title']); 170 + $this->setAiBlog($this->param['id'],$this->param['main_lang_id'],$this->param['is_ai_blog'],
  171 + $this->param['title'], $this->param['deploy_optimize']['company_en_name'],$this->param['deploy_optimize']['company_en_description']);
171 //保存项目信息 172 //保存项目信息
172 $this->saveProject($this->param); 173 $this->saveProject($this->param);
173 //保存建站部署信息 174 //保存建站部署信息
@@ -202,7 +203,7 @@ class ProjectLogic extends BaseLogic @@ -202,7 +203,7 @@ class ProjectLogic extends BaseLogic
202 * @method :post 203 * @method :post
203 * @time :2025/2/13 16:02 204 * @time :2025/2/13 16:02
204 */ 205 */
205 - public function setAiBlog($project_id,$main_lang_id,$is_ai_blog,$title){ 206 + public function setAiBlog($project_id,$main_lang_id,$is_ai_blog,$title,$company_en_name,$company_en_description){
206 if(empty($main_lang_id) || empty($is_ai_blog)){ 207 if(empty($main_lang_id) || empty($is_ai_blog)){
207 return true; 208 return true;
208 } 209 }
@@ -217,7 +218,7 @@ class ProjectLogic extends BaseLogic @@ -217,7 +218,7 @@ class ProjectLogic extends BaseLogic
217 $aiSettingInfo = $aiSettingModel->read(['project_id'=>$project_id]); 218 $aiSettingInfo = $aiSettingModel->read(['project_id'=>$project_id]);
218 if($aiSettingInfo === false){ 219 if($aiSettingInfo === false){
219 $aiBlogService = new AiBlogService(); 220 $aiBlogService = new AiBlogService();
220 - $result = $aiBlogService->createProject($projectInfo['company'] ?? $title,$languageInfo['short'],$projectInfo['company']); 221 + $result = $aiBlogService->createProject($projectInfo['company'] ?? $title,$languageInfo['short'],$company_en_description,$company_en_name);
221 if(isset($result['status']) && $result['status'] == 200){ 222 if(isset($result['status']) && $result['status'] == 200){
222 //查看当前项目是否已有记录 223 //查看当前项目是否已有记录
223 $resData = [ 224 $resData = [
@@ -234,7 +235,7 @@ class ProjectLogic extends BaseLogic @@ -234,7 +235,7 @@ class ProjectLogic extends BaseLogic
234 $aiBlogService = new AiBlogService(); 235 $aiBlogService = new AiBlogService();
235 $aiBlogService->mch_id = $aiSettingInfo['mch_id']; 236 $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
236 $aiBlogService->key = $aiSettingInfo['key']; 237 $aiBlogService->key = $aiSettingInfo['key'];
237 - $aiBlogService->updatedProject($title,$languageInfo['short']); 238 + $aiBlogService->updatedProject($title,$languageInfo['short'],$company_en_description,$company_en_name);
238 } 239 }
239 } 240 }
240 return true; 241 return true;
@@ -49,13 +49,14 @@ class AiBlogService @@ -49,13 +49,14 @@ class AiBlogService
49 * @method :post 49 * @method :post
50 * @time :2025/2/13 14:28 50 * @time :2025/2/13 14:28
51 */ 51 */
52 - public function createProject($project_name,$language = 'en',$profile){ 52 + public function createProject($project_name,$language,$profile,$company){
53 $request_url = $this->url.'api/project/create'; 53 $request_url = $this->url.'api/project/create';
54 $param = [ 54 $param = [
55 'mch_id'=>$this->mch_id, 55 'mch_id'=>$this->mch_id,
56 'title'=>$project_name, 56 'title'=>$project_name,
57 'language'=>$language, 57 'language'=>$language,
58 - 'profile'=>$profile 58 + 'profile'=>$profile,
  59 + 'company'=>$company,
59 ]; 60 ];
60 $this->sign = $this->generateSign($param,$this->key); 61 $this->sign = $this->generateSign($param,$this->key);
61 $param['sign'] = $this->sign; 62 $param['sign'] = $this->sign;
@@ -70,12 +71,14 @@ class AiBlogService @@ -70,12 +71,14 @@ class AiBlogService
70 * @method :post 71 * @method :post
71 * @time :2025/2/13 14:35 72 * @time :2025/2/13 14:35
72 */ 73 */
73 - public function updatedProject($project_name,$language = 'en'){ 74 + public function updatedProject($project_name,$language,$profile,$company){
74 $request_url = $this->url.'api/project/save'; 75 $request_url = $this->url.'api/project/save';
75 $param = [ 76 $param = [
76 'mch_id'=>$this->mch_id, 77 'mch_id'=>$this->mch_id,
77 'title'=>$project_name, 78 'title'=>$project_name,
78 - 'language'=>$language 79 + 'language'=>$language,
  80 + 'profile'=>$profile,
  81 + 'company'=>$company,
79 ]; 82 ];
80 $this->sign = $this->generateSign($param,$this->key); 83 $this->sign = $this->generateSign($param,$this->key);
81 $param['sign'] = $this->sign; 84 $param['sign'] = $this->sign;