作者 lyh

gx

@@ -51,31 +51,30 @@ class InitProject extends Command @@ -51,31 +51,30 @@ class InitProject extends Command
51 $list = NoticeLog::where('type', NoticeLog::TYPE_INIT_PROJECT)->where('status', NoticeLog::STATUS_PENDING)->get(); 51 $list = NoticeLog::where('type', NoticeLog::TYPE_INIT_PROJECT)->where('status', NoticeLog::STATUS_PENDING)->get();
52 foreach ($list as $item){ 52 foreach ($list as $item){
53 echo 'start:' . $item['id'] . PHP_EOL; 53 echo 'start:' . $item['id'] . PHP_EOL;
54 -// try { 54 + try {
55 $project = Project::find($item['data']['project_id']); 55 $project = Project::find($item['data']['project_id']);
56 $project_logic = new ProjectLogic(); 56 $project_logic = new ProjectLogic();
57 - $projectInfo = $project_logic->getProjectInfo($project);  
58 //初始化数据库 57 //初始化数据库
59 - if(!empty($projectInfo['mysql_id'])){  
60 - $project_logic->initializationMysql($project); 58 + if(!empty($project['mysql_id'])){
  59 + $project_logic->initializationMysql($project['id']);
61 } 60 }
62 //初始账号 61 //初始账号
63 - if(!empty($projectInfo['mobile'])){  
64 - $project_logic->createUser($projectInfo['mobile'],$projectInfo['id'],$projectInfo['lead_name']); 62 + if(!empty($project['mobile'])){
  63 + $project_logic->createUser($project['mobile'],$project['id'],$project['lead_name']);
65 } 64 }
66 - $project_logic->createdRole($projectInfo['id']); 65 + $project_logic->createdRole($project['id']);
67 //更改服务器状态 66 //更改服务器状态
68 - if(!empty($projectInfo['serve_id'])){  
69 - $project_logic->updateServe($projectInfo['serve_id']); 67 + if(!empty($project['serve_id'])){
  68 + $project_logic->updateServe($project['serve_id']);
70 } 69 }
71 $item->status = NoticeLog::STATUS_SUCCESS; 70 $item->status = NoticeLog::STATUS_SUCCESS;
72 $item->save(); 71 $item->save();
73 echo 'success:' . $item['id'] . PHP_EOL; 72 echo 'success:' . $item['id'] . PHP_EOL;
74 -// }catch (\Exception $e){  
75 -// echo 'error:' . $item['id'] . $e->getMessage() . PHP_EOL;  
76 -// errorLog('项目初始化失败', $item, $e);  
77 -// $this->retry($item, $e->getMessage());  
78 -// } 73 + }catch (\Exception $e){
  74 + echo 'error:' . $item['id'] . $e->getMessage() . PHP_EOL;
  75 + errorLog('项目初始化失败', $item, $e);
  76 + $this->retry($item, $e->getMessage());
  77 + }
79 } 78 }
80 sleep(2); 79 sleep(2);
81 } 80 }