Merge branch 'master' of https://gitee.com/wjl2008_admin/tougao

application/api/controller/Article.php

@@ -337,9 +337,11 @@ class Article extends Base
         //分页查询数据
         $limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
         $res = $this->article_obj
-            ->field('t_article.*,t_journal.title journalname,t_user.email,t_user.realname,t_user.phone')
+            ->field('t_article.*,t_journal.title journalname,t_user.email,t_user.realname,t_user.phone,t_paystation.request_time pay_time,t_paystation.amount pay_mount')
             ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'LEFT')
             ->join('t_user', "t_user.user_id = t_article.user_id", 'left')
+            ->join("t_order","t_order.article_id = t_article.article_id","left")
+            ->join("t_paystation","t_paystation.ps_id = t_order.ps_id","left")
             ->where($where)
             ->order('t_article.article_id desc')
             ->limit($limit_start, $data['pageSize'])

application/api/controller/Order.php

@@ -24,6 +24,7 @@ use think\exception\DbException;
 use think\exception\PDOException;
 use think\Queue;
 use think\Validate;
+use think\log;
 
 class Order extends base{
     protected $PAYPAL_CLIENT_ID="ATqBigrhcNdqR8J83aDjTOoJHsAVz0U45JRY4H0stcEcv0mQrMDHQmyrydQInYd1w4lJ1ee3Wsblm2WP";
@@ -59,6 +60,7 @@ class Order extends base{
             return jsonError("Paystation responds with no results or result fail");
         }
         $tid = $data['transaction_id'];
+        Log::log("payStation:".$tid);
         $paystation_info = $this->paystation_obj->where("transaction_id",$tid)->find();
         if (!$paystation_info){
             return jsonSuccess([]);

application/api/controller/Production.php

@@ -9,6 +9,7 @@ use app\api\controller\Base;
 use think\Db;
 use think\Queue;
 use think\Validate;
+use think\log;
 
 /**
  * @title 公共管理相关
@@ -1932,6 +1933,20 @@ class Production extends Base
         my_doiToFrag2($r);
     }
 
+
+    public function myreaddoc(){
+        Log::log("ceshi");
+        $file = "D://11/327ef248323aa75a3ba8347752b03764.docx";
+        $fileRoute['fileRoute'] = $file;
+        $url = "http://192.168.110.110:8081/typeset/readDocxNormal";
+        $res = object_to_array(json_decode(myPost1($url, $fileRoute)));
+
+
+
+//        $r = readDocx($file);
+        return jsonSuccess($res);
+    }
+
     /**
      *  验证参考文献是否全部通过
      */

application/common.php

@@ -43,6 +43,20 @@ function readExcel($file){
     return $dataset;
 }
 
+function readDocx($file){
+    $phpWord = IOFactory::load($file);
+    $frag = [];
+    foreach ($phpWord->getSections() as $section) {
+        foreach ($section->getElements() as $element) {
+            if (method_exists($element, 'getText')) {
+//                echo $element->getText() . "\n";
+                $frag[] = $element->getText();
+            }
+        }
+    }
+    return $frag;
+}
+
 /**
  * @function    sendEmail
  * @intro        发送邮件（带附件）

application/config.php

@@ -172,7 +172,8 @@ return [
         // 日志保存目录
         'path'  => LOG_PATH,
         // 日志记录级别
-        'level' => ['error'],
+        'level' => ['log'],
+        "max_files"=>3,
     ],
 
     // +----------------------------------------------------------------------