From 071152b1777b9b85daf01d49ffc06f3d14c49457 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 06 五月 2025 21:28:27 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/qrCodeController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/qrCodeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/qrCodeController.java
index 0f39e53..ed92101 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/qrCodeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/qrCodeController.java
@@ -8,14 +8,18 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.sign.Base64;
+import com.ruoyi.common.utils.uuid.Seq;
import com.ruoyi.domain.qrcode;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.service.qrCodeService;
+import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.util.FastByteArrayOutputStream;
@@ -35,6 +39,7 @@
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
+import static com.ruoyi.common.utils.file.FileUploadUtils.getExtension;
@RestController
@RequestMapping("/qrCode")
@@ -92,7 +97,11 @@
{
return coSService.deleteData(ids);
}
-
+ public static final String extractFilename(MultipartFile file)
+ {
+ return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
+ FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
+ }
@Log(title = "浜岀淮鐮佺敓鎴愯褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, qrcode cos)
@@ -137,15 +146,17 @@
MultipartFile multipartFile =new MockMultipartFile("file", "file.jpg", "text/plain", input);
System.out.println(76768999);
System.out.println(filePath);
-
- String fileName = FileUploadUtils.upload(multipartFile,filePath);
- url = serverConfig.getUrl() + fileName;
+ // FileUploadUtils.upload(filePath, multipartFile,fname);
+ String fname = extractFilename(multipartFile);
+ System.out.println(fname);
+ String fileName = FileUploadUtils.upload(multipartFile,fname);
+ url = serverConfig.getUrl() + fname;
System.out.println(url);
System.out.println(fileName);
System.out.println(FileUtils.getName(fileName));
qrcode cos = new qrcode();
cos.setId(id);
- cos.setCodeS(fileName);
+ cos.setCodeS(fname);
coSService.updateData(cos);;
// urls.add(url);
//
--
Gitblit v1.9.1