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

@@ -160,7 +160,6 @@ class PostInquiryForward extends Command
                 Log::channel('inquiry_forward')->error('post_inquiry_forward visit error', [$res, $url, $data]);
                 return false;
             }
-            Log::channel('inquiry_forward')->error('post_inquiry_forward visit success', [$res, $url, $data]);
         } else {
             //v4 v5分离项目 往测试链接推
             $project_info = InquiryProject::select(['is_split', 'test_domain'])->where('domain', 'like', '%' . $detail['website'] . '%')->first();
@@ -195,8 +194,6 @@ class PostInquiryForward extends Command
                 Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 visit error', [$res->body(), $url, $data]);
                 return false;
             }
-
-            Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 visit success', [$res->body(), $url, $data]);
         }
         $log->status = InquiryRelayDetailLog::STATUS_SUCCESS;
         $log->save();
@@ -224,7 +221,6 @@ class PostInquiryForward extends Command
 
         $log->status = InquiryRelayDetailLog::STATUS_SUCCESS;
         $log->save();
-
         return true;
     }
 
@@ -264,9 +260,8 @@ class PostInquiryForward extends Command
             Log::channel('inquiry_forward')->error('post_inquiry_forward xp inquiry error', [$res, $url, $data]);
             return false;
         }
-        Log::channel('inquiry_forward')->error('post_inquiry_forward xp inquiry success', [$res, $url, $data]);
 
-        return false;
+        return true;
     }
 
     public function v6Inquiry($detail, $log)
@@ -293,7 +288,7 @@ class PostInquiryForward extends Command
             Log::channel('inquiry_forward')->error('post_inquiry_forward v6 inquiry error', [$res, $url, $data]);
             return false;
         }
-        Log::channel('inquiry_forward')->error('post_inquiry_forward v6 inquiry success', [$res, $url, $data]);
+
         return true;
     }
 
@@ -322,7 +317,6 @@ class PostInquiryForward extends Command
                 Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 inquiry error', [$res->body(), $url, $data]);
                 return false;
             }
-            Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 inquiry success', [$res->body(), $url, $data]);
         } else {
             $data = [
                 'name' => $detail['name'],
@@ -345,7 +339,6 @@ class PostInquiryForward extends Command
                 Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 inquiry error', [$res, $url, $data]);
                 return false;
             }
-            Log::channel('inquiry_forward')->error('post_inquiry_forward v4|v5 inquiry success', [$res, $url, $data]);
         }
 
         return true;

@@ -35,7 +35,7 @@ class Temp extends Command
 
     public function handle()
     {
-
+        $this->domain_rewrite_https();
     }
 
     /**
@@ -50,7 +50,7 @@ class Temp extends Command
         $buildModel = new DeployBuild();
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
-        $list = $domainModel->select(['id', 'domain', 'project_id'])->where('status', '=', 1)->where('project_id', '>', 0)->get();
+        $list = $domainModel->select(['id', 'domain', 'project_id'])->where('status', '=', 1)->where('project_id', '>', 0)->where('is_https', 0)->get();
         foreach ($list as $v) {
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
             if (!$project_info) {

@@ -114,7 +114,7 @@ class AiBlogController extends BaseController
     }
 
     /**
-     * @remark :Ai博客发布
+     * @remark :编辑Ai博客发布
      * @name   :save
      * @author :lyh
      * @method :post

@@ -354,11 +354,13 @@ class InquiryForwardLogic extends BaseLogic
         if (isset($this->param['type']) && $this->param['type'] == 1) {
             //启用
             $status = InquiryInfo::STATUS_INIT;
+            $remark = '';
         } else {
             //无效
             $status = InquiryInfo::STATUS_INVALID;
+            $remark = '手动置为无效';
         }
-        $rs = $this->model->edit(['status' => $status], ['id' => $this->param['id']]);
+        $rs = $this->model->edit(['status' => $status, 'remark' => $remark], ['id' => $this->param['id']]);
 
         if ($rs === false) {
             $this->fail('设置失败');

@@ -39,7 +39,7 @@ class AiBlogLogic extends BaseLogic
     }
 
     /**
-     * @remark :ai发布博客
+     * @remark :编辑ai发布博客
      * @name   :blogSave
      * @author :lyh
      * @method :post

@@ -12,6 +12,7 @@ use App\Models\Product\Keyword;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
 use App\Models\RouteMap\RouteMap;
+use App\Models\User\User;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -351,6 +352,9 @@ class KeywordLogic extends  BaseLogic
      * @time   :2024/12/5 15:37
      */
     public function delAllKeyword(){
+        if($this->user['login_source'] != User::LOGIN_AUTO_SOURCE){
+            return $this->success();
+        }
         DB::beginTransaction();
         try {
             //截断关联表