doomistorage 1.0.5 → 1.0.6

package/dist/cosfile.js

@@ -61,6 +61,7 @@ class CosFile extends file_1.FileBase {
     saveFileStream(file, fileName, saveOption, userInfo) {
         return __awaiter(this, void 0, void 0, function* () {
             const destinationFileName = this.getSaveFileName(saveOption, fileName, userInfo);
+            console.log('InStorage saveFileStream', saveOption);
             return new Promise((resolve) => {
                 if (saveOption.reRead) {
                     let dataArr = [], //存储读取的结果集合  

package/dist/filehelper.d.ts

@@ -13,7 +13,7 @@ export type FileProviderEnum = typeof FileProviderEnum[keyof typeof FileProvider
  * @param destination
  * @returns
  */
-export declare function FileHelper(provider: FileProviderEnum, apiOption?: any): FileUtility;
+export declare function FileHelper(provider?: FileProviderEnum, apiOption?: any): FileUtility;
 /**
  * 文件帮助工具
  */

package/dist/filehelper.js

@@ -18,17 +18,24 @@ const localfile_1 = require("./localfile");
 const axios_1 = __importDefault(require("axios"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+let config;
 /**
  * 读取系统配置文件的腾讯云设置
  * @returns
  */
-function getConfigurationSetting(settingName) {
-    let configfilename = process.env["CONFIGFILE"] || 'configuration.json';
-    let configfile = path_1.default.join(process.cwd(), configfilename);
-    if (!fs_1.default.existsSync(configfile))
+function getConfigurationSetting(settingName, isSection = true) {
+    var _a;
+    if (!config) {
+        let configfilename = process.env["CONFIGFILE"] || 'configuration.json';
+        let configfile = path_1.default.join(process.cwd(), configfilename);
+        if (!fs_1.default.existsSync(configfile))
+            return null;
+        config = require(configfile);
+    }
+    if (!config)
         return null;
-    const config = require(configfile)[settingName || 'tencentCOS'];
-    return config;
+    //const config = require(configfile)[settingName || 'tencentCOS'];
+    return isSection ? config[settingName || 'tencentCOS'] : ((_a = config.appsetting[settingName || 'destination']) !== null && _a !== void 0 ? _a : 'tencentcos');
 }
 /**
  * 文件处理器类型
@@ -43,6 +50,8 @@ exports.FileProviderEnum = {
  * @returns
  */
 function FileHelper(provider, apiOption) {
+    if (!provider)
+        provider = getConfigurationSetting('destination', false);
     let filehandler;
     switch (provider) {
         case exports.FileProviderEnum.LOCAL:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomistorage",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

package/src/cosfile.ts

@@ -49,6 +49,7 @@ export class CosFile extends FileBase {
      */
     async saveFileStream(file: any, fileName: any, saveOption: FileConfig, userInfo: any): Promise<FileResult> {
         const destinationFileName = this.getSaveFileName(saveOption, fileName, userInfo);
+        console.log('InStorage saveFileStream', saveOption)
         return new Promise((resolve) => {
             if (saveOption.reRead) {
                 let dataArr: any = [],//存储读取的结果集合  

package/src/filehelper.ts

@@ -5,16 +5,21 @@ import { LocalFile } from "./localfile";
 import axios from 'axios';
 import path from 'path';
 import fs from 'fs';
+let config:any;
 /**
  * 读取系统配置文件的腾讯云设置
  * @returns 
  */
-function getConfigurationSetting(settingName?:string):any{
-    let configfilename = process.env["CONFIGFILE"] || 'configuration.json'
-    let configfile = path.join(process.cwd(), configfilename);
-    if (!fs.existsSync(configfile)) return null;
-    const config = require(configfile)[settingName || 'tencentCOS'];
-    return config;
+function getConfigurationSetting(settingName?:string,isSection:boolean=true):any{
+    if (!config){
+        let configfilename = process.env["CONFIGFILE"] || 'configuration.json'
+        let configfile = path.join(process.cwd(), configfilename);
+        if (!fs.existsSync(configfile)) return null;
+        config = require(configfile);
+    }
+    if (!config) return null;
+    //const config = require(configfile)[settingName || 'tencentCOS'];
+    return isSection ? config[settingName || 'tencentCOS'] : (config.appsetting[settingName ||'destination']??'tencentcos') ;
 }
 /**
  * 文件处理器类型
@@ -29,7 +34,8 @@ export type FileProviderEnum = typeof FileProviderEnum[keyof typeof FileProvider
  * @param destination 
  * @returns 
  */
-export function FileHelper(provider: FileProviderEnum, apiOption?: any): FileUtility {
+export function FileHelper(provider?: FileProviderEnum, apiOption?: any): FileUtility {
+    if (!provider) provider = getConfigurationSetting('destination',false)
     let filehandler: FileBase
     switch (provider) {
         case FileProviderEnum.LOCAL: filehandler = new LocalFile(); break;