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

@@ -46,23 +46,20 @@ class DevopsTask extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
-        while (true){
-            $tasks = DevopsTaskModel::where('status', DevopsTaskModel::STATUS_PENDING)->get();
-            foreach ($tasks as $task){
-                echo "Start task " . $task->id;
-                if($task->type == DevopsTaskModel::TYPE_MYSQL){
-                    $this->updateTable($task);
-                }
-                echo "End task " . $task->id . PHP_EOL;
+        $tasks = DevopsTaskModel::where('status', DevopsTaskModel::STATUS_PENDING)->get();
+        foreach ($tasks as $task){
+            echo "Start task " . $task->id;
+            if($task->type == DevopsTaskModel::TYPE_MYSQL){
+                $this->updateTable($task);
             }
             }
-            sleep(10);
+            echo "End task " . $task->id . PHP_EOL;
         }
         }
     }
     }
 
 
     public function updateTable($task){
     public function updateTable($task){
         $projects = Project::all();
         $projects = Project::all();
         foreach ($projects as $project){
         foreach ($projects as $project){
-            echo "project " . $project->id .  PHP_EOL;
+            echo "project " . $project->id;
             $log = DevopsTaskLog::addLog($task->id, $project->id);
             $log = DevopsTaskLog::addLog($task->id, $project->id);
             if($log->status == DevopsTaskModel::STATUS_ACTIVE){
             if($log->status == DevopsTaskModel::STATUS_ACTIVE){
                 echo  'continue' . PHP_EOL;
                 echo  'continue' . PHP_EOL;

@@ -11,7 +11,9 @@ use App\Models\Project\Project;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use App\Utils\EncryptUtils;
 use App\Utils\EncryptUtils;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
+use Symfony\Component\Process\Process;
 
 
 /**
 /**
  * Class ServerConfigLogic
  * Class ServerConfigLogic
@@ -174,6 +176,9 @@ class ServerConfigLogic extends BaseLogic
      */
      */
     public function updateAllTable($param){
     public function updateAllTable($param){
         DevopsTask::addTask($param['sql']);
         DevopsTask::addTask($param['sql']);
+        //执行命令行
+        $process = new Process(['php', 'artisan', 'devops_task']);
+        $process->start();
         return $this->success();
         return $this->success();
     }
     }
 }
 }

@@ -27,6 +27,7 @@ use App\Services\ProjectServer;
 use Hashids\Hashids;
 use Hashids\Hashids;
 use App\Models\User\User as UserModel;
 use App\Models\User\User as UserModel;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 
 /**
 /**
  * Class ProjectLogic
  * Class ProjectLogic
@@ -275,8 +276,8 @@ class ProjectLogic extends BaseLogic
             'plan' => $param['deploy_build']['plan'],
             'plan' => $param['deploy_build']['plan'],
 //            'api_no' => $param['id'],  //改手动填
 //            'api_no' => $param['id'],  //改手动填
             'amount' => $param['payment']['amount'],
             'amount' => $param['payment']['amount'],
-            'contract' => json_encode($param['payment']['files']),
-            'bill' => json_encode($param['payment']['images']),
+            'contract' => json_encode($param['payment']['contract']),
+            'bill' => json_encode($param['payment']['bill']),
         ];
         ];
         $renewModel = new ProjectRenew();
         $renewModel = new ProjectRenew();
         $renewModel->add($data);
         $renewModel->add($data);