Commit 5b082649d52a0c3ee7445135d7f9d87240db7365
1 parent
00137c7d
Exists in
master
1. F 版本包路径改为按配置设置
Showing
1 changed file
with
18 additions
and
5 deletions
Show diff stats
app-api/controllers/UpgradeController.php
| @@ -178,11 +178,16 @@ class UpgradeController extends BaseController | @@ -178,11 +178,16 @@ class UpgradeController extends BaseController | ||
| 178 | $e->update_flag = $upgradeRecord->focuse; | 178 | $e->update_flag = $upgradeRecord->focuse; |
| 179 | $e->version = $upgradeRecord->version; | 179 | $e->version = $upgradeRecord->version; |
| 180 | // 根据配置文件切换读取更新文件的路径 | 180 | // 根据配置文件切换读取更新文件的路径 |
| 181 | - if (isset(Yii::$app->params["UPGRADE_FILE_FROM"]) && "FROM_OSS" == Yii::$app->params["UPGRADE_FILE_FROM"]) { | ||
| 182 | - $e->file_path = Yii::$app->params["ossOptions"]["url"] . "/" . $upgradeRecord->path; | 181 | + if (isset(Yii::$app->params['UPGRADE_FILE_FROM']) && 'FROM_ECS' == Yii::$app->params['UPGRADE_FILE_FROM']) { |
| 182 | + $ossConfig = Yii::$app->params['ossOptions']; | ||
| 183 | + $domainURL = $ossConfig['url']; | ||
| 184 | + $filePath = $domainURL.'/'.$upgradeRecord->path; | ||
| 183 | } else { | 185 | } else { |
| 184 | - $e->file_path = $domainURL.$upgradeRecord->upload_path; | 186 | + $domainURL = Yii::$app->params['file_upload_domain']; |
| 187 | + $filePath = $domainURL.'/'.$upgradeRecord->upload_path; | ||
| 185 | } | 188 | } |
| 189 | + | ||
| 190 | + $e->file_path = $filePath; | ||
| 186 | $e->file_md5 = $upgradeRecord->file_md5; | 191 | $e->file_md5 = $upgradeRecord->file_md5; |
| 187 | $e->size = $upgradeRecord->size; | 192 | $e->size = $upgradeRecord->size; |
| 188 | $e->package_type = $upgradeRecord->package_type; | 193 | $e->package_type = $upgradeRecord->package_type; |
| @@ -362,12 +367,20 @@ class UpgradeController extends BaseController | @@ -362,12 +367,20 @@ class UpgradeController extends BaseController | ||
| 362 | $e->size = 0; | 367 | $e->size = 0; |
| 363 | $e->version_message = ''; | 368 | $e->version_message = ''; |
| 364 | } else { | 369 | } else { |
| 365 | - $domainURL = Yii::$app->params['file_upload_domain']; | 370 | + |
| 371 | + if (isset(Yii::$app->params['UPGRADE_FILE_FROM']) && 'FROM_ECS' == Yii::$app->params['UPGRADE_FILE_FROM']) { | ||
| 372 | + $ossConfig = Yii::$app->params['ossOptions']; | ||
| 373 | + $domainURL = $ossConfig['url']; | ||
| 374 | + $filePath = $domainURL.'/'.$upgradeRecord->path; | ||
| 375 | + } else { | ||
| 376 | + $domainURL = Yii::$app->params['file_upload_domain']; | ||
| 377 | + $filePath = $domainURL.'/'.$upgradeRecord->upload_path; | ||
| 378 | + } | ||
| 366 | $e->status = 0; | 379 | $e->status = 0; |
| 367 | $e->message = '有升级包'; | 380 | $e->message = '有升级包'; |
| 368 | $e->update_flag = $upgradeRecord->focuse; | 381 | $e->update_flag = $upgradeRecord->focuse; |
| 369 | $e->version = $upgradeRecord->version; | 382 | $e->version = $upgradeRecord->version; |
| 370 | - $e->file_path = $domainURL.$upgradeRecord->path; | 383 | + $e->file_path = $filePath; |
| 371 | $e->file_md5 = $upgradeRecord->file_md5; | 384 | $e->file_md5 = $upgradeRecord->file_md5; |
| 372 | $e->size = $upgradeRecord->size; | 385 | $e->size = $upgradeRecord->size; |
| 373 | $e->version_message = $upgradeRecord->desc; | 386 | $e->version_message = $upgradeRecord->desc; |