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

@@ -38,7 +38,7 @@ class Temp extends Command
      * @author Akun
      * @author Akun
      * @date 2024/12/11 10:15
      * @date 2024/12/11 10:15
      */
      */
-    public function handle()
+    public function handle7()
     {
     {
         $server_id = 15;
         $server_id = 15;
         $server_name = '美服1';
         $server_name = '美服1';
@@ -178,9 +178,9 @@ class Temp extends Command
      * @author Akun
      * @author Akun
      * @date 2024/11/18 15:07
      * @date 2024/11/18 15:07
      */
      */
-    public function handle5()
+    public function handle()
     {
     {
-        $projects = Project::select(['id'])->orderBy('id', 'asc')->get();
+        $projects = Project::where('id', 874)->select(['id'])->orderBy('id', 'asc')->get();
         foreach ($projects as $project) {
         foreach ($projects as $project) {
             ProjectServer::useProject($project->id);
             ProjectServer::useProject($project->id);
 
 

@@ -43,7 +43,7 @@ class InquiryLogic extends BaseLogic
         $ids = $this->request['ids'] ?: [];
         $ids = $this->request['ids'] ?: [];
         $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);
         $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);
         $domain = (!empty(
         $domain = (!empty(
-            $project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
+            $project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  $project['deploy_build']['test_domain']);
         $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size, $ids);
         $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size, $ids);
         //处理格式 免得前端又改
         //处理格式 免得前端又改
         $data = [
         $data = [

@@ -569,7 +569,7 @@ class RankDataLogic extends BaseLogic
                     if(in_array($project_id, array_keys($multiple_api_no_project_ids))){
                     if(in_array($project_id, array_keys($multiple_api_no_project_ids))){
                         $api_nos = array_keys($multiple_api_no_project_ids[$project_id]);
                         $api_nos = array_keys($multiple_api_no_project_ids[$project_id]);
                         //今天其他api_no是否都达标了
                         //今天其他api_no是否都达标了
-                        $count = RankData::where('project_id', $project_id)->whereIn('api_no', $api_nos)->where('api_no', '<>', $api_no)->where('date', date('Y-m-d'))
+                        $count = RankData::where('project_id', $project_id)->whereIn('api_no', $api_nos)->where('api_no', '<>', $api_no)->where('updated_date', date('Y-m-d'))
                             ->where('is_compliance', 1)->count();
                             ->where('is_compliance', 1)->count();
                         if($count == count($api_nos) - 1){
                         if($count == count($api_nos) - 1){
                             Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]);
                             Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]);

@@ -34,10 +34,12 @@ class SyncService
             $project = Project::with('deploy_build')->with('deploy_optimize')->where(['id'=>$project_id])->first();
             $project = Project::with('deploy_build')->with('deploy_optimize')->where(['id'=>$project_id])->first();
             // 不满足条件 不同步到表单系统
             // 不满足条件 不同步到表单系统
             if (empty($project->deploy_optimize->domain)) {
             if (empty($project->deploy_optimize->domain)) {
-                return false;
+                $domain = '';
+            }else{
+                // 生产域名
+                $domain = (new DomainInfo())->getDomain($project->deploy_optimize->domain);
             }
             }
-            // 生产域名
-            $domain = (new DomainInfo())->getDomain($project->deploy_optimize->domain);
+
             // 收件设置信息
             // 收件设置信息
             ProjectServer::useProject($project_id);
             ProjectServer::useProject($project_id);
             $receive = WebSettingReceiving::where(['project_id' => $project_id])->get();
             $receive = WebSettingReceiving::where(['project_id' => $project_id])->get();

@@ -114,7 +114,10 @@ class SyncSubmitTaskService
     public function subscribe($data, $date, $task_id){
     public function subscribe($data, $date, $task_id){
         $email = $data['data']['email'];
         $email = $data['data']['email'];
         if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
         if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
-            $model = new Email();
+            $model = Email::where('email', $email)->first();
+            if($model){
+                return true;
+            }
             $model->email = $email;
             $model->email = $email;
             $model->save();
             $model->save();
         }else{
         }else{