周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 df9cfed4622738f03ff7e0c1b8c701764346dbde 2 个父辈 5d3fa9b4 b7dbca00

Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 6 个修改的文件 包含 13 行增加 和 14 行删除
@@ -160,7 +160,6 @@ class PostInquiryForward extends Command @@ -160,7 +160,6 @@ class PostInquiryForward extends Command
160 Log::channel('inquiry_forward')->error('post_inquiry_forward visit error', [$res, $url, $data]); 160 Log::channel('inquiry_forward')->error('post_inquiry_forward visit error', [$res, $url, $data]);
161 return false; 161 return false;
162 } 162 }
163 - Log::channel('inquiry_forward')->error('post_inquiry_forward visit success', [$res, $url, $data]);  
164 } else { 163 } else {
165 //v4 v5分离项目 往测试链接推 164 //v4 v5分离项目 往测试链接推
166 $project_info = InquiryProject::select(['is_split', 'test_domain'])->where('domain', 'like', '%' . $detail['website'] . '%')->first(); 165 $project_info = InquiryProject::select(['is_split', 'test_domain'])->where('domain', 'like', '%' . $detail['website'] . '%')->first();
@@ -195,8 +194,6 @@ class PostInquiryForward extends Command @@ -195,8 +194,6 @@ class PostInquiryForward extends Command
195 Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 visit error', [$res->body(), $url, $data]); 194 Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 visit error', [$res->body(), $url, $data]);
196 return false; 195 return false;
197 } 196 }
198 -  
199 - Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 visit success', [$res->body(), $url, $data]);  
200 } 197 }
201 $log->status = InquiryRelayDetailLog::STATUS_SUCCESS; 198 $log->status = InquiryRelayDetailLog::STATUS_SUCCESS;
202 $log->save(); 199 $log->save();
@@ -224,7 +221,6 @@ class PostInquiryForward extends Command @@ -224,7 +221,6 @@ class PostInquiryForward extends Command
224 221
225 $log->status = InquiryRelayDetailLog::STATUS_SUCCESS; 222 $log->status = InquiryRelayDetailLog::STATUS_SUCCESS;
226 $log->save(); 223 $log->save();
227 -  
228 return true; 224 return true;
229 } 225 }
230 226
@@ -264,9 +260,8 @@ class PostInquiryForward extends Command @@ -264,9 +260,8 @@ class PostInquiryForward extends Command
264 Log::channel('inquiry_forward')->error('post_inquiry_forward xp inquiry error', [$res, $url, $data]); 260 Log::channel('inquiry_forward')->error('post_inquiry_forward xp inquiry error', [$res, $url, $data]);
265 return false; 261 return false;
266 } 262 }
267 - Log::channel('inquiry_forward')->error('post_inquiry_forward xp inquiry success', [$res, $url, $data]);  
268 263
269 - return false; 264 + return true;
270 } 265 }
271 266
272 public function v6Inquiry($detail, $log) 267 public function v6Inquiry($detail, $log)
@@ -293,7 +288,7 @@ class PostInquiryForward extends Command @@ -293,7 +288,7 @@ class PostInquiryForward extends Command
293 Log::channel('inquiry_forward')->error('post_inquiry_forward v6 inquiry error', [$res, $url, $data]); 288 Log::channel('inquiry_forward')->error('post_inquiry_forward v6 inquiry error', [$res, $url, $data]);
294 return false; 289 return false;
295 } 290 }
296 - Log::channel('inquiry_forward')->error('post_inquiry_forward v6 inquiry success', [$res, $url, $data]); 291 +
297 return true; 292 return true;
298 } 293 }
299 294
@@ -322,7 +317,6 @@ class PostInquiryForward extends Command @@ -322,7 +317,6 @@ class PostInquiryForward extends Command
322 Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 inquiry error', [$res->body(), $url, $data]); 317 Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 inquiry error', [$res->body(), $url, $data]);
323 return false; 318 return false;
324 } 319 }
325 - Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 inquiry success', [$res->body(), $url, $data]);  
326 } else { 320 } else {
327 $data = [ 321 $data = [
328 'name' => $detail['name'], 322 'name' => $detail['name'],
@@ -345,7 +339,6 @@ class PostInquiryForward extends Command @@ -345,7 +339,6 @@ class PostInquiryForward extends Command
345 Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 inquiry error', [$res, $url, $data]); 339 Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 inquiry error', [$res, $url, $data]);
346 return false; 340 return false;
347 } 341 }
348 - Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 inquiry success', [$res, $url, $data]);  
349 } 342 }
350 343
351 return true; 344 return true;
@@ -35,7 +35,7 @@ class Temp extends Command @@ -35,7 +35,7 @@ class Temp extends Command
35 35
36 public function handle() 36 public function handle()
37 { 37 {
38 - 38 + $this->domain_rewrite_https();
39 } 39 }
40 40
41 /** 41 /**
@@ -50,7 +50,7 @@ class Temp extends Command @@ -50,7 +50,7 @@ class Temp extends Command
50 $buildModel = new DeployBuild(); 50 $buildModel = new DeployBuild();
51 $serverIpModel = new ServersIp(); 51 $serverIpModel = new ServersIp();
52 $domainCreateTaskModel = new DomainCreateTask(); 52 $domainCreateTaskModel = new DomainCreateTask();
53 - $list = $domainModel->select(['id', 'domain', 'project_id'])->where('status', '=', 1)->where('project_id', '>', 0)->get(); 53 + $list = $domainModel->select(['id', 'domain', 'project_id'])->where('status', '=', 1)->where('project_id', '>', 0)->where('is_https', 0)->get();
54 foreach ($list as $v) { 54 foreach ($list as $v) {
55 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']); 55 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
56 if (!$project_info) { 56 if (!$project_info) {
@@ -114,7 +114,7 @@ class AiBlogController extends BaseController @@ -114,7 +114,7 @@ class AiBlogController extends BaseController
114 } 114 }
115 115
116 /** 116 /**
117 - * @remark :Ai博客发布 117 + * @remark :编辑Ai博客发布
118 * @name :save 118 * @name :save
119 * @author :lyh 119 * @author :lyh
120 * @method :post 120 * @method :post
@@ -354,11 +354,13 @@ class InquiryForwardLogic extends BaseLogic @@ -354,11 +354,13 @@ class InquiryForwardLogic extends BaseLogic
354 if (isset($this->param['type']) && $this->param['type'] == 1) { 354 if (isset($this->param['type']) && $this->param['type'] == 1) {
355 //启用 355 //启用
356 $status = InquiryInfo::STATUS_INIT; 356 $status = InquiryInfo::STATUS_INIT;
  357 + $remark = '';
357 } else { 358 } else {
358 //无效 359 //无效
359 $status = InquiryInfo::STATUS_INVALID; 360 $status = InquiryInfo::STATUS_INVALID;
  361 + $remark = '手动置为无效';
360 } 362 }
361 - $rs = $this->model->edit(['status' => $status], ['id' => $this->param['id']]); 363 + $rs = $this->model->edit(['status' => $status, 'remark' => $remark], ['id' => $this->param['id']]);
362 364
363 if ($rs === false) { 365 if ($rs === false) {
364 $this->fail('设置失败'); 366 $this->fail('设置失败');
@@ -39,7 +39,7 @@ class AiBlogLogic extends BaseLogic @@ -39,7 +39,7 @@ class AiBlogLogic extends BaseLogic
39 } 39 }
40 40
41 /** 41 /**
42 - * @remark :ai发布博客 42 + * @remark :编辑ai发布博客
43 * @name :blogSave 43 * @name :blogSave
44 * @author :lyh 44 * @author :lyh
45 * @method :post 45 * @method :post
@@ -12,6 +12,7 @@ use App\Models\Product\Keyword; @@ -12,6 +12,7 @@ use App\Models\Product\Keyword;
12 use App\Models\Product\KeywordRelated; 12 use App\Models\Product\KeywordRelated;
13 use App\Models\Product\Product; 13 use App\Models\Product\Product;
14 use App\Models\RouteMap\RouteMap; 14 use App\Models\RouteMap\RouteMap;
  15 +use App\Models\User\User;
15 use Illuminate\Support\Facades\DB; 16 use Illuminate\Support\Facades\DB;
16 17
17 /** 18 /**
@@ -351,6 +352,9 @@ class KeywordLogic extends BaseLogic @@ -351,6 +352,9 @@ class KeywordLogic extends BaseLogic
351 * @time :2024/12/5 15:37 352 * @time :2024/12/5 15:37
352 */ 353 */
353 public function delAllKeyword(){ 354 public function delAllKeyword(){
  355 + if($this->user['login_source'] != User::LOGIN_AUTO_SOURCE){
  356 + return $this->success();
  357 + }
354 DB::beginTransaction(); 358 DB::beginTransaction();
355 try { 359 try {
356 //截断关联表 360 //截断关联表