OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
4a1a5f4e 1 parent 8a98a0c7

1.优化脚本和readme

Inline Side-by-side
Showing 2 changed files with 14 additions and 11 deletions
...@@ -5,12 +5,20 @@ ...@@ -5,12 +5,20 @@
5 - git clone && cd OnePoem-Server 5 - git clone && cd OnePoem-Server
6 - cp .env.example .env 6 - cp .env.example .env
7 - vim .env 修改db链接 7 - vim .env 修改db链接
8 -- php artisan key:generate
9 - composer install 8 - composer install
9 +- php artisan key:generate
10 +- php artisan storage:link
10 - php artisan admin:publish 11 - php artisan admin:publish
11 - php artisan admin:install 12 - php artisan admin:install
12 13
14 +- chmod -R 777 storage/logs
15 +- chmod -R 777 storage/framework
16 +- chmod -R 777 storage/app/public
13 17
18 +## 禁用函数移除
19 +- symlink
20 +- pron_open
21 +- exec
14 22
15 ## todo 23 ## todo
16 24
......
...@@ -494,6 +494,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -494,6 +494,7 @@ class UserMakeImmerse implements ShouldQueue
494 494
495 foreach ($components as $component) { 495 foreach ($components as $component) {
496 switch ($component->name){ 496 switch ($component->name){
497 + case 'every_poem':
497 case 'one_poem': 498 case 'one_poem':
498 $content = $this->immerse->poem->content; 499 $content = $this->immerse->poem->content;
499 $text_file = Storage::disk('public')->path($this->getTempPath('.txt')); 500 $text_file = Storage::disk('public')->path($this->getTempPath('.txt'));
...@@ -510,13 +511,10 @@ class UserMakeImmerse implements ShouldQueue ...@@ -510,13 +511,10 @@ class UserMakeImmerse implements ShouldQueue
510 'fontcolor=' . $text_color . '@1.0:' . 511 'fontcolor=' . $text_color . '@1.0:' .
511 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 512 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
512 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 513 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
513 -// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项 514 + 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
514 - 'box=1:' .
515 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 515 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
516 516
517 break; 517 break;
518 - case 'every_poem':
519 - break;
520 case 'weather': 518 case 'weather':
521 $content = '多云'; 519 $content = '多云';
522 $text_color = $component->text_color ?? 'white'; 520 $text_color = $component->text_color ?? 'white';
...@@ -530,8 +528,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -530,8 +528,7 @@ class UserMakeImmerse implements ShouldQueue
530 'fontcolor=' . $text_color . '@1.0:' . 528 'fontcolor=' . $text_color . '@1.0:' .
531 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 529 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
532 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 530 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
533 -// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项 531 + 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
534 - 'box=1:' .
535 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 532 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
536 533
537 break; 534 break;
...@@ -548,8 +545,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -548,8 +545,7 @@ class UserMakeImmerse implements ShouldQueue
548 'fontcolor=' . $text_color . '@1.0:' . 545 'fontcolor=' . $text_color . '@1.0:' .
549 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 546 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
550 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 547 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
551 -// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项 548 + 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
552 - 'box=1:' .
553 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 549 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
554 break; 550 break;
555 case 'feel': 551 case 'feel':
...@@ -565,8 +561,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -565,8 +561,7 @@ class UserMakeImmerse implements ShouldQueue
565 'fontcolor=' . $text_color . '@1.0:' . 561 'fontcolor=' . $text_color . '@1.0:' .
566 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 562 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
567 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' . 563 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1]) . ':' .
568 -// 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' . //todo 10号机不支持此选项 564 + 'box=1:boxborderw='. $this->calcBorderSize($component->font_size) . ':' .
569 - 'box=1:' .
570 'boxcolor=' . $text_bg_color . '@' . $opacity . '", '; 565 'boxcolor=' . $text_bg_color . '@' . $opacity . '", ';
571 break; 566 break;
572 } 567 }
......