From ab4257bd6871b0c6d66faf755cab2b786b08f113 Mon Sep 17 00:00:00 2001 From: 0xtyz <616896861@qq.com> Date: Tue, 23 Nov 2021 10:58:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0pcurl=E5=92=8Ch5url?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/V2/OtherController.php | 4 ++++ app/Meedu/MeEdu.php | 2 +- app/Services/Base/Services/ConfigService.php | 10 ++++++++++ config/meedu.php | 6 ++++++ database/seeders/AppConfigSeeder.php | 19 +++++++++++++++++++ 5 files changed, 40 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/V2/OtherController.php b/app/Http/Controllers/Api/V2/OtherController.php index 76b8c1d1e..2f374c56c 100644 --- a/app/Http/Controllers/Api/V2/OtherController.php +++ b/app/Http/Controllers/Api/V2/OtherController.php @@ -34,6 +34,8 @@ public function __construct(ConfigServiceInterface $configService) * @apiSuccess {Object} data 数据 * @apiSuccess {String} data.webname 网站名 * @apiSuccess {String} data.url 网站地址 + * @apiSuccess {String} data.pc_url PC网站地址 + * @apiSuccess {String} data.h5_url H5网站地址 * @apiSuccess {String} data.icp ICP备案号 * @apiSuccess {String} data.user_protocol 用户协议URL * @apiSuccess {String} data.user_private_protocol 用户隐私协议URL @@ -65,6 +67,8 @@ public function config(Addons $addons) 'webname' => $this->configService->getName(), // 网站地址 'url' => trim($this->configService->getUrl(), '/'), + 'pc_url' => trim($this->configService->getPcUrl(), '/'), + 'h5_url' => trim($this->configService->getH5Url(), '/'), // ICP备案 'icp' => $this->configService->getIcp(), 'icp_link' => $this->configService->getIcpLink(), diff --git a/app/Meedu/MeEdu.php b/app/Meedu/MeEdu.php index b29d6570b..bfed4614c 100644 --- a/app/Meedu/MeEdu.php +++ b/app/Meedu/MeEdu.php @@ -10,5 +10,5 @@ class MeEdu { - const VERSION = 'v4.5'; + const VERSION = 'v4.5.1'; } diff --git a/app/Services/Base/Services/ConfigService.php b/app/Services/Base/Services/ConfigService.php index c575cd1d6..156c61d88 100644 --- a/app/Services/Base/Services/ConfigService.php +++ b/app/Services/Base/Services/ConfigService.php @@ -532,4 +532,14 @@ public function getTencentSms(): array { return config('sms.gateways.tencent'); } + + public function getPcUrl(): string + { + return config('meedu.system.pc_url'); + } + + public function getH5Url(): string + { + return config('meedu.system.h5_url'); + } } diff --git a/config/meedu.php b/config/meedu.php index 8ec02d332..43b7f36f5 100644 --- a/config/meedu.php +++ b/config/meedu.php @@ -182,6 +182,12 @@ // 播放器封面 'player_thumb' => '/images/player-thumb.png', + // PC网站地址 + 'pc_url' => '', + + // H5网站地址 + 'h5_url' => '', + // 播放器 'player' => [ // 跑马灯 diff --git a/database/seeders/AppConfigSeeder.php b/database/seeders/AppConfigSeeder.php index 47933e4c4..8f576615d 100644 --- a/database/seeders/AppConfigSeeder.php +++ b/database/seeders/AppConfigSeeder.php @@ -42,6 +42,25 @@ public function run() 'default_value' => '', 'key' => 'app.url', 'value' => '', + 'help' => '请填写API服务访问地址', + ], + [ + 'group' => '系统', + 'name' => 'PC网站地址', + 'field_type' => 'text', + 'sort' => 1, + 'default_value' => '', + 'key' => 'meedu.system.pc_url', + 'value' => '', + ], + [ + 'group' => '系统', + 'name' => 'H5网站地址', + 'field_type' => 'text', + 'sort' => 1, + 'default_value' => '', + 'key' => 'meedu.system.h5_url', + 'value' => '', ], [ 'group' => '系统', From b5ad025e1559936d0316ae37e95931fbd7ae9529 Mon Sep 17 00:00:00 2001 From: 0xtyz <616896861@qq.com> Date: Thu, 9 Dec 2021 14:00:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?added:=20=E8=85=BE=E8=AE=AF=E4=BA=91?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E8=A7=86=E9=A2=91=E6=A0=BC=E5=BC=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/Base/Services/ConfigService.php | 5 +++-- app/helper.php | 6 ++---- config/tencent.php | 2 +- database/seeders/AppConfigSeeder.php | 9 +++++++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/Services/Base/Services/ConfigService.php b/app/Services/Base/Services/ConfigService.php index 156c61d88..73f08ce79 100644 --- a/app/Services/Base/Services/ConfigService.php +++ b/app/Services/Base/Services/ConfigService.php @@ -523,9 +523,10 @@ public function getUrl(): string return config('app.url'); } - public function getTencentVodTranscodeFormat(): string + public function getTencentVodTranscodeFormat(): array { - return config('tencent.vod.transcode_format', ''); + $format = strtolower(config('tencent.vod.transcode_format', '')); + return $format ? explode(',', $format) : []; } public function getTencentSms(): array diff --git a/app/helper.php b/app/helper.php index ebe526738..a77999a4b 100644 --- a/app/helper.php +++ b/app/helper.php @@ -391,13 +391,11 @@ function get_tencent_play_url(string $vid): array if ($response->MediaInfoSet[0]->TranscodeInfo) { // 配置了转码信息 $urls = []; + $supportFormat = $configService->getTencentVodTranscodeFormat(); foreach ($response->MediaInfoSet[0]->TranscodeInfo->TranscodeSet as $item) { $url = $item->Url; $format = strtolower(pathinfo($url, PATHINFO_EXTENSION)); - if ( - $configService->getTencentVodTranscodeFormat() && - $format !== $configService->getTencentVodTranscodeFormat() - ) { + if ($supportFormat && !in_array($format, $supportFormat)) { // 限定转码格式，只能使用一种 continue; } diff --git a/config/tencent.php b/config/tencent.php index 4ef807332..ed421623e 100644 --- a/config/tencent.php +++ b/config/tencent.php @@ -11,7 +11,7 @@ 'app_id' => '', 'secret_id' => '', 'secret_key' => '', - 'transcode_format' => env('TENCENT_VOD_TRANSCODE_FORMAT', 'm3u8'), + 'transcode_format' => '', ], 'wechat' => [ 'mini' => [ diff --git a/database/seeders/AppConfigSeeder.php b/database/seeders/AppConfigSeeder.php index 8f576615d..7220bf801 100644 --- a/database/seeders/AppConfigSeeder.php +++ b/database/seeders/AppConfigSeeder.php @@ -770,6 +770,15 @@ public function run() 'value' => '', 'is_private' => 1, ], + [ + 'group' => '视频', + 'name' => '腾讯云播放格式', + 'field_type' => 'text', + 'sort' => 10, + 'key' => 'tencent.vod.transcode_format', + 'value' => '', + 'help' => '默认支持所有格式，如果配置mp4则只支持mp4，多个请用英文逗号连接', + ], // 会员配置 [