wesmiler 6 лет назад
Родитель
Сommit
43225d73f2

+ 1 - 1
vendor/thinkcmf/cmf-app/src/weixin/model/Devices.php

@@ -238,7 +238,7 @@ class Devices extends Model
         }
 
         // 发起请求
-        saveLogCache('print:params', $params);return false;
+        saveLogCache('print:params', $params);
         $res = httpRequest($apiUrl, $params, 'post', 'array', 300);
         $taskId = isset($res['taskID']) ? $res['taskID'] : '';
         db('print_files')->where(['id' => $fid])->update(['task_id' => $taskId, 'print_result' => json_encode($res, 256), 'updated_at' => date('Y-m-d H:i:s')]);

+ 1 - 0
vendor/thinkcmf/cmf-app/src/weixin/model/Stroage.php

@@ -112,6 +112,7 @@ class Stroage extends Model
             if (Stroage::checkFileExists($file)) {
                 $page = Stroage::getFilePage($file);
                 if (in_array($fileType, ['xls', 'xlsx'])) {
+//                if (in_array($fileType, ['xls', 'xlsx','doc','docx'])) {
                     $file = str_replace('.' . $fileType, '.pdf', $file);
                 }
                 $data = [