李帅

1.优化脚本和readme

......@@ -5,12 +5,20 @@
- git clone && cd OnePoem-Server
- cp .env.example .env
- vim .env 修改db链接
- php artisan key:generate
- composer install
- php artisan key:generate
- php artisan storage:link
- php artisan admin:publish
- php artisan admin:install
- chmod -R 777 storage/logs
- chmod -R 777 storage/framework
- chmod -R 777 storage/app/public
## 禁用函数移除
- symlink
- pron_open
- exec
## todo
......
......@@ -494,6 +494,7 @@ class UserMakeImmerse implements ShouldQueue
foreach ($components as $component) {
switch ($component->name){
case 'every_poem':
case 'one_poem':
$content = $this->immerse->poem->content;
$text_file = Storage::disk('public')->path($this->getTempPath('.txt'));
......@@ -510,13 +511,10 @@ class UserMakeImmerse implements ShouldQueue
'fontcolor=' . $text_color . '@1.0:' .
'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
case 'every_poem':
break;
case 'weather':
$content = '多云';
$text_color = $component->text_color ?? 'white';
......@@ -530,8 +528,7 @@ class UserMakeImmerse implements ShouldQueue
'fontcolor=' . $text_color . '@1.0:' .
'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
......@@ -548,8 +545,7 @@ class UserMakeImmerse implements ShouldQueue
'fontcolor=' . $text_color . '@1.0:' .
'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
case 'feel':
......@@ -565,8 +561,7 @@ class UserMakeImmerse implements ShouldQueue
'fontcolor=' . $text_color . '@1.0:' .
'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项
'box=1:' .
'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
break;
}
......