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

@@ -105,6 +105,7 @@ class ProjectController extends BaseController
             'gl_project_deploy_build.tech_mid AS tech_mid',
             'gl_project_deploy_build.tech_mid AS tech_mid',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_build.plan AS plan',
             'gl_project_deploy_build.plan AS plan',
+            'gl_project_deploy_build.is_participle AS is_participle',
             'gl_project_deploy_optimize.dept_id AS optimize_dept_id',
             'gl_project_deploy_optimize.dept_id AS optimize_dept_id',
             'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid',
             'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid',
             'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid',
             'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid',
@@ -367,7 +368,6 @@ class ProjectController extends BaseController
         $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
         $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
         $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
         $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
         $item['collect_time'] = $item['is_upgrade'] ? UpdateLog::getProjectUpdate($item['id']) : '';
         $item['collect_time'] = $item['is_upgrade'] ? UpdateLog::getProjectUpdate($item['id']) : '';
-
         return $item;
         return $item;
     }
     }
 
 
@@ -1024,4 +1024,23 @@ class ProjectController extends BaseController
         $this->response('success');
         $this->response('success');
     }
     }
 
 
+    /**
+     * @remark :开启与关闭分词搜索
+     * @name   :setIsParticiple
+     * @author :lyh
+     * @method :post
+     * @time   :2024/6/19 10:07
+     */
+    public function setIsParticiple(){
+        $this->request->validate([
+            'project_id'=>'required',
+            'is_participle'=>'required'
+        ],[
+            'project_id.required' => '项目id不能为空',
+            'is_participle.required' => '项目id不能为空',
+        ]);
+        $deployBuildModel = new DeployBuild();
+        $deployBuildModel->edit(['is_participle'=>$this->param['is_participle']],['project_id'=>$this->param['project_id']]);
+        $this->response('success');
+    }
 }
 }

@@ -290,13 +290,9 @@ class ImageController extends Controller
             'name'=>$name,
             'name'=>$name,
             'en_name'=>$fileName
             'en_name'=>$fileName
         ];
         ];
-        $imageModel = new ImageModel();
-        $info = $imageModel->read(['hash'=>$hash,'project_id'=>$this->cache['project_id'] ?? 0]);
-        if($info === false){
-            $rs = $imageModel->add($data);
-            if ($rs === false) {
-                return $this->response('添加失败', Code::USER_ERROR);
-            }
+        $rs = $imageModel->add($data);
+        if ($rs === false) {
+            return $this->response('添加失败', Code::USER_ERROR);
         }
         }
         return true;
         return true;
     }
     }
@@ -350,9 +346,11 @@ class ImageController extends Controller
                 $amazonS3Service->uploadFiles($file,$this->path,$fileName);
                 $amazonS3Service->uploadFiles($file,$this->path,$fileName);
             }
             }
             //批量存储
             //批量存储
-            $this->saveMysql($imageModel,$file->getSize(),$image_type,$fileName,$hash,$this->upload_location,$file->getMimeType(),$name);
-            $this->synchronizationImage($fileName,$this->upload_location);
-            $data[] = $this->responseData($this->path.'/'.$fileName,$name);
+            $rs = $this->saveMysql($imageModel,$file->getSize(),$image_type,$fileName,$hash,$this->upload_location,$file->getMimeType(),$name);
+            if($rs){
+                $this->synchronizationImage($fileName,$this->upload_location);
+                $data[] = $this->responseData($this->path.'/'.$fileName,$name);
+            }
         }
         }
          $this->response('图片资源',Code::SUCCESS,$data);
          $this->response('图片资源',Code::SUCCESS,$data);
     }
     }

@@ -189,6 +189,8 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/saveInquiryFilterConfig', [Aside\Project\ProjectController::class, 'saveInquiryFilterConfig'])->name('admin.project_inquiry_filter_config_save');//保存询盘过滤配置
         Route::any('/saveInquiryFilterConfig', [Aside\Project\ProjectController::class, 'saveInquiryFilterConfig'])->name('admin.project_inquiry_filter_config_save');//保存询盘过滤配置
         Route::any('/saveWebTrafficConfig', [Aside\Project\ProjectController::class, 'saveWebTrafficConfig'])->name('admin.project_web_traffic_config_save');//保存引流配置
         Route::any('/saveWebTrafficConfig', [Aside\Project\ProjectController::class, 'saveWebTrafficConfig'])->name('admin.project_web_traffic_config_save');//保存引流配置
         Route::any('/updateProjectManager', [Aside\Project\ProjectController::class, 'updateProjectManager'])->name('admin.project_updateProjectManager');//更改项目人员配置
         Route::any('/updateProjectManager', [Aside\Project\ProjectController::class, 'updateProjectManager'])->name('admin.project_updateProjectManager');//更改项目人员配置
+        Route::any('/setIsParticiple', [Aside\Project\ProjectController::class, 'setIsParticiple'])->name('admin.project_setIsParticiple');//开启/关闭分词
+
         //获取关键词前缀和后缀
         //获取关键词前缀和后缀
         Route::prefix('keyword')->group(function () {
         Route::prefix('keyword')->group(function () {
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');