Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6
正在显示
1 个修改的文件
包含
2 行增加
和
11 行删除
| @@ -217,28 +217,20 @@ class SyncProject extends Command | @@ -217,28 +217,20 @@ class SyncProject extends Command | ||
| 217 | DB::beginTransaction(); | 217 | DB::beginTransaction(); |
| 218 | try { | 218 | try { |
| 219 | $id = $this->saveProject($data['project']); | 219 | $id = $this->saveProject($data['project']); |
| 220 | - echo 'saveProject success' . PHP_EOL; | ||
| 221 | $this->setPostId($data['deploy_build']['plan'],$id); | 220 | $this->setPostId($data['deploy_build']['plan'],$id); |
| 222 | - echo 'setPostId success' . PHP_EOL; | ||
| 223 | $this->savePayment($data['payment'],$id); | 221 | $this->savePayment($data['payment'],$id); |
| 224 | - echo 'savePayment success' . PHP_EOL; | ||
| 225 | $this->saveDeployBuild($data['deploy_build'],$id); | 222 | $this->saveDeployBuild($data['deploy_build'],$id); |
| 226 | - echo 'saveDeployBuild success' . PHP_EOL; | ||
| 227 | $this->saveDeployOptimize($data['deploy_optimize'],$id); | 223 | $this->saveDeployOptimize($data['deploy_optimize'],$id); |
| 228 | - echo 'saveDeployOptimize success' . PHP_EOL; | ||
| 229 | $this->saveAfter($data['project_after'],$id); | 224 | $this->saveAfter($data['project_after'],$id); |
| 230 | - echo 'saveAfter success' . PHP_EOL; | ||
| 231 | 225 | ||
| 232 | if($is_update == 1){ | 226 | if($is_update == 1){ |
| 233 | //4.0或5.0更新到6.0 | 227 | //4.0或5.0更新到6.0 |
| 234 | 228 | ||
| 235 | //初始化数据库 | 229 | //初始化数据库 |
| 236 | $this->initializationMysql($id); | 230 | $this->initializationMysql($id); |
| 237 | - echo 'initializationMysql success' . PHP_EOL; | ||
| 238 | 231 | ||
| 239 | //初始账号 | 232 | //初始账号 |
| 240 | $this->createUser($data['project']['mobile'],$id,$data['project']['lead_name']); | 233 | $this->createUser($data['project']['mobile'],$id,$data['project']['lead_name']); |
| 241 | - echo 'createUser success' . PHP_EOL; | ||
| 242 | 234 | ||
| 243 | //新增数据抓取任务 | 235 | //新增数据抓取任务 |
| 244 | $task_list = []; | 236 | $task_list = []; |
| @@ -252,7 +244,6 @@ class SyncProject extends Command | @@ -252,7 +244,6 @@ class SyncProject extends Command | ||
| 252 | foreach ($task_list as $task){ | 244 | foreach ($task_list as $task){ |
| 253 | UpdateLog::createLog($id,$task,$param['get_data_url']); | 245 | UpdateLog::createLog($id,$task,$param['get_data_url']); |
| 254 | } | 246 | } |
| 255 | - echo 'UpdateTask success' . PHP_EOL; | ||
| 256 | } | 247 | } |
| 257 | 248 | ||
| 258 | DB::commit(); | 249 | DB::commit(); |
| @@ -287,9 +278,9 @@ class SyncProject extends Command | @@ -287,9 +278,9 @@ class SyncProject extends Command | ||
| 287 | * @time :2023/8/30 15:53 | 278 | * @time :2023/8/30 15:53 |
| 288 | */ | 279 | */ |
| 289 | public function saveProject($param){ | 280 | public function saveProject($param){ |
| 290 | - if(isset($param['channel']) && !empty($param['channel'])){ | 281 | +// if(isset($param['channel']) && !empty($param['channel'])){ |
| 291 | $param['channel'] = Arr::a2s($param['channel']); | 282 | $param['channel'] = Arr::a2s($param['channel']); |
| 292 | - } | 283 | +// } |
| 293 | $projectModel = new Project(); | 284 | $projectModel = new Project(); |
| 294 | $info = $projectModel->read(['from_order_id'=>$param['from_order_id'],'delete_status'=>0]); | 285 | $info = $projectModel->read(['from_order_id'=>$param['from_order_id'],'delete_status'=>0]); |
| 295 | if($info !== false){ | 286 | if($info !== false){ |
-
请 注册 或 登录 后发表评论