gx

@@ -73,7 +73,7 @@ class Count extends Command
                     $arr['ip_num'] = $this->ip_num($yesterday,$v['test_domain']);
                     $arr['ip_num'] = $this->ip_num($yesterday,$v['test_domain']);
                     DB::disconnect('custom_mysql');
                     DB::disconnect('custom_mysql');
                     //服务达标天数
                     //服务达标天数
-                    $arr['compliance_day'] = $this->compliance_day($v['id']);
+                    $arr['compliance_day'] = $v['finish_remain_day'];
                     //剩余服务时常
                     //剩余服务时常
                     $arr['service_day'] = $v['remain_day'];
                     $arr['service_day'] = $v['remain_day'];
                     //项目id
                     //项目id
@@ -193,6 +193,7 @@ class Count extends Command
             'gl_project.type AS type',
             'gl_project.type AS type',
             'gl_project.extend_type AS extend_type',
             'gl_project.extend_type AS extend_type',
             'gl_project.remain_day AS remain_day',
             'gl_project.remain_day AS remain_day',
+            'gl_project.finish_remain_day AS finish_remain_day',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_build.project_id AS project_id',
             'gl_project_deploy_build.project_id AS project_id',

@@ -49,13 +49,19 @@ class DomainInfo extends Command
             }
             }
             $ssl = $this->updateDomainSsl($v['domain']);
             $ssl = $this->updateDomainSsl($v['domain']);
             $time = $this->updateDomain($v['domain']);
             $time = $this->updateDomain($v['domain']);
-            $data = [
-                'certificate_start_time'=>$ssl['from'],
-                'certificate_end_time'=>$ssl['to'],
-                'domain_start_time'=>$time['start'],
-                'domain_end_time'=>$time['end']
-            ];
-
+            if(!empty($time['start']) && !!empty($time['end'])){
+                $data = [
+                    'certificate_start_time'=>$ssl['from'],
+                    'certificate_end_time'=>$ssl['to'],
+                    'domain_start_time'=>$time['start'],
+                    'domain_end_time'=>$time['end']
+                ];
+            }else{
+                $data = [
+                    'domain_start_time'=>$time['start'],
+                    'domain_end_time'=>$time['end']
+                ];
+            }
             $domainModel->edit($data,['id'=>$v['id']]);
             $domainModel->edit($data,['id'=>$v['id']]);
         }
         }
         return 1;
         return 1;
@@ -169,8 +175,8 @@ class DomainInfo extends Command
             $valid_to = date('Y-m-d H:i:s', openssl_x509_parse($remote_cert)['validTo_time_t']);
             $valid_to = date('Y-m-d H:i:s', openssl_x509_parse($remote_cert)['validTo_time_t']);
             fclose($stream);
             fclose($stream);
         }catch (\Exception $e){
         }catch (\Exception $e){
-            $valid_from = date('Y-m-d H:i:s');
-            $valid_to = date('Y-m-d H:i:s');
+            $valid_from = '';
+            $valid_to = '';
         }
         }
         return ['from'=>$valid_from,'to'=>$valid_to];
         return ['from'=>$valid_from,'to'=>$valid_to];
     }
     }

@@ -41,6 +41,11 @@ class CountLogic extends BaseLogic
             $info = $this->model->read(['project_id' => $this->user['project_id']],
             $info = $this->model->read(['project_id' => $this->user['project_id']],
                 ['pv_num','ip_num','inquiry_num','date','compliance_day','service_day','country']);
                 ['pv_num','ip_num','inquiry_num','date','compliance_day','service_day','country']);
         }
         }
+        //获取项目的剩余时长
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['id'=>$this->user['project_id']],['remain_day','finish_remain_day']);
+        $info['service_day'] = $projectInfo['remain_day'];
+        $info['compliance_day'] = $projectInfo['finish_remain_day'];
         return $this->success($info);
         return $this->success($info);
     }
     }