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

@@ -292,9 +292,17 @@ class Temp extends Command
                 }
                 }
             } else {
             } else {
                 //其他服务器：请求对应C端接口
                 //其他服务器：请求对应C端接口
-                $c_url = $domain . '/api/update_page/?project_id=' . $project_id . '&type=3';
-                $re = http_get($c_url);
-                $this->output($re['message'] ?? '');
+                $c_url = $domain . '/api/update_page/';
+                $c_params = [
+                    'project_id' => $project_id,
+                    'type' => 3
+                ];
+                $re = http_post($c_url, json_encode($c_params), [], true);
+                if (isset($re['status']) && $re['status'] == 200) {
+                    $this->output($c_url . ' | 请求成功');
+                } else {
+                    $this->output($c_url . ' | ' . ($re['message'] ?? '未返回失败原因'));
+                }
             }
             }
             $this->output('项目id:' . $project_id . ',end');
             $this->output('项目id:' . $project_id . ',end');
         }
         }

@@ -11,8 +11,10 @@ use App\Models\Com\KeywordVideoTaskLog;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainRedirectTask;
 use App\Models\Domain\DomainRedirectTask;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
+use App\Models\Project\Project;
 use App\Models\Visit\SyncSubmitTask;
 use App\Models\Visit\SyncSubmitTask;
 use App\Models\Visit\Visit;
 use App\Models\Visit\Visit;
+use App\Models\Workchat\MessagePush;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -168,4 +170,28 @@ class NoticeController extends BaseController
 
 
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * 询盘通知企业微信群提示hook
+     * 升级项目询盘hook
+     * 通知发送群提醒
+     * @param Request $request
+     * @return false|string
+     */
+    public function inquiryNoticeHook(Request $request)
+    {
+        $domain = trim($request->input('domain'));
+        $country = trim($request->input('country'));
+        $name = trim($request->input('name'));
+        $submit = trim($request->input('submit_at'));
+        if (empty($domain) || empty($country) || empty($name) || empty($submit))
+            return $this->error('参数不完整！');
+
+        $project = Project::getProjectByDomain($domain);
+        if (empty($project))
+            return $this->success();
+
+        MessagePush::addInquiryMessage(0, $project->id, $country, $name, $submit);
+        return $this->success();
+    }
 }
 }

@@ -335,4 +335,18 @@ class PrivateController extends BaseController
         }
         }
         return $this->success($result);
         return $this->success($result);
     }
     }
+
+    /**
+     * 获取升级项目域名
+     * @return false|string
+     */
+    public function upgradeProjectDomain()
+    {
+        $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])
+            ->pluck('domain')
+            ->toArray();
+        $list = array_filter(array_unique($domain));
+        return $this->success($list);
+    }
 }
 }

@@ -81,18 +81,19 @@ class EmailController extends BaseController
             'host.regex' => 'smtp格式错误',
             'host.regex' => 'smtp格式错误',
             'from_name.required' => '发信人昵称必须',
             'from_name.required' => '发信人昵称必须',
         ]);
         ]);
+        $this->param['project_id'] = $this->project['id'];
         $info = $smtp->read(['project_id' => $this->project['id']]);
         $info = $smtp->read(['project_id' => $this->project['id']]);
         if (!$info) {
         if (!$info) {
             $smtp->add($this->param);
             $smtp->add($this->param);
         } else {
         } else {
-            $smtp->edit($this->param, ['project_id' => $this->param['project_id']]);
+            $smtp->edit($this->param, ['project_id' => $this->project['id']]);
         }
         }
         $this->response('success');
         $this->response('success');
     }
     }
 
 
     public function get_smtp(Smtp $smtp){
     public function get_smtp(Smtp $smtp){
         $info = $smtp->read(['project_id' => $this->project['id']]);
         $info = $smtp->read(['project_id' => $this->project['id']]);
-        $this->response($info);
+        $this->response($info??[]);
     }
     }
 
 
     public function group_send(GroupSendTask $groupSendTask)
     public function group_send(GroupSendTask $groupSendTask)

@@ -57,7 +57,7 @@ class MessagePush extends Base
         }
         }
 
 
         //特殊处理， 要求任何时候收到询盘都要及时推送到群里面
         //特殊处理， 要求任何时候收到询盘都要及时推送到群里面
-        $special_project_ids = [650];
+        $special_project_ids = [650, 2045];
         //9-21 点，每条消息及时通知
         //9-21 点，每条消息及时通知
         //21-第二天 9 点，整合一起通知
         //21-第二天 9 点，整合一起通知
         $hour = date('H', strtotime($submit_at));
         $hour = date('H', strtotime($submit_at));
@@ -79,20 +79,27 @@ class MessagePush extends Base
                 $model->friend_id = $friend_id;
                 $model->friend_id = $friend_id;
                 $model->type = self::TYPE_INQUIRY;
                 $model->type = self::TYPE_INQUIRY;
                 $model->ref_ids = $id;
                 $model->ref_ids = $id;
+                $model->countries = $country;
                 $model->send_time = $send_time;
                 $model->send_time = $send_time;
                 $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!';
                 $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!';
             }else{
             }else{
                 $ref_ids = explode(',', $model->ref_ids);
                 $ref_ids = explode(',', $model->ref_ids);
                 $ref_ids[] = $id;
                 $ref_ids[] = $id;
                 $model->ref_ids = implode(',', $ref_ids);
                 $model->ref_ids = implode(',', $ref_ids);
-                $countries = InquiryFormData::whereIn('id', $ref_ids)->pluck('country')->toArray();
+                $countries = explode(',', $model->countries);
+                $countries[] = $country;
+                $model->countries = implode(',', $countries);
+
+                // 升级项目部分询盘无法监控， 会通过接口通知， 但是ID会值为固定值0，在数据库查不到， 无法获取对应国家
                 $count = count($countries);
                 $count = count($countries);
+                if ($countries) {
                     $countries = array_unique($countries);
                     $countries = array_unique($countries);
                     if(count($countries) > 3){
                     if(count($countries) > 3){
                         $country = implode(',', array_slice($countries, 0, 3)) . '...';
                         $country = implode(',', array_slice($countries, 0, 3)) . '...';
                     }else{
                     }else{
                         $country = implode(',', $countries);
                         $country = implode(',', $countries);
                     }
                     }
+                }
                 $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . '】'.$count.'条询盘信息，请登录后台或APP进行查看!';
                 $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . '】'.$count.'条询盘信息，请登录后台或APP进行查看!';
             }
             }
         }
         }

@@ -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');
 
 
 // --------------------- 站群服务 ------------------------------------------
 // --------------------- 站群服务 ------------------------------------------
 // 获取项目信息
 // 获取项目信息