Правки статусов и логов

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 4f3b767abc6302cdb8b3e6cee2d93f4b0c5f49eb..90fa8e7c811b91652db219efef587365d50e9e27 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -953,14 +953,18 @@ class DataController extends BaseController
 //        file_put_contents(self::OUT_DIR . '/a2_upload_in.json', PHP_EOL . date('Y-m-d H:i:s') . ' ', FILE_APPEND | LOCK_EX);
 
         Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $request = Yii::$app->request;
+        $result = $request->getBodyParams();
+        if (empty($result)) {
+            $raw = $request->getRawBody();
+            try {
+                $result = Json::decode($raw);
+            } catch (Exception $ex) {
+                return $this->asJson(['error' => ['code' => 400, 'message' => 'Json body invalid']]);
+            }
+        }
 
-        $request = Yii::$app->request->getRawBody();
 
-        try {
-            $result = Json::decode($request);
-        } catch (Exception $ex) {
-            return $this->asJson(['error' => ['code' => 400, 'message' => 'Json body invalid']]);
-        }
         if (empty($result)) {
             file_put_contents(self::OUT_DIR . '/error_upload.txt',
                 PHP_EOL . 'result empty', FILE_APPEND);
@@ -976,7 +980,7 @@ class DataController extends BaseController
         }
         //InfoLogService::setInfoLog(__FILE__, __LINE__, 'upload_' . $fl . '.json' , 'info_id_25_1');
 
-        file_put_contents(self::OUT_DIR . '/upload_' . $fl . '.json', PHP_EOL . $request);
+        file_put_contents(self::OUT_DIR . '/upload_' . $fl . '.json', PHP_EOL . $request->getRawBody());
 
         try {
             $mess = [];