引入minio

routes/products.js

@@ -43,7 +43,7 @@ router.get('/', async (req, res) => {
     
     // 获取商品列表
     const query = `
-      SELECT id, name, rongdou_price, category, points_price as points, stock, image_url as image, description, status, payment_methods, created_at, updated_at
+      SELECT id, name, rongdou_price, category, points_price, stock, image_url as image, description, status, payment_methods, created_at, updated_at
       FROM products 
       ${whereClause}
       ORDER BY created_at DESC
@@ -57,7 +57,6 @@ router.get('/', async (req, res) => {
     products.forEach(item=>{
       item.payment_methods = JSON.parse(item.payment_methods)
     })
-    console.log('查询结果:', products);
     res.json({
       success: true,
       data: {

routes/upload.js

@@ -1,12 +1,16 @@
 const express = require('express');
 const multer = require('multer');
 const path = require('path');
-const fs = require('fs');
 const { auth } = require('../middleware/auth');
 const { authenticateToken } = require('./auth');
+const minioService = require('../services/minioService');
+const { initializeBuckets } = require('../config/minio');
 
 const router = express.Router();
 
+// 初始化MinIO存储桶
+initializeBuckets().catch(console.error);
+
 /**
  * @swagger
  * tags:
@@ -14,48 +18,8 @@ const router = express.Router();
  *   description: 文件上传API
  */
 
-// 确保上传目录存在
-const uploadDir = path.join(__dirname, '../uploads');
-const documentsDir = path.join(uploadDir, 'documents');
-const avatarsDir = path.join(uploadDir, 'avatars');
-const productsDir = path.join(uploadDir, 'products');
-
-[uploadDir, documentsDir, avatarsDir, productsDir].forEach(dir => {
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-});
-
-// 配置multer存储
-const storage = multer.diskStorage({
-  destination: (req, file, cb) => {
-    const type = req.body.type || 'documents';
-    let uploadPath;
-    
-    switch (type) {
-      case 'avatar':
-        uploadPath = avatarsDir;
-        break;
-      case 'product':
-        uploadPath = productsDir;
-        break;
-      case 'document':
-      default:
-        uploadPath = documentsDir;
-        break;
-    }
-    
-    cb(null, uploadPath);
-  },
-  filename: (req, file, cb) => {
-    // 生成唯一文件名：时间戳 + 随机数 + 原始扩展名
-    const timestamp = Date.now();
-    const random = Math.round(Math.random() * 1E9);
-    const ext = path.extname(file.originalname);
-    const filename = `${timestamp}_${random}${ext}`;
-    cb(null, filename);
-  }
-});
+// 配置multer内存存储（用于MinIO上传）
+const storage = multer.memoryStorage();
 
 // 文件过滤器 - 支持图片和视频
 const fileFilter = (req, file, cb) => {
@@ -136,7 +100,7 @@ const multiUpload = multer({
  *         description: 服务器错误
  */
 router.post('/image', authenticateToken, (req, res) => {
-  upload.single('file')(req, res, (err) => {
+  upload.single('file')(req, res, async (err) => {
     if (err instanceof multer.MulterError) {
       if (err.code === 'LIMIT_FILE_SIZE') {
         return res.status(400).json({
@@ -160,38 +124,36 @@ router.post('/image', authenticateToken, (req, res) => {
         message: err.message
       });
     }
-    
+
     if (!req.file) {
       return res.status(400).json({
         success: false,
         message: '请选择要上传的文件'
       });
     }
-    
-    // 构建文件访问路径
-    const type = req.body.type || 'documents';
-    // 确保路径与实际目录结构一致
-    let folderName = type;
-    if (type === 'product') {
-      folderName = 'products'; // 目录是复数形式
-    } else if (type === 'avatar') {
-      folderName = 'avatars'; // 目录是复数形式
+
+    try {
+      // 使用MinIO服务上传文件
+      const type = req.body.type || 'document';
+      const result = await minioService.uploadFile(
+        req.file.buffer,
+        req.file.originalname,
+        req.file.mimetype,
+        type
+      );
+
+      res.json({
+        success: true,
+        message: '文件上传成功',
+        data: result.data
+      });
+    } catch (error) {
+      console.error('文件上传到MinIO失败:', error);
+      res.status(500).json({
+        success: false,
+        message: error.message || '文件上传失败'
+      });
     }
-    const relativePath = path.join(folderName, req.file.filename).replace(/\\/g, '/');
-    const fileUrl = `/uploads/${relativePath}`;
-    
-    res.json({
-      success: true,
-      message: '文件上传成功',
-      data: {
-        filename: req.file.filename,
-        originalname: req.file.originalname,
-        mimetype: req.file.mimetype,
-        size: req.file.size,
-        path: relativePath,
-        url: fileUrl
-      }
-    });
   });
 });
 
@@ -261,7 +223,7 @@ router.post('/image', authenticateToken, (req, res) => {
  * @access Private
  */
 router.post('/', authenticateToken, (req, res) => {
-  multiUpload.array('file', 10)(req, res, (err) => {
+  multiUpload.array('file', 10)(req, res, async (err) => {
     if (err instanceof multer.MulterError) {
       if (err.code === 'LIMIT_FILE_SIZE') {
         return res.status(400).json({
@@ -285,61 +247,52 @@ router.post('/', authenticateToken, (req, res) => {
         message: err.message
       });
     }
-    
+
     if (!req.files || req.files.length === 0) {
       return res.status(400).json({
         success: false,
         message: '请选择要上传的文件'
       });
     }
-    
+
     try {
-      // 处理多个文件
-      const uploadedFiles = req.files.map(file => {
-        const type = req.body.type || 'documents';
-        let folderName = type;
-        if (type === 'product') {
-          folderName = 'products';
-        } else if (type === 'avatar') {
-          folderName = 'avatars';
-        }
-        const relativePath = path.join(folderName, file.filename).replace(/\\/g, '/');
-        const fileUrl = `/uploads/${relativePath}`;
-        
-        return {
-          filename: file.filename,
-          originalname: file.originalname,
-          mimetype: file.mimetype,
-          size: file.size,
-          path: relativePath,
-          url: fileUrl
-        };
-      });
-      
+      // 使用MinIO服务上传多个文件
+      const type = req.body.type || 'document';
+      const files = req.files.map(file => ({
+        buffer: file.buffer,
+        originalName: file.originalname,
+        mimeType: file.mimetype
+      }));
+
+      const result = await minioService.uploadMultipleFiles(files, type);
+
       // 如果只上传了一个文件，返回单文件格式以保持兼容性
-      if (uploadedFiles.length === 1) {
+      if (result.data.files.length === 1) {
+        result.data.files.forEach(element => {
+          element.path = '/' + element.path
+        });
         res.json({
           success: true,
           message: '文件上传成功',
           data: {
-            ...uploadedFiles[0],
-            urls: [uploadedFiles[0].url] // 同时提供urls数组格式
+            ...result.data.files[0],
+            urls: result.data.urls // 同时提供urls数组格式
           }
         });
       } else {
         // 多文件返回数组格式
         res.json({
           success: true,
-          message: `成功上传${uploadedFiles.length}个文件`,
-          data: {
-            files: uploadedFiles,
-            urls: uploadedFiles.map(file => file.url)
-          }
+          message: `成功上传${result.data.files.length}个文件`,
+          data: result.data
         });
       }
     } catch (error) {
-      console.error('文件上传错误:', error);
-      res.status(500).json({ success: false, message: '文件上传失败' });
+      console.error('文件上传到MinIO失败:', error);
+      res.status(500).json({
+        success: false,
+        message: error.message || '文件上传失败'
+      });
     }
   });
 });
@@ -401,36 +354,50 @@ router.post('/', authenticateToken, (req, res) => {
  *       500:
  *         description: 服务器错误
  */
-router.post('/single', auth, upload.single('file'), (req, res) => {
-  try {
+router.post('/single', auth, (req, res) => {
+  upload.single('file')(req, res, async (err) => {
+    if (err instanceof multer.MulterError) {
+      return res.status(400).json({
+        success: false,
+        message: '文件上传失败：' + err.message
+      });
+    } else if (err) {
+      return res.status(400).json({
+        success: false,
+        message: err.message
+      });
+    }
+
     if (!req.file) {
       return res.status(400).json({ success: false, message: '没有上传文件' });
     }
 
-    // 返回文件访问URL
-    const type = req.body.type || 'documents';
-    // 确保路径与实际目录结构一致
-    let folderName = type;
-    if (type === 'product') {
-      folderName = 'products'; // 目录是复数形式
-    } else if (type === 'avatar') {
-      folderName = 'avatars'; // 目录是复数形式
+    try {
+      // 使用MinIO服务上传文件
+      const type = req.body.type || 'document';
+      const result = await minioService.uploadFile(
+        req.file.buffer,
+        req.file.originalname,
+        req.file.mimetype,
+        type
+      );
+
+      res.json({
+        success: true,
+        message: '文件上传成功',
+        url: result.data.url,
+        filename: result.data.filename,
+        originalname: result.data.originalname,
+        size: result.data.size
+      });
+    } catch (error) {
+      console.error('文件上传到MinIO失败:', error);
+      res.status(500).json({
+        success: false,
+        message: error.message || '文件上传失败'
+      });
     }
-    const relativePath = path.join(folderName, req.file.filename).replace(/\\/g, '/');
-    const fileUrl = `/uploads/${relativePath}`;
-    
-    res.json({
-      success: true,
-      message: '文件上传成功',
-      url: fileUrl,
-      filename: req.file.filename,
-      originalname: req.file.originalname,
-      size: req.file.size
-    });
-  } catch (error) {
-    console.error('文件上传错误:', error);
-    res.status(500).json({ success: false, message: '文件上传失败' });
-  }
+  });
 });
 
 // 错误处理中间件
@@ -443,11 +410,11 @@ router.use((error, req, res, next) => {
       return res.status(400).json({ success: false, message: '一次最多只能上传10个文件' });
     }
   }
-  
+
   if (error.message === '只能上传图片或视频文件') {
     return res.status(400).json({ success: false, message: error.message });
   }
-  
+
   res.status(500).json({ success: false, message: '上传失败' });
 });