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

@@ -5,6 +5,7 @@ namespace App\Console\Commands;
 
 
 use App\Models\Devops\DevopsTaskLog;
 use App\Models\Devops\DevopsTaskLog;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Utils\EncryptUtils;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use App\Models\Devops\DevopsTask as DevopsTaskModel;
 use App\Models\Devops\DevopsTask as DevopsTaskModel;
 
 
@@ -48,7 +49,7 @@ class DevopsTask extends Command
         while (true){
         while (true){
             $tasks = DevopsTaskModel::where('status', DevopsTaskModel::STATUS_PENDING)->get();
             $tasks = DevopsTaskModel::where('status', DevopsTaskModel::STATUS_PENDING)->get();
             foreach ($tasks as $task){
             foreach ($tasks as $task){
-                echo "Start task " . $task->id . PHP_EOL;
+                echo "Start task " . $task->id;
                 if($task->type == DevopsTaskModel::TYPE_MYSQL){
                 if($task->type == DevopsTaskModel::TYPE_MYSQL){
                     $this->updateTable($task);
                     $this->updateTable($task);
                 }
                 }
@@ -61,9 +62,10 @@ class DevopsTask extends Command
     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;
+            echo "project " . $project->id .  PHP_EOL;
             $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;
                 continue;
                 continue;
             }
             }
             if(!$project->mysqlConfig){
             if(!$project->mysqlConfig){
@@ -73,13 +75,22 @@ class DevopsTask extends Command
                 continue;
                 continue;
             }
             }
             //DB类是单例模式，生命周期内修改配置不会生效
             //DB类是单例模式，生命周期内修改配置不会生效
-            $conn = new \mysqli(
-                $project->mysqlConfig->host,
-                $project->mysqlConfig->user,
-                $project->mysqlConfig->password,
-                $project->databaseName(),
-                $project->mysqlConfig->port,
-            );
+            $encrypt = new EncryptUtils();
+            try {
+                $conn = new \mysqli(
+                    $project->mysqlConfig->host,
+                    $encrypt->unlock_url($project->mysqlConfig->user),
+                    $encrypt->unlock_url($project->mysqlConfig->password),
+                    $project->databaseName(),
+                    $encrypt->unlock_url($project->mysqlConfig->port),
+                );
+            }catch (\Exception $e){
+                $log->remark = mb_substr('数据库连接失败:' . $e->getMessage(), 0, 500);
+                $log->status = DevopsTaskLog::STATUS_ERROR;
+                $log->save();
+                echo '-->' . $log->remark . PHP_EOL;
+                continue;
+            }
             $res = $conn->query($task->sql);
             $res = $conn->query($task->sql);
 
 
             $log->status = $res ? DevopsTaskLog::STATUS_ACTIVE : DevopsTaskLog::STATUS_ERROR;
             $log->status = $res ? DevopsTaskLog::STATUS_ACTIVE : DevopsTaskLog::STATUS_ERROR;

@@ -3,6 +3,7 @@
 namespace App\Http\Logic\Aside\Project;
 namespace App\Http\Logic\Aside\Project;
 
 
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
+use App\Models\Project\ProjectRenew;
 use App\Models\User\ProjectMenu;
 use App\Models\User\ProjectMenu;
 use App\Models\User\ProjectRole;
 use App\Models\User\ProjectRole;
 use Illuminate\Support\Arr as SupArr;
 use Illuminate\Support\Arr as SupArr;
@@ -257,9 +258,30 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/9/12 11:20
      * @time   :2023/9/12 11:20
      */
      */
     public function setTypeSevenEdit($param){
     public function setTypeSevenEdit($param){
-        //TODO::删除项目并添加到续费单
+        //删除原始项目
+        $this->edit(['delete_status' => 1], ['id' => $param['id']]);
 
 
-        return true;
+        //添加到续费单
+        $data = [
+            'title' => '【续费单】' . $param['title'],
+            'company' => $param['company'],
+            'lead_name' => $param['lead_name'],
+            'mobile' => $param['mobile'],
+            'qq' => $param['qq'],
+            'channel' => json_encode($param['channel']),
+            'requirement' => $param['requirement'],
+            'cooperate_date' => $param['cooperate_date'],
+            'service_duration' => $param['deploy_build']['service_duration'],
+            'plan' => $param['deploy_build']['plan'],
+//            'api_no' => $param['id'],  //改手动填
+            'amount' => $param['payment']['amount'],
+            'contract' => json_encode($param['payment']['files']),
+            'bill' => json_encode($param['payment']['images']),
+        ];
+        $renewModel = new ProjectRenew();
+        $renewModel->add($data);
+
+        return $this->success();
     }
     }
 
 
     /**
     /**

@@ -60,7 +60,8 @@ class Project extends Base
             3 => '已完成-建站用户',
             3 => '已完成-建站用户',
             4 => '推广续网站',
             4 => '推广续网站',
             5 => '未续费项目',
             5 => '未续费项目',
-            6 => '特殊推广项目'
+            6 => '特殊推广项目',
+            7 => '提单错误转续费'
         ];
         ];
     }
     }