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

@@ -50,7 +50,7 @@ class RemainDay extends Command
     {
     {
         $list = Project::whereIn('type', [Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR])->get();
         $list = Project::whereIn('type', [Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR])->get();
         foreach ($list as $item){
         foreach ($list as $item){
-            if(in_array($item->id,$this->projectId)){
+            if(in_array($item->id,$this->projectId)){//已开始优化的时间结算
                 $optimizeModel = new DeployOptimize();
                 $optimizeModel = new DeployOptimize();
                 $opInfo = $optimizeModel->read(['project_id'=>$item->id],['start_date']);
                 $opInfo = $optimizeModel->read(['project_id'=>$item->id],['start_date']);
                 if($opInfo === false){
                 if($opInfo === false){
@@ -66,6 +66,7 @@ class RemainDay extends Command
                 }else{
                 }else{
                     if($item->uptime){
                     if($item->uptime){
                         $diff = time() - strtotime($item->uptime);
                         $diff = time() - strtotime($item->uptime);
+                        $item->finish_remain_day = floor($diff / (60 * 60 * 24));
                         $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
                         $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
                     }else{
                     }else{
                         $remain_day = $item['deploy_build']['service_duration'];
                         $remain_day = $item['deploy_build']['service_duration'];

@@ -48,7 +48,7 @@ class Demo extends Command
     protected $description = 'demo';
     protected $description = 'demo';
 
 
     public function handle(){
     public function handle(){
-        $this->synchronizationFile('/upload/p/1720/file/2024-07/4d.mp4');
+        $this->synchronizationFile('/upload/m/file/2024-07/tongli-haiyuan-keywords.pdf');
     }
     }
 
 
     public function synchronizationFile($path_name){
     public function synchronizationFile($path_name){

+<?php
+
+/**
+ * @remark :
+ * @name   :toH.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/7/23 14:14
+ */
+class toH
+{
+
+}