kevin_zhangl пре 3 година
родитељ
комит
46f9ceb2ee
4 измењених фајлова са 6 додато и 6 уклоњено
  1. 0 4
      common/config/main.php
  2. 4 0
      common/config/params.php
  3. 1 1
      common/helpers/Excel.php
  4. 1 1
      common/models/forms/UploadForm.php

+ 0 - 4
common/config/main.php

@@ -83,10 +83,6 @@ return [
                 'db' => [ 'class' => 'yii\log\FileTarget'],
             ],
         ],
-        // 上传服务地址
-        'localUpload' => [
-            'locate' => $mainConfig['localUpload']
-        ],
     ],
     'controllerMap' => [
         'swoole_server' => [

+ 4 - 0
common/config/params.php

@@ -359,4 +359,8 @@ return [
         'atUserIds'   => ['rob9muw'],
         'isAtAll'     => false,
     ],
+    // 上传服务地址
+    'localUpload' => [
+        'dns' => $mainConfig['localUpload']
+    ],
 ];

+ 1 - 1
common/helpers/Excel.php

@@ -806,7 +806,7 @@ class Excel extends BaseObject {
             $limit = $limit - 1;
         }
         $fileNameArray = ExcelImport::find()->select('U.FILE_NAME')->from(ExcelImport::tableName() . ' AS ET')->join('LEFT JOIN', Uploads::tableName() . ' AS U', 'ET.UPLOAD_ID=U.ID')->where('ET.ID=:ID', [':ID' => $excelImportId])->asArray()->one();
-        $filePath =  \Yii::$app->localUpload->locate . $fileNameArray['FILE_NAME'];
+        $filePath =  \Yii::$app->params['localUpload']['dns'] . $fileNameArray['FILE_NAME'];
 //        $filePath = '/ng-stage/Volumes/HDD/workshop/old/ar.upload.ming/files/' . $fileNameArray['FILE_NAME'];
         if ($startRow > $rowCount) {
             return 0;

+ 1 - 1
common/models/forms/UploadForm.php

@@ -182,7 +182,7 @@ class UploadForm extends Model {
                 $fileName = Tool::generateId(false);
 //                $fileName = $this->file->baseName;
                 // 保存在本地
-                $localPath =  \Yii::$app->localUpload->locate . $fileName . '.' . $this->file->extension;
+                $localPath =  \Yii::$app->params['localUpload']['dns'] . $fileName . '.' . $this->file->extension;
 //                $localPath = '/ng-stage/Volumes/HDD/workshop/old/ar.upload.ming/files/' . $fileName . '.' . $this->file->extension;
                 if (!$this->file->saveAs($localPath)) {
                     throw new Exception('Failed');