'bug'

lchjczw · Mar 2, 2017 · dfb664a · dfb664a
1 parent dffeb6f
commit dfb664a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/common/modules/attachment/Module.php b/common/modules/attachment/Module.php
@@ -21,7 +21,7 @@ public function bootstrap($app)
  'class' => 'creocoder\flysystem\LocalFilesystem',
  'path' => '@storagePath/upload',
  ],
- 'baseUrl' => '@storagePath/upload',
+ 'baseUrl' => '@storageUrl/upload',
  'imageProcessor' => 'common\modules\attachment\components\image\Local'
  ];
  if (isset($this->params['filesystem_type'])) {
@@ -33,7 +33,7 @@ public function bootstrap($app)
  'secret' => $this->params['qiniu_access_secret'],
  'bucket' => $this->params['qiniu_bucket'],
  ];
- $storage['baseUrl'] = 'http:https://image.51siyuan.cn';
+ $storage['baseUrl'] = $this->params['qiniu_domain'];
  $storage['imageProcessor'] = [
  'class' => 'common\\modules\\attachment\\components\\image\\Qiniu'
  ];

diff --git a/common/modules/attachment/components/Storage.php b/common/modules/attachment/components/Storage.php
@@ -32,7 +32,7 @@ public function init()
  parent::init();
  $this->baseUrl = \Yii::getAlias($this->baseUrl);
  $this->fs = \Yii::createObject($this->fs);
- $this->imageProcessor = \Yii::createObject(ArrayHelper::merge(['baseUrl' => $this->baseUrl], $this->imageProcessor));
+ $this->imageProcessor = \Yii::createObject($this->imageProcessor, ['baseUrl' => $this->baseUrl]);
  }
 
  public function getPath($url)