From b2eda32b99ddc336372f1cd601d4df23d5f729a8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/config/properties/GunsProperties.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/config/properties/GunsProperties.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/config/properties/GunsProperties.java
index 3cb83df..8d45b60 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/config/properties/GunsProperties.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/config/properties/GunsProperties.java
@@ -1,12 +1,10 @@
 package com.supersavedriving.driver.config.properties;
 
+import com.supersavedriving.driver.core.util.ToolUtil;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
-
-import static com.supersavedriving.driver.core.util.ToolUtil.getTempPath;
-import static com.supersavedriving.driver.core.util.ToolUtil.isEmpty;
 
 /**
  * guns项目配置
@@ -42,8 +40,8 @@
 
     public String getFileUploadPath() {
         //如果没有写文件上传路径,保存到临时目录
-        if (isEmpty(fileUploadPath)) {
-            return getTempPath();
+        if (ToolUtil.isEmpty(fileUploadPath)) {
+            return ToolUtil.getTempPath();
         } else {
             //判断有没有结尾符,没有得加上
             if (!fileUploadPath.endsWith(File.separator)) {

--
Gitblit v1.7.1