OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
f4beb6e4 1 parent 253d8c80

1.修复一些bug

Inline Side-by-side
Showing 2 changed files with 10 additions and 10 deletions
...@@ -312,11 +312,11 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -312,11 +312,11 @@ class AdminMakeImmerse implements ShouldQueue
312 '", '; 312 '", ';
313 }elseif($content['tag'] == 'source'){ 313 }elseif($content['tag'] == 'source'){
314 $arr = explode("\n", $content['text']); 314 $arr = explode("\n", $content['text']);
315 - $title = $arr[0] ?? " "; 315 + $verse = $arr[0] ?? " ";
316 - $author = $arr[1] ?? " "; 316 + $source = $arr[1] ?? " ";
317 //诗句 317 //诗句
318 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text')); 318 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
319 - file_put_contents($text_file, $title); 319 + file_put_contents($text_file, $verse);
320 $sub_text .= 'drawtext="'. 320 $sub_text .= 'drawtext="'.
321 'fontfile=' . escapeshellarg($font_file) . ':' . 321 'fontfile=' . escapeshellarg($font_file) . ':' .
322 'textfile=' . escapeshellarg($text_file) . ':' . 322 'textfile=' . escapeshellarg($text_file) . ':' .
...@@ -327,7 +327,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -327,7 +327,7 @@ class AdminMakeImmerse implements ShouldQueue
327 '", '; 327 '", ';
328 // 出处 328 // 出处
329 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text')); 329 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
330 - file_put_contents($text_file, $author); 330 + file_put_contents($text_file, $source);
331 $sub_text .= 'drawtext="'. 331 $sub_text .= 'drawtext="'.
332 'fontfile=' . escapeshellarg($font_file) . ':' . 332 'fontfile=' . escapeshellarg($font_file) . ':' .
333 'textfile=' . escapeshellarg($text_file) . ':' . 333 'textfile=' . escapeshellarg($text_file) . ':' .
...@@ -338,7 +338,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -338,7 +338,7 @@ class AdminMakeImmerse implements ShouldQueue
338 '", '; 338 '", ';
339 }else{ 339 }else{
340 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text')); 340 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
341 - file_put_contents($text_file, $content); 341 + file_put_contents($text_file, $content['text']);
342 $sub_text .= 'drawtext="'. 342 $sub_text .= 'drawtext="'.
343 'fontfile=' . escapeshellarg($font_file) . ':' . 343 'fontfile=' . escapeshellarg($font_file) . ':' .
344 'textfile=' . escapeshellarg($text_file) . ':' . 344 'textfile=' . escapeshellarg($text_file) . ':' .
......
...@@ -607,11 +607,11 @@ class UserMakeImmerse implements ShouldQueue ...@@ -607,11 +607,11 @@ class UserMakeImmerse implements ShouldQueue
607 '", '; 607 '", ';
608 }elseif($content['tag'] == 'source'){ 608 }elseif($content['tag'] == 'source'){
609 $arr = explode("\n", $content['text']); 609 $arr = explode("\n", $content['text']);
610 - $title = $arr[0] ?? " "; 610 + $verse = $arr[0] ?? " ";
611 - $author = $arr[1] ?? " "; 611 + $source = $arr[1] ?? " ";
612 //诗句 612 //诗句
613 $text_file = Storage::disk('public')->path($this->getTempPath('.txt','text')); 613 $text_file = Storage::disk('public')->path($this->getTempPath('.txt','text'));
614 - file_put_contents($text_file, $title); 614 + file_put_contents($text_file, $verse);
615 $sub_text .= 'drawtext="'. 615 $sub_text .= 'drawtext="'.
616 'fontfile=' . escapeshellarg($font_file) . ':' . 616 'fontfile=' . escapeshellarg($font_file) . ':' .
617 'textfile=' . escapeshellarg($text_file) . ':' . 617 'textfile=' . escapeshellarg($text_file) . ':' .
...@@ -622,7 +622,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -622,7 +622,7 @@ class UserMakeImmerse implements ShouldQueue
622 '", '; 622 '", ';
623 // 出处 623 // 出处
624 $text_file = Storage::disk('public')->path($this->getTempPath('.txt','text')); 624 $text_file = Storage::disk('public')->path($this->getTempPath('.txt','text'));
625 - file_put_contents($text_file, $author); 625 + file_put_contents($text_file, $source);
626 $sub_text .= 'drawtext="'. 626 $sub_text .= 'drawtext="'.
627 'fontfile=' . escapeshellarg($font_file) . ':' . 627 'fontfile=' . escapeshellarg($font_file) . ':' .
628 'textfile=' . escapeshellarg($text_file) . ':' . 628 'textfile=' . escapeshellarg($text_file) . ':' .
...@@ -633,7 +633,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -633,7 +633,7 @@ class UserMakeImmerse implements ShouldQueue
633 '", '; 633 '", ';
634 }else{ 634 }else{
635 $text_file = Storage::disk('public')->path($this->getTempPath('.txt','text')); 635 $text_file = Storage::disk('public')->path($this->getTempPath('.txt','text'));
636 - file_put_contents($text_file, $content); 636 + file_put_contents($text_file, $content['text']);
637 $sub_text .= 'drawtext="'. 637 $sub_text .= 'drawtext="'.
638 'fontfile=' . escapeshellarg($font_file) . ':' . 638 'fontfile=' . escapeshellarg($font_file) . ':' .
639 'textfile=' . escapeshellarg($text_file) . ':' . 639 'textfile=' . escapeshellarg($text_file) . ':' .
......