From d403c1ff86d0f40c7554f07215a8f3942901018c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 20 十一月 2022 10:50:51 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/helper/PathHelper.java | 70 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/lf/server/helper/PathHelper.java b/src/main/java/com/lf/server/helper/PathHelper.java
index 88439b5..c22ca9f 100644
--- a/src/main/java/com/lf/server/helper/PathHelper.java
+++ b/src/main/java/com/lf/server/helper/PathHelper.java
@@ -21,8 +21,6 @@
private static int downloadPath = 1;
- private static int exportPath = 1;
-
private static int uploadPath = 1;
private static int sharePath = 1;
@@ -39,10 +37,6 @@
return downloadPath;
}
- public static int getExportPath() {
- return exportPath;
- }
-
public static int getUploadPath() {
return uploadPath;
}
@@ -56,7 +50,6 @@
*/
public void init() {
downloadPath = getSubPath(config.getDownloadPath(), downloadPath);
- exportPath = getSubPath(config.getExportPath(), exportPath);
uploadPath = getSubPath(config.getUploadPath(), uploadPath);
sharePath = getSubPath(config.getSharePath(), sharePath);
}
@@ -72,7 +65,7 @@
}
File[] files = file.listFiles();
- if (files.length < SettingData.MAX_FILES) {
+ if (null == files || files.length < SettingData.MAX_FILES) {
return subPath;
}
@@ -87,15 +80,6 @@
downloadPath = getSubPath(config.getDownloadPath(), downloadPath);
return config.getDownloadPath() + File.separator + downloadPath;
- }
-
- /**
- * 鑾峰彇鍑哄浘瀹屾暣鐩綍
- */
- public String getExportFullPath() {
- exportPath = getSubPath(config.getExportPath(), exportPath);
-
- return config.getExportPath() + File.separator + exportPath;
}
/**
@@ -119,22 +103,53 @@
/**
* 鑾峰彇涓存椂璺緞
*/
- public String getTempPath(int id) {
- String tempName = StringHelper.YMD__FORMAT.format(new Date());
- String tempPath = config.getTempPath();
- String path = tempPath + File.separator + tempName + id;
+ public String getTempPath() {
+ String tempName = StringHelper.YMDHMS2_FORMAT.format(new Date());
+ String path = config.getTempPath() + File.separator + tempName;
File file = new File(path);
if (!file.exists() && !file.isDirectory()) {
file.mkdirs();
}
- double ran = Math.random() * 99;
- if (ran > D90) {
- deleteOldPath(tempPath);
- }
+ deleteOldPath(config.getTempPath());
return path;
+ }
+
+ /**
+ * 鑾峰彇涓存椂璺緞
+ */
+ public String getTempPath(String subPath) {
+ if (!StringHelper.isEmpty(subPath)) {
+ String path = config.getTempPath() + File.separator + subPath;
+
+ File file = new File(path);
+ if (file.exists() && file.isDirectory()) {
+ return path;
+ }
+ }
+
+ deleteOldPath(config.getTempPath());
+
+ return getTempPath();
+ }
+
+ /**
+ * 鑾峰彇涓存椂璺緞鍚嶇О
+ */
+ public String getTempPathName() {
+ String tempName = StringHelper.YMDHMS2_FORMAT.format(new Date());
+ String path = config.getTempPath() + File.separator + tempName;
+
+ File file = new File(path);
+ if (!file.exists() && !file.isDirectory()) {
+ file.mkdirs();
+ }
+
+ deleteOldPath(config.getTempPath());
+
+ return tempName;
}
/**
@@ -142,6 +157,11 @@
*/
public void deleteOldPath(String tempPath) {
try {
+ double ran = Math.random() * 99;
+ if (ran < D90) {
+ return;
+ }
+
File file = new File(tempPath);
String str = StringHelper.YMD__FORMAT.format(new Date());
--
Gitblit v1.9.3