From 42128cb41c46b240f18f4aa132c142db0138b3ed Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 17 十月 2022 17:53:49 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/PathHelper.java |   59 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/PathHelper.java b/src/main/java/com/lf/server/helper/PathHelper.java
index 327240e..fe2eaca 100644
--- a/src/main/java/com/lf/server/helper/PathHelper.java
+++ b/src/main/java/com/lf/server/helper/PathHelper.java
@@ -1,6 +1,7 @@
 package com.lf.server.helper;
 
 import com.lf.server.config.PropertiesConfig;
+import com.lf.server.entity.all.SettingData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,9 +14,7 @@
 @Component
 public class PathHelper {
     @Autowired
-    private PropertiesConfig propertiesConfig;
-
-    private static int MAX_FILES = 2000;
+    private PropertiesConfig config;
 
     private static int importPath = 1;
 
@@ -25,14 +24,34 @@
 
     private static int sharePath = 1;
 
+    public PropertiesConfig getConfig() {
+        return config;
+    }
+
+    public static int getImportPath() {
+        return importPath;
+    }
+
+    public static int getExportPath() {
+        return exportPath;
+    }
+
+    public static int getUploadPath() {
+        return uploadPath;
+    }
+
+    public static int getSharePath() {
+        return sharePath;
+    }
+
     /**
      * 鍒濆鍖�
      */
     public void init() {
-        importPath = getSubPath(propertiesConfig.getImportPath(), importPath);
-        exportPath = getSubPath(propertiesConfig.getExportPath(), exportPath);
-        uploadPath = getSubPath(propertiesConfig.getUploadPath(), uploadPath);
-        sharePath = getSubPath(propertiesConfig.getSharePath(), sharePath);
+        importPath = getSubPath(config.getImportPath(), importPath);
+        exportPath = getSubPath(config.getExportPath(), exportPath);
+        uploadPath = getSubPath(config.getUploadPath(), uploadPath);
+        sharePath = getSubPath(config.getSharePath(), sharePath);
     }
 
     private static int getSubPath(String parentPath, int subPath) {
@@ -46,7 +65,7 @@
             }
 
             File[] files = file.listFiles();
-            if (files.length < MAX_FILES) {
+            if (files.length < SettingData.MAX_FILES) {
                 return subPath;
             }
 
@@ -59,10 +78,10 @@
      *
      * @return
      */
-    public String getImportPath() {
-        importPath = getSubPath(propertiesConfig.getImportPath(), importPath);
+    public String getImportFullPath() {
+        importPath = getSubPath(config.getImportPath(), importPath);
 
-        return propertiesConfig.getImportPath() + File.separator + importPath;
+        return config.getImportPath() + File.separator + importPath;
     }
 
     /**
@@ -70,10 +89,10 @@
      *
      * @return
      */
-    public String getExportPath() {
-        exportPath = getSubPath(propertiesConfig.getExportPath(), exportPath);
+    public String getExportFullPath() {
+        exportPath = getSubPath(config.getExportPath(), exportPath);
 
-        return propertiesConfig.getExportPath() + File.separator + exportPath;
+        return config.getExportPath() + File.separator + exportPath;
     }
 
     /**
@@ -81,10 +100,10 @@
      *
      * @return
      */
-    public String getUploadPath() {
-        uploadPath = getSubPath(propertiesConfig.getUploadPath(), uploadPath);
+    public String getUploadFullPath() {
+        uploadPath = getSubPath(config.getUploadPath(), uploadPath);
 
-        return propertiesConfig.getUploadPath() + File.separator + uploadPath;
+        return config.getUploadPath() + File.separator + uploadPath;
     }
 
     /**
@@ -92,9 +111,9 @@
      *
      * @return
      */
-    public String getSharePath() {
-        sharePath = getSubPath(propertiesConfig.getSharePath(), sharePath);
+    public String getShareFullPath() {
+        sharePath = getSubPath(config.getSharePath(), sharePath);
 
-        return propertiesConfig.getSharePath() + File.separator + sharePath;
+        return config.getSharePath() + File.separator + sharePath;
     }
 }

--
Gitblit v1.9.3