周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 cb9189480207b3bc9b22d21e246d7e18d7aad007 2 个父辈 a5b5d31b 670bfbbc

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

内嵌 并排对比
正在显示 6 个修改的文件 包含 46 行增加 和 41 行删除
... ... @@ -37,7 +37,7 @@ class Temp extends Command
* @author Akun
* @date 2024/11/18 15:07
*/
public function handle()
public function handle5()
{
$projects = Project::select(['id'])->orderBy('id', 'asc')->get();
foreach ($projects as $project) {
... ... @@ -236,7 +236,7 @@ class Temp extends Command
* @author Akun
* @date 2024/09/26 10:48
*/
public function handle1()
public function handle()
{
$notify_model = new Notify();
$project_model = new Project();
... ... @@ -254,10 +254,12 @@ class Temp extends Command
$project_info = $project_model->read(['id' => $project_id], ['serve_id']);
if (!$project_info) {
$this->output('未查询到项目数据');
continue;
}
$serve_ip_info = $serve_ip_model->read(['id' => $project_info['serve_id']], ['servers_id']);
if (!$serve_ip_info) {
$this->output('未查询到服务器数据');
continue;
}
$servers_id = $serve_ip_info['servers_id'];
... ... @@ -300,6 +302,6 @@ class Temp extends Command
public function output($msg)
{
echo $msg . PHP_EOL;
echo date('Y-m-d H:i:s') . ' | ' . $msg . PHP_EOL;
}
}
... ...
... ... @@ -106,11 +106,11 @@ class HtmlCustomCollect extends Command
// 'https://www.citymax-group.com/case/field-experiment-crop-lettuce/',
// ];
$project_id = 626;
$project_site = 'v6-m342g.globalso.site';
$pages = [
'https://a574.goodao.net/project_catalog/project/',
'https://a574.goodao.net/project_catalog/project/page/2/',
// $project_id = 626;
// $project_site = 'v6-m342g.globalso.site';
// $pages = [
// 'https://a574.goodao.net/project_catalog/project/',
// 'https://a574.goodao.net/project_catalog/project/page/2/',
// 'https://www.lecusostreetlight.com/project/560pcs-250w-smart-led-street-light-in-manila-city-philippines/',
// 'https://www.lecusostreetlight.com/project/3200pcs-8m-150w-solar-street-light-in-cebu-philippines/',
// 'https://lecusostreetlight.com/project/170pcs-100w-split-lithium-battery-solar-street-light-in-tanzania/',
... ... @@ -134,7 +134,7 @@ class HtmlCustomCollect extends Command
// 'https://www.lecusostreetlight.com/project/198pcs-8m-80w-zc-series-all-in-two-solar-light-in-philippines/',
// 'https://www.lecusostreetlight.com/project/5m-30w-morden-led-garden-light-in-russian/',
// 'https://www.lecusostreetlight.com/project/135pcs-all-in-one-solar-street-light-in-uae-dubai-park/'
];
// ];
// $project_id = 633;
// $project_site = 'v6-ke5nz.globalso.site';
... ... @@ -175,6 +175,19 @@ class HtmlCustomCollect extends Command
// 'https://www.mach-sales.com/case/cooperation-win-win-and-starting-anew-sumec-creates-a-new-sample-of-strong-enterprise-cooperation/'
// ];
$project_id = 549;
$project_site = 'v6-myz64.globalso.site';
$pages = [
'https://sryled.goodao.net/event-staging/page/2/',
'https://sryled.goodao.net/event-staging/page/3/',
'https://sryled.goodao.net/event-staging/page/4/',
'https://sryled.goodao.net/advertising-3/page/2/',
'https://sryled.goodao.net/advertising-3/page/3/',
'https://sryled.goodao.net/advertising-3/page/4/',
'https://sryled.goodao.net/indoor/page/2/',
'https://sryled.goodao.net/indoor/page/3/',
];
foreach ($pages as $page) {
$this->start_collect(urldecode($page), $project_id, $project_site);
}
... ... @@ -314,6 +327,14 @@ class HtmlCustomCollect extends Command
$source[] = $check_vv2;
}
}
preg_match_all('/<iframe\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_video_3);
$video_3 = $result_video_3[2] ?? [];
foreach ($video_3 as $vv3) {
$check_vv3 = $this->url_check($vv3, $project_id, $domain, $web_url_domain, $home_url);
if ($check_vv3 && (!in_array($check_vv3, $source))) {
$source[] = $check_vv3;
}
}
//css
preg_match_all('/<link\s+[^>]*?href\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_css);
... ... @@ -401,7 +422,12 @@ class HtmlCustomCollect extends Command
foreach ($source as $vs) {
if ($vs['download']) {
$new_source = CosService::uploadRemote($project_id, 'source', $vs['url_complete']);
if (in_array(substr($vs['url_complete'], -3), ['pdf', 'zip', 'rar', '.gz'])) {
//可下载类资源要保持原名称
$new_source = CosService::uploadRemote($project_id, 'source', $vs['url_complete'], '', '', 1);
} else {
$new_source = CosService::uploadRemote($project_id, 'source', $vs['url_complete']);
}
if ($new_source) {
CollectSource::insert([
'project_id' => $project_id,
... ...
... ... @@ -230,7 +230,7 @@ class AdsController extends BaseController
public function fbInquiryChart(Request $request)
{
$start_date = $request->input('start_date', date('Y-m-d', strtotime('-1 month')));
$end_date = $request->input('end', date('Y-m-d'));
$end_date = $request->input('end_date', date('Y-m-d'));
$result = ReInquiryForm::select(DB::raw('DATE(inquiry_date) as date'), DB::raw('COUNT(*) as count'))
->whereBetween('inquiry_date', [$start_date, date('Y-m-d', strtotime($end_date . ' +1 day'))])
->groupBy(DB::raw('DATE(inquiry_date)'))
... ...
... ... @@ -69,13 +69,11 @@ class EmailController extends BaseController
public function set_smtp(Smtp $smtp)
{
$this->request->validate([
'project_id' => ['required'],
'email' => ['required', 'email', 'max:200'],
'password' => ['required', 'max:200'],
'host' => ['required', 'max:200', 'regex:/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+\.?/'],
'from_name' => ['required', 'max:200'],
], [
'project_id.required' => '参数异常',
'email.required' => '邮箱必须',
'email.email' => '邮箱格式错误',
'password.required' => '授权码/密码必须',
... ... @@ -83,7 +81,7 @@ class EmailController extends BaseController
'host.regex' => 'smtp格式错误',
'from_name.required' => '发信人昵称必须',
]);
$info = $smtp->read(['project_id' => $this->param['project_id']]);
$info = $smtp->read(['project_id' => $this->project['id']]);
if (!$info) {
$smtp->add($this->param);
} else {
... ... @@ -92,6 +90,11 @@ class EmailController extends BaseController
$this->response('success');
}
public function get_smtp(Smtp $smtp){
$info = $smtp->read(['project_id' => $this->project['id']]);
$this->response($info);
}
public function group_send(GroupSendTask $groupSendTask)
{
$this->request->validate([
... ...
... ... @@ -53,33 +53,6 @@ class QueryListener
$log = $log.' [ RunTime:'.$event->time.'ms ] ';
Log::debug($log);
}
//监听api_no是TM咋个被改的
if (Str::contains($event->sql, 'update') && Str::contains($event->sql, '`api_no` =')) {
//记录debug 根据这个溯源
$trace = debug_backtrace();
$traces = [];
foreach ($trace as $index => $caller) {
if ($index === 0) {
continue; // 跳过当前方法的调用信息
}
$file = $caller['file'];
$line = $caller['line'];
$class = $caller['class'];
$method = $caller['function'];
$traces[] = "Method $method called from $class in file $file at line $line\n";
}
//用户信息 哪个改的 还是脚本跑的
$token = request()->header('token');
Log::channel('test')->info('api_no updated', [
'sql' => $event->sql,
'bindings' => $event->bindings,
'route' => Route::current(),
'request' => request()->all(),
'a_info' => Cache::get(Common::MANAGE_TOKEN . $token),
'b_info' => Cache::get($token),
'trace' => $traces
]);
}
}catch (\Exception $exception){
Log::error('log sql error:'.$exception->getMessage());
}
... ...
... ... @@ -633,6 +633,7 @@ Route::middleware(['bloginauth'])->group(function () {
Route::any('/del', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'delete'])->name('subscribe_email_del');
Route::any('/export', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'export'])->name('subscribe_email_export');
Route::any('/set_smtp', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'set_smtp'])->name('subscribe_email_set_smtp');
Route::any('/get_smtp', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'get_smtp'])->name('subscribe_email_get_smtp');
Route::any('/group_send', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'group_send'])->name('subscribe_email_group_send');
});
... ...