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

@@ -83,17 +83,11 @@ class IndexController extends BaseController
         $this->request->validate([
         $this->request->validate([
             'data' => 'required|array',
             'data' => 'required|array',
             'identifying'=>'required',
             'identifying'=>'required',
-            'code'=>'required'
         ], [
         ], [
             'data.required' => '自定义询盘数据不为空',
             'data.required' => '自定义询盘数据不为空',
             'data.array' => '必须为数组',
             'data.array' => '必须为数组',
             'identifying.required' => '唯一标识不为空',
             'identifying.required' => '唯一标识不为空',
-            'code'=>'加密串不能为空'
         ]);
         ]);
-        $code = base64_encode(md5($this->param['identifying']));
-        if($code != $this->param['code']){
-            $this->response('签名错误',Code::SYSTEM_ERROR);
-        }
         $inquiryModel = new InquiryData();
         $inquiryModel = new InquiryData();
         $rs = $inquiryModel->add($this->param);
         $rs = $inquiryModel->add($this->param);
         if($rs === false){
         if($rs === false){
@@ -101,5 +95,5 @@ class IndexController extends BaseController
         }
         }
         $this->response('success');
         $this->response('success');
     }
     }
-    
+
 }
 }

@@ -817,11 +817,41 @@ class ProjectController extends BaseController
      * @time   :2023/11/17 15:23
      * @time   :2023/11/17 15:23
      */
      */
     public function saveOtherProject(ProjectLogic $logic){
     public function saveOtherProject(ProjectLogic $logic){
+        $this->request->validate([
+            'id'=>'required',
+            'aicc'=>'required',
+            'hagro'=>'required',
+            'exclusive_aicc_day'=>'required',
+            'exclusive_hagro_day'=>'required',
+        ],[
+            'id.required' => 'id不能为空',
+            'aicc.required' => 'aicc是否开启不能为空',
+            'hagro.required' => 'hagro是否开启不能为空',
+            'exclusive_aicc_day.required' => '服务天数不能为空',
+            'exclusive_hagro_day.required' => '服务天数不能为空',
+        ]);
         $logic->saveOtherProject();
         $logic->saveOtherProject();
         $this->response('success');
         $this->response('success');
     }
     }
 
 
     /**
     /**
+     * @remark :获取其他项目配置
+     * @name   :getOtherProject
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/17 15:23
+     */
+    public function getOtherProject(ProjectLogic $logic){
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'id不能为空',
+        ]);
+        $info = $logic->getOtherProject();
+        $this->response('success',Code::SUCCESS,$info);
+    }
+
+    /**
      * @remark :获取渠道信息
      * @remark :获取渠道信息
      * @name   :getChannel
      * @name   :getChannel
      * @author :lyh
      * @author :lyh

@@ -710,4 +710,16 @@ class ProjectLogic extends BaseLogic
         return $this->success($this->param);
         return $this->success($this->param);
     }
     }
 
 
+    /**
+     * @remark :获取其他配置
+     * @name   :getOtherProject
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/21 15:45
+     */
+    public function getOtherProject(){
+        $info = $this->model->read(['id'=>$this->param['id']],['aicc','hagro','exclusive_aicc_day','exclusive_hagro_day']);
+        return $this->success($info);
+    }
+
 }
 }

@@ -172,6 +172,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/copyProject', [Aside\Project\ProjectController::class, 'copyProject'])->name('admin.project_copyProject');
         Route::any('/copyProject', [Aside\Project\ProjectController::class, 'copyProject'])->name('admin.project_copyProject');
         Route::any('/site_token', [Aside\Project\ProjectController::class, 'site_token'])->name('admin.project_site_token');
         Route::any('/site_token', [Aside\Project\ProjectController::class, 'site_token'])->name('admin.project_site_token');
         Route::any('/saveOtherProject', [Aside\Project\ProjectController::class, 'saveOtherProject'])->name('admin.project_saveOtherProject');//其他项目设置
         Route::any('/saveOtherProject', [Aside\Project\ProjectController::class, 'saveOtherProject'])->name('admin.project_saveOtherProject');//其他项目设置
+        Route::any('/getOtherProject', [Aside\Project\ProjectController::class, 'getOtherProject'])->name('admin.project_getOtherProject');//获取其他项目设置
         Route::any('/getChannel', [Aside\Project\ProjectController::class, 'getChannel'])->name('admin.project_getChannel');//其他项目设置
         Route::any('/getChannel', [Aside\Project\ProjectController::class, 'getChannel'])->name('admin.project_getChannel');//其他项目设置
         //获取关键词前缀和后缀
         //获取关键词前缀和后缀
         Route::prefix('keyword')->group(function () {
         Route::prefix('keyword')->group(function () {