Merge remote-tracking branch 'origin/master'

application/api/controller/Email.php

@@ -229,7 +229,7 @@ class Email extends Base
 
 
     public function myPush(){
-        $journal_info = $this->journal_obj->where("journal_id",23)->find();
+        $journal_info = $this->journal_obj->where("journal_id",1)->find();
         $edata['email'] = "751475802@qq.com";
         $edata['title'] = "Notice: Merger of Natural Therapy Advances and Food and Health into Integrative Medicine Discovery";
         $edata['content'] = "test content";

application/api/controller/Production.php

@@ -3651,7 +3651,7 @@ class Production extends Base
             // 方法1: 使用pdflatex命令（推荐）
             // $command = "{$sLatexDir}pdflatex -include-directory=" . dirname($texFilePath) .
             //     " -output-directory=" . $pdfDir . " " . escapeshellarg($texFilePath);
-            $command = "lualatex -output-directory=" . $pdfDir . " " . escapeshellarg($texFilePath);
+            $command = "pdflatex -output-directory=" . $pdfDir . " " . escapeshellarg($texFilePath);
 
             $output = [];
             $returnVar = 0;