From 45f4df3ab6dbbadabaaaaa3bd507a09efde729fa Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 24 Jul 2023 09:02:51 +0800 Subject: [PATCH] =?UTF-8?q?properties=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0base-core=E5=85=AC=E7=94=A8=E5=8C=85?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common}/properties/SpectrumPathProperties.java | 4 ++-- .../java/org/jeecg/common}/properties/TaskProperties.java | 2 +- .../src/main/java/org/jeecg/modules/AutoProcessManager.java | 4 ++-- .../java/org/jeecg/modules/email/EmailParsingActuator.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename {jeecg-module-auto-process/src/main/java/org/jeecg/modules => jeecg-boot-base-core/src/main/java/org/jeecg/common}/properties/SpectrumPathProperties.java (86%) rename {jeecg-module-auto-process/src/main/java/org/jeecg/modules => jeecg-boot-base-core/src/main/java/org/jeecg/common}/properties/TaskProperties.java (95%) diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/properties/SpectrumPathProperties.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/SpectrumPathProperties.java similarity index 86% rename from jeecg-module-auto-process/src/main/java/org/jeecg/modules/properties/SpectrumPathProperties.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/SpectrumPathProperties.java index 11794f5c..ba2ac55a 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/properties/SpectrumPathProperties.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/SpectrumPathProperties.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.properties; +package org.jeecg.common.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -13,7 +13,7 @@ import java.util.Map; */ @Data @Component -@ConfigurationProperties(prefix = "file-system") +@ConfigurationProperties(prefix = "filesystem") public class SpectrumPathProperties implements Serializable { /** diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/properties/TaskProperties.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/TaskProperties.java similarity index 95% rename from jeecg-module-auto-process/src/main/java/org/jeecg/modules/properties/TaskProperties.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/TaskProperties.java index f3d3b2db..f8789796 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/properties/TaskProperties.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/TaskProperties.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.properties; +package org.jeecg.common.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java index 18ef29ae..492d919e 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java @@ -9,8 +9,8 @@ import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.email.EmailParsingActuator; import org.jeecg.modules.emuns.SysMailEnableType; import org.jeecg.modules.email.EmailProperties; -import org.jeecg.modules.properties.SpectrumPathProperties; -import org.jeecg.modules.properties.TaskProperties; +import org.jeecg.common.properties.SpectrumPathProperties; +import org.jeecg.common.properties.TaskProperties; import org.jeecg.modules.service.ISysMailService; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/email/EmailParsingActuator.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/email/EmailParsingActuator.java index 4b06c8c1..f33d8c93 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/email/EmailParsingActuator.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/email/EmailParsingActuator.java @@ -3,7 +3,7 @@ package org.jeecg.modules.email; import org.apache.commons.lang3.ArrayUtils; import org.jeecg.common.email.EmailServiceManager; import org.jeecg.common.util.FTPUtil; -import org.jeecg.modules.properties.TaskProperties; +import org.jeecg.common.properties.TaskProperties; import org.jeecg.modules.spectrum.SpectrumParsingActuator; import org.springframework.scheduling.concurrent.CustomizableThreadFactory; import javax.mail.Message;