周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 31db02a055c4424d37481ea773a129637c43aa13 1 个父辈 5f61650a

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 29 行增加 和 13 行删除
@@ -61,9 +61,9 @@ class SyncInquiryProject extends Command @@ -61,9 +61,9 @@ class SyncInquiryProject extends Command
61 */ 61 */
62 public function handle() 62 public function handle()
63 { 63 {
64 - echo '开始同步v5' . PHP_EOL; 64 + $this->output('开始同步v5');
65 $this->syncGloV5(); 65 $this->syncGloV5();
66 - echo '开始同步v6' . PHP_EOL; 66 + $this->output('开始同步v6');
67 $this->syncGloV6(); 67 $this->syncGloV6();
68 return true; 68 return true;
69 } 69 }
@@ -80,7 +80,7 @@ class SyncInquiryProject extends Command @@ -80,7 +80,7 @@ class SyncInquiryProject extends Command
80 $channel = Channel::pluck('contact_mobile', 'id')->toArray(); 80 $channel = Channel::pluck('contact_mobile', 'id')->toArray();
81 $form_api = new FormGlobalsoApi(); 81 $form_api = new FormGlobalsoApi();
82 foreach ($result as $key => $val) { 82 foreach ($result as $key => $val) {
83 - echo '同步项目：' . $val['postid'] . ' - ' . $val['company'] . PHP_EOL; 83 + $this->output('同步项目：' . $val['postid'] . ' - ' . $val['company']);
84 // 记录渠道商, 如果渠道有问题， 记录日志， 跳过当前项目， 处理数据后， 第二天再重新同步 84 // 记录渠道商, 如果渠道有问题， 记录日志， 跳过当前项目， 处理数据后， 第二天再重新同步
85 $channel_tmp = []; 85 $channel_tmp = [];
86 foreach ($val['agent'] as $v) { 86 foreach ($val['agent'] as $v) {
@@ -119,7 +119,7 @@ class SyncInquiryProject extends Command @@ -119,7 +119,7 @@ class SyncInquiryProject extends Command
119 $this->pushTask($project->id); 119 $this->pushTask($project->id);
120 } catch (\Exception $e) { 120 } catch (\Exception $e) {
121 $this->log('syncGloV5Route 未获取到路由信息：' . $project->id . ', 路由获取地址：' . $route_domain . 'k_u_api.php' . ', 错误信息：' . $e->getMessage()); 121 $this->log('syncGloV5Route 未获取到路由信息：' . $project->id . ', 路由获取地址：' . $route_domain . 'k_u_api.php' . ', 错误信息：' . $e->getMessage());
122 - echo 'syncGloV5Route 未获取到路由信息：' . $project->id . ', 路由获取地址：' . $route_domain . 'k_u_api.php' . ', 错误信息：' . $e->getMessage() . PHP_EOL; 122 + $this->output('syncGloV5Route 未获取到路由信息：' . $project->id . ', 路由获取地址：' . $route_domain . 'k_u_api.php' . ', 错误信息：' . $e->getMessage());
123 continue; 123 continue;
124 } 124 }
125 } 125 }
@@ -151,14 +151,19 @@ class SyncInquiryProject extends Command @@ -151,14 +151,19 @@ class SyncInquiryProject extends Command
151 $domains = DomainInfo::whereIn('project_id', $project->pluck('id')->toArray())->pluck('domain', 'project_id')->toArray(); 151 $domains = DomainInfo::whereIn('project_id', $project->pluck('id')->toArray())->pluck('domain', 'project_id')->toArray();
152 $form_api = new FormGlobalsoApi(); 152 $form_api = new FormGlobalsoApi();
153 foreach ($project as $key => $val) { 153 foreach ($project as $key => $val) {
154 - echo '同步项目：' . $val->id . ' - ' . $val->title . PHP_EOL; 154 + $this->output('同步项目：' . $val->id . ' - ' . $val->title);
155 // 过滤暂停优化项目, 映射类型2， model没有定义常量 155 // 过滤暂停优化项目, 映射类型2， model没有定义常量
156 if (in_array(2, $val->level)) 156 if (in_array(2, $val->level))
157 continue; 157 continue;
158 158
  159 + $domain = $domains[$val->id] ?? '';
  160 + if(!$domain){
  161 + continue;
  162 + }
  163 +
159 //判断项目7天之内是否有询盘 164 //判断项目7天之内是否有询盘
160 $recent_inquiry = 0; 165 $recent_inquiry = 0;
161 - $inquiry_list = $form_api->getInquiryList('https://' . $domains[$val->id] . '/', $val->is_upgrade); 166 + $inquiry_list = $form_api->getInquiryList('https://' . $domain . '/', $val->is_upgrade);
162 $last_inquiry_time = $inquiry_list['data']['data'][0]['submit_time'] ?? ''; 167 $last_inquiry_time = $inquiry_list['data']['data'][0]['submit_time'] ?? '';
163 if ($last_inquiry_time > $last_week_time) { 168 if ($last_inquiry_time > $last_week_time) {
164 $recent_inquiry = 1; 169 $recent_inquiry = 1;
@@ -172,7 +177,7 @@ class SyncInquiryProject extends Command @@ -172,7 +177,7 @@ class SyncInquiryProject extends Command
172 DB::disconnect('custom_mysql'); 177 DB::disconnect('custom_mysql');
173 } 178 }
174 179
175 - $project = InquiryProject::saveProject($date, InquiryProject::VERSION_SIX, $val->id, $val->title, $val->channel['channel_id'], 'https://' . $domains[$val->id] . '/', $recent_inquiry); 180 + $project = InquiryProject::saveProject($date, InquiryProject::VERSION_SIX, $val->id, $val->title, $val->channel['channel_id'], 'https://' . $domain . '/', $recent_inquiry);
176 $this->pushTask($project->id); 181 $this->pushTask($project->id);
177 } 182 }
178 183
@@ -220,4 +225,9 @@ class SyncInquiryProject extends Command @@ -220,4 +225,9 @@ class SyncInquiryProject extends Command
220 file_put_contents(storage_path('logs/zhl/output') . date('Y-m-d') . '.log', $message, FILE_APPEND); 225 file_put_contents(storage_path('logs/zhl/output') . date('Y-m-d') . '.log', $message, FILE_APPEND);
221 return true; 226 return true;
222 } 227 }
  228 +
  229 + public function output($message)
  230 + {
  231 + echo date('Y-m-d H:i:s') . ' | ' . $message . PHP_EOL;
  232 + }
223 } 233 }
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 * Date: 2025/2/18 5 * Date: 2025/2/18
6 * Time: 17:10 6 * Time: 17:10
7 */ 7 */
  8 +
8 namespace App\Console\Commands\Inquiry; 9 namespace App\Console\Commands\Inquiry;
9 10
10 use App\Models\Channel\Channel; 11 use App\Models\Channel\Channel;
@@ -70,7 +71,8 @@ class SyncInquiryProjectRoute extends Command @@ -70,7 +71,8 @@ class SyncInquiryProjectRoute extends Command
70 continue; 71 continue;
71 72
72 // 同步对应项目路由， 以及删除过期路由 73 // 同步对应项目路由， 以及删除过期路由
73 - if ($task->version == InquiryProject::VERSION_SIX){ 74 + $this->output('同步项目ID：' . $sync_id);
  75 + if ($task->version == InquiryProject::VERSION_SIX) {
74 $this->syncGloV6Route($task); 76 $this->syncGloV6Route($task);
75 } else { 77 } else {
76 $this->syncGloV5Route($task); 78 $this->syncGloV5Route($task);
@@ -98,7 +100,7 @@ class SyncInquiryProjectRoute extends Command @@ -98,7 +100,7 @@ class SyncInquiryProjectRoute extends Command
98 return false; 100 return false;
99 } 101 }
100 102
101 - foreach ($result as $key=>$val) { 103 + foreach ($result as $key => $val) {
102 try { 104 try {
103 $tmp = explode('|', $val); 105 $tmp = explode('|', $val);
104 $url_tmp = parse_url($tmp[0]); 106 $url_tmp = parse_url($tmp[0]);
@@ -111,7 +113,7 @@ class SyncInquiryProjectRoute extends Command @@ -111,7 +113,7 @@ class SyncInquiryProjectRoute extends Command
111 InquiryProjectRoute::saveProjectRoute($task->id, $title, $route, $date); 113 InquiryProjectRoute::saveProjectRoute($task->id, $title, $route, $date);
112 } catch (\Exception $e) { 114 } catch (\Exception $e) {
113 $this->log('syncGloV5Route 解析路径：' . $val . ', 错误信息：' . $e->getMessage()); 115 $this->log('syncGloV5Route 解析路径：' . $val . ', 错误信息：' . $e->getMessage());
114 - echo 'syncGloV5Route 解析路径：' . $val . ', 错误信息：' . $e->getMessage() . PHP_EOL; 116 + $this->output('syncGloV5Route 解析路径：' . $val . ', 错误信息：' . $e->getMessage());
115 } 117 }
116 } 118 }
117 119
@@ -127,12 +129,11 @@ class SyncInquiryProjectRoute extends Command @@ -127,12 +129,11 @@ class SyncInquiryProjectRoute extends Command
127 */ 129 */
128 public function syncGloV6Route($task) 130 public function syncGloV6Route($task)
129 { 131 {
130 - echo '同步项目ID：' . $task->id . PHP_EOL;  
131 $date = intval(date('Ymd')); 132 $date = intval(date('Ymd'));
132 ProjectServer::useProject($task->primary_id); 133 ProjectServer::useProject($task->primary_id);
133 // 产品分类标题、路由， 产品标题、路由， 同步到路由表 134 // 产品分类标题、路由， 产品标题、路由， 同步到路由表
134 $category = Category::where('status', Category::STATUS_ACTIVE)->get(['title', 'route']); 135 $category = Category::where('status', Category::STATUS_ACTIVE)->get(['title', 'route']);
135 - foreach ($category as $key=>$val) { 136 + foreach ($category as $key => $val) {
136 InquiryProjectRoute::saveProjectRoute($task->id, $val->title, $val->route, $date); 137 InquiryProjectRoute::saveProjectRoute($task->id, $val->title, $val->route, $date);
137 } 138 }
138 139
@@ -143,7 +144,7 @@ class SyncInquiryProjectRoute extends Command @@ -143,7 +144,7 @@ class SyncInquiryProjectRoute extends Command
143 if ($product->isEmpty()) 144 if ($product->isEmpty())
144 break; 145 break;
145 146
146 - foreach ($product as $key=>$val) { 147 + foreach ($product as $key => $val) {
147 $id = $val->id; 148 $id = $val->id;
148 InquiryProjectRoute::saveProjectRoute($task->id, $val->title, $val->route, $date); 149 InquiryProjectRoute::saveProjectRoute($task->id, $val->title, $val->route, $date);
149 } 150 }
@@ -181,4 +182,9 @@ class SyncInquiryProjectRoute extends Command @@ -181,4 +182,9 @@ class SyncInquiryProjectRoute extends Command
181 file_put_contents(storage_path('logs/zhl/output') . date('Y-m-d') . '.log', $message, FILE_APPEND); 182 file_put_contents(storage_path('logs/zhl/output') . date('Y-m-d') . '.log', $message, FILE_APPEND);
182 return true; 183 return true;
183 } 184 }
  185 +
  186 + public function output($message)
  187 + {
  188 + echo date('Y-m-d H:i:s') . ' | ' . $message . PHP_EOL;
  189 + }
184 } 190 }