Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6
正在显示
3 个修改的文件
包含
11 行增加
和
5 行删除
| @@ -126,14 +126,18 @@ class NoticeController extends BaseController | @@ -126,14 +126,18 @@ class NoticeController extends BaseController | ||
| 126 | return $this->error('other_domain参数必须为数组'); | 126 | return $this->error('other_domain参数必须为数组'); |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | - $origin_array = parse_url($origin_domain); | ||
| 130 | - $origin_domain = $origin_array['host'] ?? ''; | 129 | + if(strpos($origin_domain,'http') !== false){ |
| 130 | + $origin_array = parse_url($origin_domain); | ||
| 131 | + $origin_domain = $origin_array['host'] ?? ''; | ||
| 132 | + } | ||
| 131 | if (empty($origin_domain)) { | 133 | if (empty($origin_domain)) { |
| 132 | return $this->error('origin_domain参数不能为空'); | 134 | return $this->error('origin_domain参数不能为空'); |
| 133 | } | 135 | } |
| 134 | 136 | ||
| 135 | - $target_array = parse_url($target_domain); | ||
| 136 | - $target_domain = $target_array['host'] ?? ''; | 137 | + if(strpos($target_domain,'http') !== false){ |
| 138 | + $target_array = parse_url($target_domain); | ||
| 139 | + $target_domain = $target_array['host'] ?? ''; | ||
| 140 | + } | ||
| 137 | if (empty($target_domain)) { | 141 | if (empty($target_domain)) { |
| 138 | return $this->error('target_domain参数不能为空'); | 142 | return $this->error('target_domain参数不能为空'); |
| 139 | } | 143 | } |
| @@ -406,7 +406,7 @@ class ComController extends BaseController | @@ -406,7 +406,7 @@ class ComController extends BaseController | ||
| 406 | * @method :post | 406 | * @method :post |
| 407 | * @time :2024/10/28 11:51 | 407 | * @time :2024/10/28 11:51 |
| 408 | */ | 408 | */ |
| 409 | - public function month_count(){ | 409 | + public function month_counts(){ |
| 410 | Artisan::call('month_project '.$this->user['project_id']); | 410 | Artisan::call('month_project '.$this->user['project_id']); |
| 411 | $this->response('重新刷新中,请稍后刷新查询'); | 411 | $this->response('重新刷新中,请稍后刷新查询'); |
| 412 | } | 412 | } |
| @@ -21,6 +21,8 @@ Route::middleware(['bloginauth'])->group(function () { | @@ -21,6 +21,8 @@ Route::middleware(['bloginauth'])->group(function () { | ||
| 21 | Route::any('/getLink', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getLink'])->name('getLink'); | 21 | Route::any('/getLink', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getLink'])->name('getLink'); |
| 22 | Route::any('/getMobileProject', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getMobileProject'])->name('getMobileProject'); | 22 | Route::any('/getMobileProject', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getMobileProject'])->name('getMobileProject'); |
| 23 | Route::any('/getNoticeInfo', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getNoticeInfo'])->name('getNoticeInfo'); | 23 | Route::any('/getNoticeInfo', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getNoticeInfo'])->name('getNoticeInfo'); |
| 24 | + //重新校队流量统计 | ||
| 25 | + Route::any('/month_counts', [\App\Http\Controllers\Bside\BCom\ComController::class, 'month_counts'])->name('month_counts'); | ||
| 24 | //黑格数据 | 26 | //黑格数据 |
| 25 | Route::prefix('suppliers')->group(function () { | 27 | Route::prefix('suppliers')->group(function () { |
| 26 | Route::any('/recommendedPurchaser', [\App\Http\Controllers\Bside\Suppliers\SuppliersController::class, 'recommendedPurchaser'])->name('suppliers_recommendedPurchaser'); | 28 | Route::any('/recommendedPurchaser', [\App\Http\Controllers\Bside\Suppliers\SuppliersController::class, 'recommendedPurchaser'])->name('suppliers_recommendedPurchaser'); |
-
请 注册 或 登录 后发表评论