diff --git a/app-api/controllers/UpgradeController.php b/app-api/controllers/UpgradeController.php index ec0c73f..b88bee3 100644 --- a/app-api/controllers/UpgradeController.php +++ b/app-api/controllers/UpgradeController.php @@ -178,11 +178,16 @@ class UpgradeController extends BaseController $e->update_flag = $upgradeRecord->focuse; $e->version = $upgradeRecord->version; // 根据配置文件切换读取更新文件的路径 - if (isset(Yii::$app->params["UPGRADE_FILE_FROM"]) && "FROM_OSS" == Yii::$app->params["UPGRADE_FILE_FROM"]) { - $e->file_path = Yii::$app->params["ossOptions"]["url"] . "/" . $upgradeRecord->path; + if (isset(Yii::$app->params['UPGRADE_FILE_FROM']) && 'FROM_ECS' == Yii::$app->params['UPGRADE_FILE_FROM']) { + $ossConfig = Yii::$app->params['ossOptions']; + $domainURL = $ossConfig['url']; + $filePath = $domainURL.'/'.$upgradeRecord->path; } else { - $e->file_path = $domainURL.$upgradeRecord->upload_path; + $domainURL = Yii::$app->params['file_upload_domain']; + $filePath = $domainURL.'/'.$upgradeRecord->upload_path; } + + $e->file_path = $filePath; $e->file_md5 = $upgradeRecord->file_md5; $e->size = $upgradeRecord->size; $e->package_type = $upgradeRecord->package_type; @@ -362,12 +367,20 @@ class UpgradeController extends BaseController $e->size = 0; $e->version_message = ''; } else { - $domainURL = Yii::$app->params['file_upload_domain']; + + if (isset(Yii::$app->params['UPGRADE_FILE_FROM']) && 'FROM_ECS' == Yii::$app->params['UPGRADE_FILE_FROM']) { + $ossConfig = Yii::$app->params['ossOptions']; + $domainURL = $ossConfig['url']; + $filePath = $domainURL.'/'.$upgradeRecord->path; + } else { + $domainURL = Yii::$app->params['file_upload_domain']; + $filePath = $domainURL.'/'.$upgradeRecord->upload_path; + } $e->status = 0; $e->message = '有升级包'; $e->update_flag = $upgradeRecord->focuse; $e->version = $upgradeRecord->version; - $e->file_path = $domainURL.$upgradeRecord->path; + $e->file_path = $filePath; $e->file_md5 = $upgradeRecord->file_md5; $e->size = $upgradeRecord->size; $e->version_message = $upgradeRecord->desc; -- libgit2 0.21.0