From deb49773f332f83dafb78788bc3d9b2b39fa421c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 23 十二月 2024 09:50:03 +0800
Subject: [PATCH] 项目库上传后端逻辑完善
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 0dd853d..7a70638 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -1,6 +1,8 @@
package com.ycl.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.IORuntimeException;
+import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ZipUtil;
@@ -570,7 +572,13 @@
}
tempDir = Files.createTempDirectory("temp-dir").toFile();
- ZipUtil.unzip(tempZip, tempDir, StandardCharsets.ISO_8859_1);
+
+ try {
+ ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_UTF_8);
+ }catch (IORuntimeException e){
+ log.error("瑙ｅ帇澶辫触锛屽皾璇曚娇鐢℅BK缂栫爜瑙ｅ帇...");
+ ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_GBK);
+ }
Path path = tempDir.toPath();
ProjectImportListener projectImportListener = new ProjectImportListener();
@@ -609,7 +617,7 @@
files.forEach(attachmentFile -> {
try {
//涓婁紶
- String url = FileUploadUtils.upload(filePath, file);
+ String url = FileUploadUtils.uploadIOFile(filePath, attachmentFile);
//瀛樻斁鐨勬枃浠跺悕浼氬姞涓奯鏃堕棿鎴崇殑鍚庣紑
String newName = FileUtils.getName(url);
attachments.add(new File()
--
Gitblit v1.8.0