Skip to content

T
token
Commit c902ae05 authored by shajiaiming's avatar shajiaiming
Browse files
Options

Merge branch 'feature/oss' into 'master'

修复已知问题 2 See merge request !154
parents 06a6ce8c 193b675f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
api/controllers/ApplicationController.php
View file @ c902ae05
......@@ -129,7 +129,7 @@ class ApplicationController extends BaseController
$icon_Infos = CoinImage::getItemsByIds($icon_Items);
foreach($data as $key => &$value){
if($value['icon']){
$value['icon'] = $icon_Infos[$value['icon']]['base_url'].$icon_Infos[$value['icon']]['file_url'];
$value['icon'] = Yii::$app->params['service']['OssService']['url'].$icon_Infos[$value['icon']]['file_url'];
}else{
$value['icon'] = "";
}
......@@ -157,7 +157,7 @@ class ApplicationController extends BaseController
$name = json_decode($value['name'], true);
$value['name'] = $name[$this->lang];
if($value['icon']){
$value['icon'] = $icon_Infos[$value['icon']]['base_url'].$icon_Infos[$value['icon']]['file_url'];
$value['icon'] = Yii::$app->params['service']['OssService']['url'].$icon_Infos[$value['icon']]['file_url'];
}else{
$value['icon'] = '';
}
......
common/business/ApplicationBusiness.php
View file @ c902ae05
......@@ -46,7 +46,7 @@ class ApplicationBusiness
}
}
if ($value['icon']) {
$value['icon'] = $icon_Infos[$value['icon']]['base_url'] . $icon_Infos[$value['icon']]['file_url'];
$value['icon'] = Yii::$app->params['service']['OssService']['url'] . $icon_Infos[$value['icon']]['file_url'];
} else {
$value['icon'] = '';
}
......@@ -206,7 +206,7 @@ class ApplicationBusiness
$cate_app_item['id'] = $value['id'];
$cate_app_item['name'] = $value['name'];
if ($value['icon']) {
$cate_app_item['icon_url'] = $icon_Infos[$value['icon']]['base_url'] . $icon_Infos[$value['icon']]['file_url'];
$cate_app_item['icon_url'] = Yii::$app->params['service']['OssService']['url'] . $icon_Infos[$value['icon']]['file_url'];
} else {
$cate_app_item['icon_url'] = '';
}
......
common/models/psources/CoinApplication.php
View file @ c902ae05
......@@ -55,7 +55,7 @@ class CoinApplication extends BaseActiveRecord
$recommendItems = CoinApplicateRecommend::getRecommendItemsByType(2);
foreach($data as $key => &$value){
if($value['icon']){
$value['icon_url'] = $icon_Infos[$value['icon']]['base_url'].$icon_Infos[$value['icon']]['file_url'];
$value['icon_url'] = Yii::$app->params['service']['OssService']['url'].$icon_Infos[$value['icon']]['file_url'];
}else{
$value['icon_url'] = '';
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment