周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 3b71ea6622c17bb8706bce0aa5f5871c5f13cc5a 2 个父辈 74114814 5de5de40

合并分支 'lyh-server' 到 'master' 

Lyh server



查看合并请求 !1459
内嵌 并排对比
正在显示 2 个修改的文件 包含 2 行增加 和 2 行删除
@@ -54,7 +54,7 @@ class LyhImportTest extends Command @@ -54,7 +54,7 @@ class LyhImportTest extends Command
54 public function handle(){ 54 public function handle(){
55 ProjectServer::useProject(2837); 55 ProjectServer::useProject(2837);
56 echo date('Y-m-d H:i:s') . 'start' . PHP_EOL; 56 echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
57 - $this->importCustomModule('https://ecdn6.globalso.com/upload/p/2837/file/2025-03/xindaxing-s-product-screening.csv',2837); 57 + $this->importCustomModule('https://ecdn6.globalso.com/upload/p/2837/file/2025-03/2.csv',2837);
58 DB::disconnect('custom_mysql'); 58 DB::disconnect('custom_mysql');
59 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; 59 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
60 } 60 }
@@ -79,7 +79,7 @@ class ProjectLogic extends BaseLogic @@ -79,7 +79,7 @@ class ProjectLogic extends BaseLogic
79 */ 79 */
80 public function getProjectInfo($id){ 80 public function getProjectInfo($id){
81 $info = $this->model->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check', 81 $info = $this->model->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check',
82 - 'project_after','inquiry_filter_config','web_traffic_config','project_keyword'])->where(['id'=>$id])->first()->toArray(); 82 + 'project_after','inquiry_filter_config','web_traffic_config','project_keyword'])->where(['id'=>$id])->first();
83 $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0); 83 $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
84 $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain']; 84 $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
85 if($info['extend_type'] != 0){ 85 if($info['extend_type'] != 0){