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
'", ';
}elseif($content['tag'] == 'source'){
$arr = explode("\n", $content['text']);
$title = $arr[0] ?? " ";
$author = $arr[1] ?? " ";
$verse = $arr[0] ?? " ";
$source = $arr[1] ?? " ";
//诗句
$text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
file_put_contents($text_file, $title);
file_put_contents($text_file, $verse);
$sub_text .= 'drawtext="'.
'fontfile=' . escapeshellarg($font_file) . ':' .
'textfile=' . escapeshellarg($text_file) . ':' .
......@@ -327,7 +327,7 @@ class AdminMakeImmerse implements ShouldQueue
'", ';
// 出处
$text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
file_put_contents($text_file, $author);
file_put_contents($text_file, $source);
$sub_text .= 'drawtext="'.
'fontfile=' . escapeshellarg($font_file) . ':' .
'textfile=' . escapeshellarg($text_file) . ':' .
......@@ -338,7 +338,7 @@ class AdminMakeImmerse implements ShouldQueue
'", ';
}else{
$text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
file_put_contents($text_file, $content);
file_put_contents($text_file, $content['text']);
$sub_text .= 'drawtext="'.
'fontfile=' . escapeshellarg($font_file) . ':' .
'textfile=' . escapeshellarg($text_file) . ':' .
......
......@@ -607,11 +607,11 @@ class UserMakeImmerse implements ShouldQueue
'", ';
}elseif($content['tag'] == 'source'){
$arr = explode("\n", $content['text']);
$title = $arr[0] ?? " ";
$author = $arr[1] ?? " ";
$verse = $arr[0] ?? " ";
$source = $arr[1] ?? " ";
//诗句
$text_file = Storage::disk('public')->path($this->getTempPath('.txt','text'));
file_put_contents($text_file, $title);
file_put_contents($text_file, $verse);
$sub_text .= 'drawtext="'.
'fontfile=' . escapeshellarg($font_file) . ':' .
'textfile=' . escapeshellarg($text_file) . ':' .
......@@ -622,7 +622,7 @@ class UserMakeImmerse implements ShouldQueue
'", ';
// 出处
$text_file = Storage::disk('public')->path($this->getTempPath('.txt','text'));
file_put_contents($text_file, $author);
file_put_contents($text_file, $source);
$sub_text .= 'drawtext="'.
'fontfile=' . escapeshellarg($font_file) . ':' .
'textfile=' . escapeshellarg($text_file) . ':' .
......@@ -633,7 +633,7 @@ class UserMakeImmerse implements ShouldQueue
'", ';
}else{
$text_file = Storage::disk('public')->path($this->getTempPath('.txt','text'));
file_put_contents($text_file, $content);
file_put_contents($text_file, $content['text']);
$sub_text .= 'drawtext="'.
'fontfile=' . escapeshellarg($font_file) . ':' .
'textfile=' . escapeshellarg($text_file) . ':' .
......