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

Lyh server



查看合并请求 !3135

@@ -512,12 +512,7 @@ class ProjectController extends BaseController
      */
      */
     public function info(ProjectLogic $logic)
     public function info(ProjectLogic $logic)
     {
     {
-        $this->request->validate([
-            'id' => 'required'
-        ], [
-            'id.required' => 'ID不能为空'
-        ]);
-        $data = $logic->getProjectInfo($this->param['id']);
+        $data = $logic->getProjectInfo($this->param);
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }
 
 

@@ -86,9 +86,12 @@ class ProjectLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/7/28 17:11
      * @time   :2023/7/28 17:11
      */
      */
-    public function getProjectInfo($id){
+    public function getProjectInfo($id = ''){
+        if(!empty($id)){
+            $this->param['id'] = $id;
+        }
         $info = $this->model->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check',
         $info = $this->model->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check',
-            'project_after','inquiry_filter_config','web_traffic_config','project_keyword'])->where(['id'=>$id])->first()->toArray();
+            'project_after','inquiry_filter_config','web_traffic_config','project_keyword'])->where($this->param)->first()->toArray();
         $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
         $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
         if($info['extend_type'] != 0){
         if($info['extend_type'] != 0){
@@ -116,13 +119,13 @@ class ProjectLogic extends BaseLogic
         }
         }
         //is_product:"0",is_news:"0",is_blogs:"0",is_module:"0"
         //is_product:"0",is_news:"0",is_blogs:"0",is_module:"0"
         //获取小语种
         //获取小语种
-        $info['minor_languages'] = $this->getProjectMinorLanguages($id);
+        $info['minor_languages'] = $this->getProjectMinorLanguages($info['id']);
         //升级项目采集完成时间
         //升级项目采集完成时间
-        $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
+        $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($info['id']) : '';
         //升级项目采集的测试站域名
         //升级项目采集的测试站域名
-        $info['collect_test_domain'] = $info['is_upgrade'] ? CollectLog::getCollectTestDomain($id) : '';
+        $info['collect_test_domain'] = $info['is_upgrade'] ? CollectLog::getCollectTestDomain($info['id']) : '';
         //获取项目所属行业
         //获取项目所属行业
-        $info['deploy_optimize']['industry'] = ProjectIndustryRelated::where('project_id', $id)->pluck('industry_id')->toArray();
+        $info['deploy_optimize']['industry'] = ProjectIndustryRelated::where('project_id', $info['id'])->pluck('industry_id')->toArray();
         return $this->success($info);
         return $this->success($info);
     }
     }