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

Lyh server



查看合并请求 !1525

@@ -27,7 +27,7 @@ class DomainSettingController extends BaseController
 {
 {
     public function __construct(Request $request)
     public function __construct(Request $request)
     {
     {
-        $this->model = new DomainInfo();
+        $this->model = new WebSetting();
         parent::__construct($request);
         parent::__construct($request);
     }
     }
 
 
@@ -39,7 +39,7 @@ class DomainSettingController extends BaseController
      * @time   :2025/3/20 11:26
      * @time   :2025/3/20 11:26
      */
      */
     public function getInfo(){
     public function getInfo(){
-        $data = $this->model->read(['project_id'=>$this->user['project_id']]);
+        $data = $this->model->read(['project_id'=>$this->user['project_id']],['seo_domain']);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 

@@ -10,7 +10,7 @@
 namespace App\Http\Logic\Bside\SeoSetting;
 namespace App\Http\Logic\Bside\SeoSetting;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
-use App\Models\SeoSetting\KeywordUrl;
+use App\Models\Project\DeployOptimize;
 use App\Models\WebSetting\WebSetting;
 use App\Models\WebSetting\WebSetting;
 
 
 class DomainSettingLogic extends BaseLogic
 class DomainSettingLogic extends BaseLogic
@@ -42,7 +42,7 @@ class DomainSettingLogic extends BaseLogic
                 //保存数据
                 //保存数据
                 $this->param['domain'] = str_replace('www','blog',$this->param['domain']);
                 $this->param['domain'] = str_replace('www','blog',$this->param['domain']);
                 $id = $this->model->addReturnId(['domain'=>$this->param['domain'],'project_id'=>$this->user['project_id'],'belong_to'=>2,'status'=>1]);
                 $id = $this->model->addReturnId(['domain'=>$this->param['domain'],'project_id'=>$this->user['project_id'],'belong_to'=>2,'status'=>1]);
-                $projectModel  = new Project();
+                $projectModel  = new DeployOptimize();
                 $projectModel->edit(['domain'=>$id],['project_id'=>$this->user['project_id']]);
                 $projectModel->edit(['domain'=>$id],['project_id'=>$this->user['project_id']]);
             }else{
             }else{
                 $this->model->edit(['domain'=>$this->param['domain']],['project_id'=>$this->user['project_id']]);
                 $this->model->edit(['domain'=>$this->param['domain']],['project_id'=>$this->user['project_id']]);