From f7b5d34d998461b78dbadf7fe03db257bc41a39f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 12 六月 2023 15:50:18 +0800
Subject: [PATCH] 添加 isTransform 参数

---
 src/main/java/com/lf/server/helper/PathHelper.java |   86 +++++++++++++++++++++++++++----------------
 1 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/PathHelper.java b/src/main/java/com/lf/server/helper/PathHelper.java
index 83c43a8..2d70eee 100644
--- a/src/main/java/com/lf/server/helper/PathHelper.java
+++ b/src/main/java/com/lf/server/helper/PathHelper.java
@@ -23,9 +23,7 @@
 
     private static int uploadPath = 1;
 
-    private static int sharePath = 1;
-
-    private final static double D90 = 90;
+    private final static double D80 = 80;
 
     private final static Log log = LogFactory.getLog(PathHelper.class);
 
@@ -41,17 +39,12 @@
         return uploadPath;
     }
 
-    public static int getSharePath() {
-        return sharePath;
-    }
-
     /**
      * 鍒濆鍖�
      */
     public void init() {
         downloadPath = getSubPath(config.getDownloadPath(), downloadPath);
         uploadPath = getSubPath(config.getUploadPath(), uploadPath);
-        sharePath = getSubPath(config.getSharePath(), sharePath);
     }
 
     private static int getSubPath(String parentPath, int subPath) {
@@ -65,7 +58,7 @@
             }
 
             File[] files = file.listFiles();
-            if (files.length < SettingData.MAX_FILES) {
+            if (null == files || files.length < SettingData.MAX_FILES) {
                 return subPath;
             }
 
@@ -92,33 +85,55 @@
     }
 
     /**
-     * 鑾峰彇鍏变韩瀹屾暣鐩綍
-     */
-    public String getShareFullPath() {
-        sharePath = getSubPath(config.getSharePath(), sharePath);
-
-        return config.getSharePath() + File.separator + sharePath;
-    }
-
-    /**
      * 鑾峰彇涓存椂璺緞
      */
-    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;
     }
 
     /**
@@ -126,16 +141,23 @@
      */
     public void deleteOldPath(String tempPath) {
         try {
+            double ran = Math.random() * 99;
+            if (ran < D80) {
+                return;
+            }
+
             File file = new File(tempPath);
-            String str = StringHelper.YMD__FORMAT.format(new Date());
+            String str = StringHelper.YMD2_FORMAT.format(new Date());
 
             File[] files = file.listFiles();
-            for (File f : files) {
-                if (f.getPath().indexOf(str) > -1) {
-                    continue;
-                }
+            if (null != files) {
+                for (File f : files) {
+                    if (f.getPath().contains(str)) {
+                        continue;
+                    }
 
-                FileHelper.deleteFiles(f);
+                    FileHelper.deleteFiles(f);
+                }
             }
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);

--
Gitblit v1.9.3