diff --git a/app-api/controllers/UpgradeController.php b/app-api/controllers/UpgradeController.php index b88bee3..cc89fd8 100644 --- a/app-api/controllers/UpgradeController.php +++ b/app-api/controllers/UpgradeController.php @@ -236,7 +236,7 @@ class UpgradeController extends BaseController $e->message = 'barcode格式有误'; return $e; } - $upgradeLogModel = UpgradeLogRepository::findOne(['device_id' => $deviceId, 'current_version' => $currentVersion, 'target_version' => $targetVersion, 'status' => $status, 'type' => UpgradeStatus::TYPE_OTA]); + $upgradeLogModel = UpgradeLogRepository::findOne(['device_id' => $deviceId, 'barcode'=> $barcode, 'current_version' => $currentVersion, 'target_version' => $targetVersion, 'status' => $status, 'type' => UpgradeStatus::TYPE_OTA]); if ($upgradeLogModel) { $upgradeLogModel->timestamp = $timestamp; $upgradeLogModel->save(); @@ -398,7 +398,7 @@ class UpgradeController extends BaseController $e = new stdClass(); $e->status = 1; $getPostData = file_get_contents('php://input', 'r'); - self::myLog('actionReportUpgradeEvent:'. $getPostData); + self::myLog('actionReportAPPUpgradeEvent:'. $getPostData); if (!$getPostData) { $e->message = '数据为空'; return $e; @@ -432,7 +432,7 @@ class UpgradeController extends BaseController $e->message = 'barcode格式有误'; return $e; } - $upgradeLogModel = UpgradeLogRepository::findOne(['device_id' => $deviceId, 'package_name' => $packageName ,'current_version' => $currentVersion, 'target_version' => $targetVersion, 'status' => $status, 'type' => UpgradeStatus::TYPE_APP]); + $upgradeLogModel = UpgradeLogRepository::findOne(['device_id' => $deviceId, 'barcode'=> $barcode, 'package_name' => $packageName ,'current_version' => $currentVersion, 'target_version' => $targetVersion, 'status' => $status, 'type' => UpgradeStatus::TYPE_APP]); if ($upgradeLogModel) { $upgradeLogModel->timestamp = $timestamp; $upgradeLogModel->save(); -- libgit2 0.21.0