Просмотр исходного кода

上传服务地址改为可配置

kevin_zhangl 3 лет назад
Родитель
Сommit
a6d5ecf8a8
2 измененных файлов с 6 добавлено и 7 удалено
  1. 2 3
      common/helpers/Excel.php
  2. 4 4
      common/models/forms/UploadForm.php

+ 2 - 3
common/helpers/Excel.php

@@ -806,9 +806,8 @@ 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::getAlias('@common/runtime/uploads/' . $fileNameArray['FILE_NAME']);
-//        $filePath =  \Yii::$app->localUpload . $fileNameArray['FILE_NAME'];
-        $filePath = '/ng-stage/Volumes/HDD/workshop/old/ar.upload.ming/files/' . $fileNameArray['FILE_NAME'];
+        $filePath =  \Yii::$app->localUpload . $fileNameArray['FILE_NAME'];
+//        $filePath = '/ng-stage/Volumes/HDD/workshop/old/ar.upload.ming/files/' . $fileNameArray['FILE_NAME'];
         if ($startRow > $rowCount) {
             return 0;
         }

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

@@ -179,11 +179,11 @@ class UploadForm extends Model {
                 unlink($this->file->tempName);
             } else {
                 // 生成文件名
-//                $fileName = Tool::generateId(false);
-                $fileName = $this->file->baseName;
+                $fileName = Tool::generateId(false);
+//                $fileName = $this->file->baseName;
                 // 保存在本地
-//                $filePath =  \Yii::$app->localUpload . $fileNameArray['FILE_NAME'];
-                $localPath = '/ng-stage/Volumes/HDD/workshop/old/ar.upload.ming/files/' . $fileName . '.' . $this->file->extension;
+                $localPath =  \Yii::$app->localUpload . $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');
                 }