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

@@ -172,12 +172,13 @@ class NoticeController extends BaseController
     }
     }
 
 
     /**
     /**
+     * 询盘通知企业微信群提示hook
      * 升级项目询盘hook
      * 升级项目询盘hook
      * 通知发送群提醒
      * 通知发送群提醒
      * @param Request $request
      * @param Request $request
      * @return false|string
      * @return false|string
      */
      */
-    public function upgradeProjectInquiryHook(Request $request)
+    public function inquiryNoticeHook(Request $request)
     {
     {
         $domain = trim($request->input('domain'));
         $domain = trim($request->input('domain'));
         $country = trim($request->input('country'));
         $country = trim($request->input('country'));

@@ -343,9 +343,10 @@ class PrivateController extends BaseController
     public function upgradeProjectDomain()
     public function upgradeProjectDomain()
     {
     {
         $domain = Project::leftJoin('gl_domain_info', 'gl_project.id', '=', 'gl_domain_info.project_id')
         $domain = Project::leftJoin('gl_domain_info', 'gl_project.id', '=', 'gl_domain_info.project_id')
-            ->where(['gl_project.is_upgrade' => Project::IS_UPGRADE_TRUE, 'gl_project.delete_status' => Project::IS_DEL_FALSE, ''])
+            ->where(['gl_project.is_upgrade' => Project::IS_UPGRADE_TRUE, 'gl_project.delete_status' => Project::IS_DEL_FALSE])
             ->pluck('domain')
             ->pluck('domain')
             ->toArray();
             ->toArray();
-        return $this->success($domain);
+        $list = array_filter(array_unique($domain));
+        return $this->success($list);
     }
     }
 }
 }

@@ -39,6 +39,12 @@ class AllProjectController extends BaseController
         if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
         if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
             $this->map['test_domain'] = ['like','%'.$this->map['test_domain'].'%'];
             $this->map['test_domain'] = ['like','%'.$this->map['test_domain'].'%'];
         }
         }
+        if(isset($this->map['title']) && !empty($this->map['title'])){
+            $this->map['title'] = ['like','%'.$this->map['title'].'%'];
+        }
+        if(isset($this->map['company']) && !empty($this->map['company'])){
+            $this->map['company'] = ['like','%'.$this->map['company'].'%'];
+        }
         $data = $allProject->lists($this->map,$this->page,$this->row);
         $data = $allProject->lists($this->map,$this->page,$this->row);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }

@@ -79,6 +79,9 @@ class KeywordController extends BaseController
         if(!empty($map['keyword_title'])){
         if(!empty($map['keyword_title'])){
             $map['keyword_title'] = ['like','%'.$map['keyword_title'].'%'];
             $map['keyword_title'] = ['like','%'.$map['keyword_title'].'%'];
         }
         }
+        if(empty($map['is_video_keyword'])){
+            unset($map['is_video_keyword']);
+        }
         $map['route'] = ['<>',''];
         $map['route'] = ['<>',''];
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
         $map['deleted_at'] = null;
         $map['deleted_at'] = null;

@@ -277,6 +277,7 @@ class UserLoginLogic
         $info['service_duration'] = $project['deploy_build']['service_duration'] ?? 0;
         $info['service_duration'] = $project['deploy_build']['service_duration'] ?? 0;
         $info['is_comment'] = $project['deploy_build']['is_comment'] ?? 0;
         $info['is_comment'] = $project['deploy_build']['is_comment'] ?? 0;
         $info['remain_day'] = $project['remain_day'] ?? 0;
         $info['remain_day'] = $project['remain_day'] ?? 0;
+        $info['project_created_at'] = $project['created_at'];
         $info['type'] = $project['type'] ?? 1;
         $info['type'] = $project['type'] ?? 1;
         if($info['is_customized'] == 1){
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
             $info['is_visualization'] = json_decode($project['is_visualization']);
@@ -292,6 +293,7 @@ class UserLoginLogic
             $is_amp = $amp_info ? $amp_info['amp_status'] : 0;
             $is_amp = $amp_info ? $amp_info['amp_status'] : 0;
         }
         }
         $info['is_amp'] = $is_amp;
         $info['is_amp'] = $is_amp;
+        $info['is_three_code'] = $project['is_three_code'] ?? 0;
         return $info;
         return $info;
     }
     }
 
 

@@ -41,7 +41,10 @@ Route::any('getAutoToken', [\App\Http\Controllers\Api\PrivateController::class,
 Route::any('valid_product_route', [\App\Http\Controllers\Api\PrivateController::class, 'getProductRoute'])->name('api.valid_product_route');
 Route::any('valid_product_route', [\App\Http\Controllers\Api\PrivateController::class, 'getProductRoute'])->name('api.valid_product_route');
 // 6.0项目新增有效链接 - 提交Google
 // 6.0项目新增有效链接 - 提交Google
 Route::any('project_new_url', [\App\Http\Controllers\Api\PrivateController::class, 'projectNewUrl'])->name('api.project_new_url');
 Route::any('project_new_url', [\App\Http\Controllers\Api\PrivateController::class, 'projectNewUrl'])->name('api.project_new_url');
-
+// 6.0升级项目域名列表
+Route::any('upgrade_project_domain', [\App\Http\Controllers\Api\PrivateController::class, 'upgradeProjectDomain'])->name('api.upgrade_project_domain');
+// 询盘通知微信提示hook
+Route::any('inquiry_notice_hook', [\App\Http\Controllers\Api\NoticeController::class, 'inquiryNoticeHook'])->name('api.inquiry_notice_hook');
 
 
 // --------------------- 站群服务 ------------------------------------------
 // --------------------- 站群服务 ------------------------------------------
 // 获取项目信息
 // 获取项目信息