@haluo/util 2.0.22 → 2.0.24

package/dist/modules/upload/aliOss.js

@@ -1,23 +1,19 @@
 /**
- * @file 阿里云OSS上传统一工具类
+ * @file 阿里云OSS上传统一工具类 v4
  * @description 整合所有项目的aliOss业务逻辑，通过传参形式支持不同业务场景
  * @Author: wanghui
  * @createBy: @2025.11.17
  *
- * 文档：https://help.aliyun.com/document_detail/64041.html
- *
  * 使用示例：
  * ```typescript
  * import { createAliOssUploader } from '@haluo/util'
  *
  * // 创建上传实例，传入业务相关的API函数
  * const ossUploader = createAliOssUploader({
- *   getAliyunSts: (params) => api.getAliyunSts(params),
+ *   getSts: (params) => api.getSts(params),
  *   darkWaterUploadImage: (params) => api.darkWaterUploadImage(params),
  *   multiTransferImage: (params) => api.multiTransferImage(params),
- *   aliyunPersist: (params) => api.aliyunPersist(params),
  *   generatePrePresignedUrl: (params) => api.generatePrePresignedUrl(params),
- *   uploadConf: (params) => api.uploadConf(params),
  *   dateFormat: util.date.format, // 或 util.filter.format
  *   messageWarning: (msg) => window.$message.warning(msg)
  * })
@@ -25,9 +21,9 @@
  * // 图片上传
  * ossUploader.ossUploadImage({
  *   file: file,
+ *   businessType: 1500, // 业务类型 BusinessType
  *   imageType: 'official', // nowater、official、panoram、forum、avatar、square、carport
  *   quality: 0.7, // 压缩质量
- *   businessType: 1500, // 业务类型：0(无水印)、1(头像)、4(GIF)、6(视频)、8(UnProtect)、1000(文章)、1199(私有)、1299(加密)、1500(默认)
  *   batchTransfer: false, // 是否批量转换水印
  *   notCompress: false, // 是否不压缩
  *   idCard: false, // 是否身份证上传
@@ -39,21 +35,39 @@
  * // 文件上传
  * ossUploader.ossUploadFile({
  *   file: file,
+ *   businessType: 1500, // 业务类型 BusinessType
  *   isVideo: false, // 是否视频
  *   isUnProtect: false, // 是否UnProtect
  *   isDocument: false, // 是否文档
- *   businessType: 1500,
  *   onProgress: (e) => console.log(e.percent),
  *   onSuccess: (val) => console.log(val),
  *   onError: (err) => console.error(err)
  * })
  * ```
  */
-import OSS from 'ali-oss';
 import lrz from 'lrz';
 // ==================== 常量定义 ====================
 /** 支持的图片格式 */
-const SUPPORTED_IMAGE_TYPES = ['image/png', 'image/gif', 'image/jpg', 'image/jpeg'];
+const SUPPORTED_IMAGE_TYPES = [
+    'image/jpeg',
+    'image/png',
+    'image/gif',
+    'image/bmp',
+    'image/webp',
+    'image/svg+xml',
+    'image/tiff',
+];
+/** 支持的图片格式 ext */
+const SUPPORTED_IMAGE_EXTS = [
+    'jpg',
+    'jpeg',
+    'png',
+    'gif',
+    'bmp',
+    'webp',
+    'svg',
+    'tiff',
+];
 /** 小图片阈值（KB） */
 const SMALL_IMAGE_THRESHOLD = 100;
 /** 长图宽高比阈值 */
@@ -62,35 +76,76 @@ const LONG_IMAGE_RATIO = 2;
 const DEFAULT_FILE_SIZE_LIMIT = 10;
 /** 默认压缩质量 */
 const DEFAULT_QUALITY = 0.7;
-/** 默认图片类型 */
-const DEFAULT_IMAGE_TYPE = 'official';
-/** OSS默认区域 */
-const DEFAULT_OSS_REGION = 'oss-cn-beijing';
 /** 预签名URL过期时间（毫秒） */
 const PRESIGNED_URL_EXPIRE_TIME = 60000;
-/** 随机字符串字符集 */
-const RANDOM_CHARS = '0123456789abcdefghijklmnopqrstuvwxyz';
-/** OSS元数据 */
-const OSS_META_PEOPLE = 'x-oss-meta-motor';
 // ==================== 枚举定义 ====================
 /**
  * 业务类型枚举
- * 不同的businessType对应不同的OSS bucket和水印策略
  */
 export var BusinessType;
 (function (BusinessType) {
-    BusinessType[BusinessType["NO_WATER"] = 0] = "NO_WATER";
-    BusinessType[BusinessType["AVATAR"] = 1] = "AVATAR";
-    BusinessType[BusinessType["GIF"] = 4] = "GIF";
-    BusinessType[BusinessType["VIDEO"] = 6] = "VIDEO";
-    BusinessType[BusinessType["UNPROTECT"] = 8] = "UNPROTECT";
-    BusinessType[BusinessType["ARTICLE"] = 1000] = "ARTICLE";
-    BusinessType[BusinessType["PRIVATE"] = 1199] = "PRIVATE";
-    BusinessType[BusinessType["ENCRYPTED"] = 1299] = "ENCRYPTED";
-    BusinessType[BusinessType["DEFAULT"] = 1500] = "DEFAULT"; // 默认
+    /** 客户端上传图片(跟用户相关) */
+    /** 隐私图片 */
+    BusinessType[BusinessType["CREDIT"] = 130541736] = "CREDIT";
+    /** 内容 */
+    BusinessType[BusinessType["CONTENT"] = 101300784] = "CONTENT";
+    /** 头像 */
+    BusinessType[BusinessType["AVATAR"] = 134539448] = "AVATAR";
+    /** 二手车 */
+    BusinessType[BusinessType["USED_CAR"] = 171978237] = "USED_CAR";
+    /** 商城 */
+    BusinessType[BusinessType["MALL"] = 115259415] = "MALL";
+    /** 魔友圈 */
+    BusinessType[BusinessType["HOOP"] = 155669648] = "HOOP";
+    /** 用户 */
+    BusinessType[BusinessType["USER"] = 170244368] = "USER";
+    /** 骑行 */
+    BusinessType[BusinessType["CYCLING"] = 165103952] = "CYCLING";
+    /** 玩车 */
+    BusinessType[BusinessType["MOTORCYCLE"] = 151637735] = "MOTORCYCLE";
+    /** 租车 */
+    BusinessType[BusinessType["RENTALCAR"] = 149095014] = "RENTALCAR";
+    /** 经销商 */
+    BusinessType[BusinessType["SHOP"] = 172655993] = "SHOP";
+    /** 财务 */
+    BusinessType[BusinessType["FINANCE"] = 188717541] = "FINANCE";
+    /** 反馈 */
+    BusinessType[BusinessType["FEEDBACK"] = 182411383] = "FEEDBACK";
+    /** 驾校 */
+    BusinessType[BusinessType["DRIVING_SCHOOL"] = 172137757] = "DRIVING_SCHOOL";
+    /** 评论图片 */
+    BusinessType[BusinessType["REPLY"] = 195929698] = "REPLY";
+    /** 厂家 */
+    BusinessType[BusinessType["FACTORY"] = 118733601] = "FACTORY";
+    /** 骑行数据 */
+    BusinessType[BusinessType["CYCLING_DATA"] = 148681294] = "CYCLING_DATA";
+    /** 动图 */
+    BusinessType[BusinessType["GIF"] = 191290831] = "GIF";
+    /** 其他（原则上不可以使用） */
+    BusinessType[BusinessType["OTHER"] = 100694193] = "OTHER";
+    /** 运营文件(跟用户无关) */
+    /** apk */
+    BusinessType[BusinessType["APK"] = 154033062] = "APK";
+    /** 证书 */
+    BusinessType[BusinessType["CERT"] = 142668067] = "CERT";
+    /** oss数据文件（xlxs等） */
+    BusinessType[BusinessType["OSSDATA"] = 105038102] = "OSSDATA";
+    /** 数据（题库等） */
+    BusinessType[BusinessType["DB"] = 180241065] = "DB";
+    /** PDF */
+    BusinessType[BusinessType["PDF"] = 198157532] = "PDF";
+    /** 视频 */
+    BusinessType[BusinessType["VIDEOOPS"] = 172023381] = "VIDEOOPS";
+    /** 运营图片(跟用户无关) */
+    /** 商城运营图片 */
+    BusinessType[BusinessType["MALLOPS"] = 137563987] = "MALLOPS";
+    /** 运营图片 */
+    BusinessType[BusinessType["OSSOPS"] = 157532694] = "OSSOPS";
+    /** 车库运营图片 */
+    BusinessType[BusinessType["CARPORT"] = 137563987] = "CARPORT";
 })(BusinessType || (BusinessType = {}));
 /**
- * 图片类型后缀枚举
+ * bucket 图片类型后缀枚举
  */
 export const SuffixEnum = {
     nowater: '!nowater',
@@ -99,46 +154,9 @@ export const SuffixEnum = {
     forum: '!forum',
     avatar: '!avatar',
     square: '!square',
-    carport: '!carport' // 车库、经销商水印
+    carport: '!carport', // 车库、经销商水印
 };
-/** 不打水印的图片类型 */
-const NO_WATER_IMAGE_TYPES = ['nowater', 'forum'];
 // ==================== 工具函数 ====================
-/**
- * 生成随机字符串
- * @param length 字符串长度
- * @returns 随机字符串
- */
-function randomString(length) {
-    let result = '';
-    for (let i = 0; i < length; i++) {
-        const randomIndex = Math.floor(Math.random() * RANDOM_CHARS.length);
-        result += RANDOM_CHARS[randomIndex];
-    }
-    return result;
-}
-/**
- * 过滤对象中的undefined值
- * @param obj 原始对象
- * @returns 过滤后的对象
- */
-function filterUndefined(obj) {
-    const result = {};
-    Object.keys(obj).forEach(key => {
-        if (obj[key] !== undefined) {
-            result[key] = obj[key];
-        }
-    });
-    return result;
-}
-/**
- * 检查是否为不打水印的图片类型
- * @param imageType 图片类型
- * @returns 是否不打水印
- */
-function isNoWaterImageType(imageType) {
-    return NO_WATER_IMAGE_TYPES.includes(imageType);
-}
 /**
  * 检查文件类型是否支持
  * @param fileType 文件类型
@@ -170,50 +188,108 @@ function getFileSizeInMB(size) {
  */
 export class AliOssClass {
     apiConfig;
-    clientCache;
     constructor(apiConfig) {
         this.apiConfig = apiConfig;
-        this.clientCache = new Map();
     }
     /**
-     * 创建OSS客户端
+     * 判断文件是否为图片（支持常见图片格式）
+     * @param {File} file - 上传的File对象
+     * @returns {boolean} 是否为图片
+     */
+    isImageFile(file) {
+        if (!file || !(file instanceof File))
+            return false;
+        // 1. 校验文件MIME类型（优先，更可靠）
+        if (SUPPORTED_IMAGE_TYPES.includes(file.type))
+            return true;
+        // 2. 校验文件后缀名（兜底，防止MIME类型缺失）
+        const fileExt = file.name.split('.').pop()?.toLowerCase() || '';
+        return SUPPORTED_IMAGE_EXTS.includes(fileExt);
+    }
+    /**
+     * 通过V4签名上传
+     * @param file 上传的文件
      * @param businessType 业务类型
-     * @param imggeCarType 车辆图片类型（可选，用于特定业务）
-     * @returns OSS客户端实例
+     * @param size 文件的尺寸
+     * @param resolve Promse
+     * @param reject Promse
+     * @returns 上传图片结果
      */
-    async createOssClient(businessType, imggeCarType) {
-        const cacheKey = `${businessType}_${imggeCarType || 'default'}`;
-        // 注释：某些项目使用缓存，某些不使用。这里提供可选的缓存机制
-        // if (this.clientCache.has(cacheKey)) {
-        //   return this.clientCache.get(cacheKey)
-        // }
-        const res = await this.apiConfig.getAliyunSts({ businessType, imggeCarType });
-        if (res.data.code !== 0) {
-            throw new Error('获取OSS配置失败');
+    async upload(params) {
+        let result = {};
+        try {
+            if (!params.size && this.isImageFile(params.file)) {
+                const image = await this.getImageInfo(params.file);
+                params.size = `_${image?.width}_${image?.height}`;
+            }
+            // 步骤 1：请求后端获取所有签名字段
+            const signResponse = await this.apiConfig.getSts({
+                businessType: params.businessType,
+                docType: params.file.type,
+                size: params.size, // _1024_567(可选)
+            });
+            if (signResponse.data.code !== 0) {
+                const errorMessage = `获取签名失败：${signResponse.data.message}`;
+                params.callbacks?.onError(errorMessage);
+                params.reject && params.reject(errorMessage);
+                console.error(errorMessage);
+            }
+            const signData = await signResponse.data.data;
+            console.log('后端返回的签名字段：', signData);
+            // 步骤 2：构造 FormData（字段名必须和后端返回一致
+            const formData = new FormData();
+            // formData.append('autherid', signData['autherid'])
+            // formData.append('uid', signData['uid'])
+            formData.append('key', signData['key']);
+            formData.append('policy', signData['policy']);
+            formData.append('success_action_status', '200');
+            formData.append('x-oss-credential', signData['credential']);
+            formData.append('x-oss-date', signData['date']);
+            if (signData['securityToken']) {
+                formData.append('x-oss-security-token', signData['securityToken']);
+            }
+            formData.append('x-oss-signature', signData['signature']);
+            formData.append('x-oss-signature-version', signData['signatureVersion']);
+            formData.append('file', params.file);
+            // 步骤 3：发送 POST 请求到 OSS
+            const uploadResponse = await fetch(signData.uploadUrl, {
+                method: 'POST',
+                body: formData,
+                // 重点：不要手动设置 Content-Type！浏览器会自动处理为 multipart/form-data 并带边界符
+                headers: { Accept: '*/*' },
+            });
+            // 步骤 4：处理上传结果
+            const responseText = await uploadResponse.text();
+            if (uploadResponse.ok) {
+                result = {
+                    imgUrl: signData['fileUrl'],
+                    imgOrgUrl: signData['fileUrl'],
+                    name: params.file.name,
+                    fileName: params.file.name,
+                };
+                params.callbacks?.onSuccess(result);
+                params.resolve && params.resolve(result);
+            }
+            else {
+                const errorMessage = `上传失败（OSS 返回 ${uploadResponse.status}）：${responseText}`;
+                params.callbacks?.onError(errorMessage);
+                params.reject && params.reject(errorMessage);
+                console.error(errorMessage);
+            }
         }
-        const clientParams = res.data.data || {};
-        clientParams.suffix = clientParams.style || '';
-        // 过滤掉undefined值的属性，并确保必需字段存在
-        const filteredParams = filterUndefined(clientParams);
-        const client = new OSS({
-            region: DEFAULT_OSS_REGION,
-            ...filteredParams
-        });
-        // 保存客户端选项供后续使用
-        client.options = {
-            ...client.options,
-            realmName: clientParams.realmName,
-            suffix: clientParams.suffix
-        };
-        this.clientCache.set(cacheKey, client);
-        return client;
+        catch (err) {
+            params.callbacks?.onError(err.message);
+            params.reject && params.reject(err.message);
+            console.error('上传异常：', err.message);
+        }
+        return result;
     }
     /**
      * 预加载图片获取尺寸
      * @param file 文件对象
      * @returns 图片对象
      */
-    imgUpload(file) {
+    getImageInfo(file) {
         return new Promise((resolve, reject) => {
             const URL = window.URL || window.webkitURL;
             const image = new Image();
@@ -229,118 +305,33 @@ export class AliOssClass {
             image.src = objectUrl;
         });
     }
-    /**
-     * 生成文件名
-     * @param imageType 图片类型
-     * @param extension 文件扩展名
-     * @returns 文件名信息
-     */
-    generateFileName(imageType, extension) {
-        const now = new Date();
-        const year = this.apiConfig.dateFormat(now, 'YYYY');
-        const date = this.apiConfig.dateFormat(now, 'YYYYMMDD');
-        const dateTime = this.apiConfig.dateFormat(now, 'YYYYMMDDHHmmss');
-        const randomStr = randomString(4);
-        const fileName = `${imageType}/${date}/${dateTime}_${randomStr}${extension}`;
-        return { year, fileName };
-    }
     /**
      * 检查图片是否为长图
-     * @param width 图片宽度
-     * @param height 图片高度
+     * @param File 图片
      * @returns 是否为长图
      */
-    isLongImage(width, height) {
+    async isLongImage(file) {
+        // 预加载图片获取尺寸
+        const image = await this.getImageInfo(file);
+        const { width, height } = image;
         const maxDimension = Math.max(width, height);
         const minDimension = Math.min(width, height);
         return maxDimension / minDimension > LONG_IMAGE_RATIO;
     }
-    /**
-     * 执行OSS上传
-     * @param client OSS客户端
-     * @param fileName 文件名
-     * @param file 文件对象
-     * @param year 年份
-     * @param mimeType MIME类型
-     * @param onProgress 进度回调
-     * @returns 上传结果
-     */
-    async performOssUpload(client, fileName, file, year, mimeType, onProgress) {
-        return await client.multipartUpload(fileName, file, {
-            progress: (p) => {
-                onProgress?.({ percent: Math.floor(p * 100) });
-            },
-            meta: { year, people: OSS_META_PEOPLE },
-            mime: mimeType
-        });
-    }
-    /**
-     * 确定业务类型
-     * @param option 上传选项
-     * @param isGif 是否为GIF
-     * @returns 业务类型
-     */
-    determineBusinessType(option, isGif) {
-        // 如果已指定businessType，直接使用
-        if (option.businessType !== undefined) {
-            return option.businessType;
-        }
-        const imageType = option.imageType || DEFAULT_IMAGE_TYPE;
-        // 注释：GIF图片使用businessType=4
-        if (isGif) {
-            return BusinessType.GIF;
-        }
-        // 注释：根据imageType确定默认businessType
-        if (imageType === 'avatar') {
-            return BusinessType.AVATAR;
-        }
-        if (isNoWaterImageType(imageType)) {
-            return BusinessType.NO_WATER;
-        }
-        return BusinessType.DEFAULT;
-    }
     /**
      * 加载图片并返回结果
      * 用于标准的图片上传场景
      * @param params 加载参数
      */
     loadImage(params) {
-        const { url, val, suffix, file, option, resolve, reject, isGif } = params;
+        const { url, val, file, option, resolve, reject } = params;
         let img = new Image();
         img.src = url;
         img.onload = function () {
             if (!img)
                 return;
             val.imgOrgUrl = `${url}?_${img.width}_${img.height}`;
-            // 注释：全景图和GIF图片缩略图后缀不带300，其他需要
-            val.imgUrl =
-                suffix === '!panoram' || isGif
-                    ? `${url}?_${img.width}_${img.height}`
-                    : `${url}300?_${img.width}_${img.height}`;
-            val.name = file.name;
-            val.fileName = file.name;
-            option.onSuccess?.(val);
-            resolve(val);
-            img = null;
-        };
-        img.onerror = function () {
-            option.onError?.('图片加载失败');
-            reject('图片加载失败');
-            img = null;
-        };
-    }
-    /**
-     * 加载图片并返回结果（新版）
-     * 用于avatar、idCard等特殊场景，返回格式不同
-     * @param params 加载参数
-     */
-    loadImageNew(params) {
-        const { url, val, file, option, resolve, reject } = params;
-        let img = new Image();
-        img.src = url;
-        img.onload = function () {
-            val.imgOrgUrl = url;
-            val.imgUrl = val.name;
+            val.imgUrl = val.imgOrgUrl;
             val.name = file.name;
             val.fileName = file.name;
             option.onSuccess?.(val);
@@ -363,12 +354,15 @@ export class AliOssClass {
         if (!(option.file instanceof File)) {
             return Promise.reject('file is not instanceof File');
         }
+        if (!option.businessType) {
+            return Promise.reject('businessType不能为空');
+        }
         const file = option.file;
         // 初始化回调函数
         const callbacks = {
             onError: option.onError || (() => { }),
             onSuccess: option.onSuccess || (() => { }),
-            onProgress: option.onProgress || (() => { })
+            onProgress: option.onProgress || (() => { }),
         };
         option.onError = callbacks.onError;
         option.onSuccess = callbacks.onSuccess;
@@ -381,37 +375,18 @@ export class AliOssClass {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const imageType = option.imageType || DEFAULT_IMAGE_TYPE;
-                const suffix = SuffixEnum[imageType] || SuffixEnum.official;
-                // 生成文件名
-                const extensionName = `.${file.name.split('.').pop()}`;
-                const { year, fileName } = this.generateFileName(imageType, extensionName);
                 // 注释：小图片（≤100KB）不压缩，quality设为1 (MAIN-2481)
                 const isSmallImage = getFileSizeInKB(file.size) <= SMALL_IMAGE_THRESHOLD;
-                let quality = isSmallImage ? 1 : (option.quality || DEFAULT_QUALITY);
-                const isGif = file.type === 'image/gif';
-                const idCard = option.idCard || false;
-                // 确定业务类型
-                const businessType = this.determineBusinessType(option, isGif);
-                // 注释：特殊业务类型1299（加密）直接返回bucket路径，不加载图片
-                if (businessType === BusinessType.ENCRYPTED) {
-                    const client = await this.createOssClient(businessType, option.imggeCarType);
-                    const result = await this.performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress);
-                    if (result.res.statusCode === 200) {
-                        const val = {
-                            ...result,
-                            imgUrl: `${result.bucket}://${result.name}`,
-                            imgOrgUrl: `${result.bucket}://${result.name}`,
-                            fileName: file.name
-                        };
-                        callbacks.onSuccess(val);
-                        resolve(val);
-                    }
-                    else {
-                        callbacks.onError('上传失败');
-                        reject('上传失败');
-                    }
-                    return;
+                let quality = isSmallImage ? 1 : option.quality || DEFAULT_QUALITY;
+                const businessType = option.businessType;
+                if (businessType === BusinessType.CREDIT) {
+                    return await this.upload({
+                        file,
+                        businessType,
+                        resolve,
+                        reject,
+                        callbacks,
+                    });
                 }
                 // 注释：batchTransfer选项 - 批量转换水印（用于某些特殊业务场景）
                 if (option.batchTransfer && this.apiConfig.multiTransferImage) {
@@ -420,11 +395,10 @@ export class AliOssClass {
                         this.loadImage({
                             url: res.data.data,
                             val: res.data,
-                            suffix,
                             option,
                             file,
                             resolve,
-                            reject
+                            reject,
                         });
                     }
                     else {
@@ -434,17 +408,17 @@ export class AliOssClass {
                     return;
                 }
                 // 注释：carport类型需要打暗水印
-                if (option.imageType === 'carport' && this.apiConfig.darkWaterUploadImage) {
+                if (option.imageType === 'carport' &&
+                    this.apiConfig.darkWaterUploadImage) {
                     const res = await this.apiConfig.darkWaterUploadImage({ file });
                     if (res.data.code === 0) {
                         this.loadImage({
                             url: res.data.data,
                             val: res.data,
-                            suffix,
                             option,
                             file,
                             resolve,
-                            reject
+                            reject,
                         });
                     }
                     else {
@@ -453,15 +427,13 @@ export class AliOssClass {
                     }
                     return;
                 }
-                // 预加载图片获取尺寸
-                const image = await this.imgUpload(file);
                 // 图片压缩
                 const rst = await lrz(file, { quality });
                 // 注释：长图压缩有问题，长宽比>2:1的图片不压缩
-                const isLong = this.isLongImage(image.width, image.height);
+                const isLong = (await this.isLongImage(file)) || false;
                 // 确定最终上传的文件
                 let postFile;
-                if (option.notCompress || isGif || isLong) {
+                if (option.notCompress || file.type === 'image/gif' || isLong) {
                     // 注释：GIF、notCompress选项或长图不压缩
                     postFile = file;
                 }
@@ -481,33 +453,31 @@ export class AliOssClass {
                 if (!postFile.name) {
                     Object.defineProperty(postFile, 'name', {
                         value: file.name,
-                        writable: false
+                        writable: false,
                     });
                 }
-                // 注释：根据不同场景选择不同的OSS客户端
-                // GIF -> UnProtect(8), idCard -> Private(1199), nowater/forum -> NoWater(0), 其他 -> 默认
-                const client = await this.createOssClient(businessType, option.imggeCarType);
-                // 执行上传
-                const result = await this.performOssUpload(client, fileName, postFile, year, postFile.type, callbacks.onProgress);
-                if (result.res.statusCode !== 200) {
-                    callbacks.onError('上传失败');
-                    reject('上传失败');
-                    return;
-                }
+                const result = await this.upload({
+                    file,
+                    businessType,
+                    resolve,
+                    reject,
+                    callbacks,
+                });
                 // 注释：idCard场景 - 生成预签名URL
-                if (idCard && this.apiConfig.generatePrePresignedUrl) {
+                if ((option.idCard || false) &&
+                    this.apiConfig.generatePrePresignedUrl) {
                     const res = await this.apiConfig.generatePrePresignedUrl({
                         objectId: result.name,
-                        expireMils: PRESIGNED_URL_EXPIRE_TIME
+                        expireMils: PRESIGNED_URL_EXPIRE_TIME,
                     });
                     if (res.data.code === 0) {
-                        this.loadImageNew({
+                        this.loadImage({
                             url: res.data.data,
                             val: result,
                             file: postFile,
                             option,
                             resolve,
-                            reject
+                            reject,
                         });
                     }
                     else {
@@ -516,41 +486,6 @@ export class AliOssClass {
                     }
                     return;
                 }
-                // 注释：avatar场景 - 调用aliyunPersist处理
-                if (imageType === 'avatar' && this.apiConfig.aliyunPersist) {
-                    const res = await this.apiConfig.aliyunPersist({
-                        object: `${result.bucket}://${result.name}`,
-                        businessType: BusinessType.AVATAR
-                    });
-                    if (res.data.code === 0) {
-                        this.loadImageNew({
-                            url: res.data.data,
-                            val: result,
-                            file: postFile,
-                            option,
-                            resolve,
-                            reject
-                        });
-                    }
-                    else {
-                        callbacks.onError('头像处理失败');
-                        reject('头像处理失败');
-                    }
-                    return;
-                }
-                // 注释：标准场景 - 使用client.options中的realmName和suffix
-                const clientParams = client.options;
-                const url = `${clientParams.realmName}${result.name}${clientParams.suffix || ''}`;
-                this.loadImage({
-                    url,
-                    val: result,
-                    suffix,
-                    file: postFile,
-                    option,
-                    resolve,
-                    reject,
-                    isGif
-                });
             }
             catch (error) {
                 const errorMsg = error.message || '上传异常';
@@ -569,61 +504,43 @@ export class AliOssClass {
         if (!(option.file instanceof File)) {
             return Promise.reject('file is not instanceof File');
         }
+        if (!option.businessType) {
+            return Promise.reject('businessType不能为空');
+        }
         const file = option.file;
         // 初始化回调函数
         const callbacks = {
             onError: option.onError || (() => { }),
             onSuccess: option.onSuccess || (() => { }),
-            onProgress: option.onProgress || (() => { })
+            onProgress: option.onProgress || (() => { }),
         };
         option.onError = callbacks.onError;
         option.onSuccess = callbacks.onSuccess;
         option.onProgress = callbacks.onProgress;
         return new Promise(async (resolve, reject) => {
             try {
-                // 生成文件名
-                const extensionName = `.${file.name.split('.').pop()}`;
-                const fileType = extensionName === '.apk' ? 'apk' : 'file';
-                const { year, fileName } = this.generateFileName(fileType, extensionName);
                 const isVideo = !!option.isVideo;
                 const isDocument = !!option.isDocument;
                 const isUnProtect = !!option.isUnProtect;
-                // 注释：根据不同场景选择businessType
-                // isUnProtect -> 8, isVideo -> 6, isDocument -> 6, 其他 -> 1500
                 let businessType = option.businessType;
                 if (!businessType) {
                     if (isUnProtect) {
-                        businessType = BusinessType.UNPROTECT;
+                        businessType = BusinessType.OTHER;
                     }
                     else if (isVideo || isDocument) {
-                        businessType = BusinessType.VIDEO; // 视频和文档都使用6
+                        businessType = BusinessType.OTHER; // 视频和文档都使用6
                     }
                     else {
-                        businessType = BusinessType.DEFAULT;
+                        businessType = BusinessType.OTHER;
                     }
                 }
-                // 注释：文档上传可能需要先调用uploadConf获取配置
-                if (isDocument && this.apiConfig.uploadConf) {
-                    await this.apiConfig.uploadConf(businessType);
-                }
-                const client = await this.createOssClient(businessType, option.imggeCarType);
-                // 执行上传
-                const result = await this.performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress);
-                if (result.res.statusCode === 200) {
-                    const clientParams = client.options;
-                    const url = `${clientParams.realmName}${result.name}${clientParams.suffix || ''}`;
-                    const uploadResult = {
-                        ...result,
-                        url,
-                        fileName: file.name
-                    };
-                    callbacks.onSuccess(uploadResult);
-                    resolve(uploadResult);
-                }
-                else {
-                    callbacks.onError('上传失败');
-                    reject('上传失败');
-                }
+                await this.upload({
+                    file,
+                    businessType,
+                    resolve,
+                    reject,
+                    callbacks,
+                });
             }
             catch (error) {
                 const errorMsg = error.message || '上传异常';
@@ -633,8 +550,17 @@ export class AliOssClass {
         });
     };
     /**
-     * 商品详情图片上传
-     * 注释：此方法用于商品详情页的图片上传，不压缩，使用NoWater客户端
+     * 纯图片上传 pureOssUploadImage
+     * 注释：图片上传，不压缩
+     * @param option 上传选项
+     * @returns Promise
+     */
+    pureOssUploadImage = async (option) => {
+        return await this.shopDetailUpdate(option);
+    };
+    /**
+     * 商品详情图片上传（不建议直接使用，请使用 pureOssUploadImage）
+     * 注释：图片上传，不压缩
      * @param option 上传选项
      * @returns Promise
      */
@@ -642,12 +568,15 @@ export class AliOssClass {
         if (!(option.file instanceof File)) {
             return Promise.reject('file is not instanceof File');
         }
+        if (!option.businessType) {
+            return Promise.reject('businessType不能为空');
+        }
         const file = option.file;
         // 初始化回调函数
         const callbacks = {
             onError: option.onError || (() => { }),
             onSuccess: option.onSuccess || (() => { }),
-            onProgress: option.onProgress || (() => { })
+            onProgress: option.onProgress || (() => { }),
         };
         option.onError = callbacks.onError;
         option.onSuccess = callbacks.onSuccess;
@@ -660,6 +589,7 @@ export class AliOssClass {
         }
         return new Promise(async (resolve, reject) => {
             try {
+                const businessType = option.businessType;
                 // 文件大小验证
                 if (getFileSizeInMB(file.size) > DEFAULT_FILE_SIZE_LIMIT) {
                     const errorMsg = `图片不能超过${DEFAULT_FILE_SIZE_LIMIT}M`;
@@ -667,34 +597,13 @@ export class AliOssClass {
                     reject(errorMsg);
                     return;
                 }
-                // 预加载图片（虽然不需要尺寸，但保持原有逻辑）
-                await this.imgUpload(file);
-                const imageType = option.imageType || DEFAULT_IMAGE_TYPE;
-                const suffix = SuffixEnum[imageType] || SuffixEnum.official;
-                // 生成文件名
-                const extensionName = `.${file.name.split('.').pop()}`;
-                const { year, fileName } = this.generateFileName(imageType, extensionName);
-                // 使用NoWater客户端
-                const client = await this.createOssClient(BusinessType.NO_WATER, option.imggeCarType);
-                // 执行上传
-                const result = await this.performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress);
-                if (result.res.statusCode === 200) {
-                    const clientParams = client.options;
-                    const url = `${clientParams.realmName}${result.name}${clientParams.suffix || ''}`;
-                    this.loadImage({
-                        url,
-                        val: result,
-                        suffix,
-                        file,
-                        option,
-                        resolve,
-                        reject
-                    });
-                }
-                else {
-                    callbacks.onError('上传失败');
-                    reject('上传失败');
-                }
+                await this.upload({
+                    file,
+                    businessType,
+                    resolve,
+                    reject,
+                    callbacks,
+                });
             }
             catch (error) {
                 const errorMsg = error.message || '上传异常';
@@ -703,15 +612,6 @@ export class AliOssClass {
             }
         });
     };
-    /**
-     * 生成随机字符串
-     * @param num 字符串长度
-     */
-    randomString = randomString;
-    /**
-     * 后缀枚举
-     */
-    suffixEnum = SuffixEnum;
     /**
      * 业务类型枚举
      */
@@ -731,5 +631,4 @@ export function createAliOssUploader(apiConfig) {
 export default {
     createAliOssUploader,
     BusinessType,
-    SuffixEnum
 };