gx

@@ -61,17 +61,36 @@ class DomainInfoController extends BaseController
         $this->request->validate([
         $this->request->validate([
             'domain'=>'required',
             'domain'=>'required',
             'remark'=>'required',
             'remark'=>'required',
-            'company'=>'required',
             'belong_to'=>'required',
             'belong_to'=>'required',
+            'project_id'=>'required'
         ],[
         ],[
             'domain.required' => 'domain不能为空',
             'domain.required' => 'domain不能为空',
             'remark.required' => '备注不能为空',
             'remark.required' => '备注不能为空',
-            'company.required' => '所属项目不能为空',
-            'belong_to.required' => '域名不能为空'
+            'belong_to.required' => '域名不能为空',
+            'project_id.required' => '所属项目不能为空'
         ]);
         ]);
         return true;
         return true;
     }
     }
 
 
+    /**
+     * @remark :获取项目列表
+     * @name   :getProject
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/1 16:14
+     */
+    public function getProject(DomainInfoLogic $domainInfoLogic){
+        $lists = $domainInfoLogic->getProjectList($this->map);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @remark :获取详情
+     * @name   :info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/1 16:14
+     */
     public function info(DomainInfoLogic $domainInfoLogic){
     public function info(DomainInfoLogic $domainInfoLogic){
         $this->request->validate([
         $this->request->validate([
             'id'=>'required',
             'id'=>'required',

@@ -10,6 +10,7 @@ use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\Devops\ServerInformationLogic;
 use App\Http\Logic\Aside\Devops\ServerInformationLogic;
 use App\Models\Aside\Domain\DomainInfo;
 use App\Models\Aside\Domain\DomainInfo;
 use App\Models\Aside\Domain\DomainInfoLog;
 use App\Models\Aside\Domain\DomainInfoLog;
+use App\Models\Project\Project;
 use GuzzleHttp\Client;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Builder;
@@ -88,6 +89,19 @@ class DomainInfoLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :获取所有项目列表
+     * @name   :getProjectList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/1 16:10
+     */
+    public function getProjectList($map){
+        $projectModel = new Project();
+        $lists = $projectModel->list($map,['id','title']);
+        return $this->success($lists);
+    }
+
+    /**
      * @remark :删除域名
      * @remark :删除域名
      * @name   :delDomain
      * @name   :delDomain
      * @author :lyh
      * @author :lyh
@@ -109,6 +123,9 @@ class DomainInfoLogic extends BaseLogic
         if($info === false){
         if($info === false){
             $this->fail('当前数据不存在或者已被删除');
             $this->fail('当前数据不存在或者已被删除');
         }
         }
+        if(!empty($info['project_id'])){
+            $info['company'] = (new Project())->read(['id'=>$info['project_id']],['title'])['title'];
+        }
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 

@@ -178,6 +178,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/info', [Aside\Domain\DomainInfoController::class, 'info'])->name('admin.domain_info');         // 详情
         Route::any('/info', [Aside\Domain\DomainInfoController::class, 'info'])->name('admin.domain_info');         // 详情
         Route::any('/save', [Aside\Domain\DomainInfoController::class, 'save'])->name('admin.domain_save');
         Route::any('/save', [Aside\Domain\DomainInfoController::class, 'save'])->name('admin.domain_save');
         Route::any('/status', [Aside\Domain\DomainInfoController::class, 'status'])->name('admin.domain_status');
         Route::any('/status', [Aside\Domain\DomainInfoController::class, 'status'])->name('admin.domain_status');
+        Route::any('/getProject', [Aside\Domain\DomainInfoController::class, 'getProject'])->name('admin.domain_getProject');
         Route::any('/del', [Aside\Domain\DomainInfoController::class, 'del'])->name('admin.domain_del');
         Route::any('/del', [Aside\Domain\DomainInfoController::class, 'del'])->name('admin.domain_del');
         Route::any('/log', [Aside\Domain\DomainInfoLogController::class, 'lists'])->name('admin.domain_log_lists');     // 日志
         Route::any('/log', [Aside\Domain\DomainInfoLogController::class, 'lists'])->name('admin.domain_log_lists');     // 日志