From d9b494a11c4f637f39e56e6f099d14267e63bff3 Mon Sep 17 00:00:00 2001 From: liuchen <23082234@qq.com> Date: Fri, 26 Jan 2024 10:58:00 +0800 Subject: [PATCH] =?UTF-8?q?config=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/win/mq/config/MQConfigure.java | 15 ++++++++++ .../java/com/win/mq/config/RMQConfigure.java | 28 ------------------- .../win/mq/controller/ProduceController.java | 7 ++--- src/main/java/com/win/mq/utils/FileUtil.java | 4 +-- 4 files changed, 19 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/win/mq/config/MQConfigure.java delete mode 100644 src/main/java/com/win/mq/config/RMQConfigure.java diff --git a/src/main/java/com/win/mq/config/MQConfigure.java b/src/main/java/com/win/mq/config/MQConfigure.java new file mode 100644 index 0000000..937b283 --- /dev/null +++ b/src/main/java/com/win/mq/config/MQConfigure.java @@ -0,0 +1,15 @@ +package com.win.mq.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Data +@Configuration +@ConfigurationProperties(prefix = "rocketmq.config") +public class MQConfigure { + + private String dataPath; + +} \ No newline at end of file diff --git a/src/main/java/com/win/mq/config/RMQConfigure.java b/src/main/java/com/win/mq/config/RMQConfigure.java deleted file mode 100644 index bdc4e72..0000000 --- a/src/main/java/com/win/mq/config/RMQConfigure.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.win.mq.config; - - -import lombok.Data; -import org.apache.commons.lang3.StringUtils; -import org.apache.rocketmq.common.MixAll; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.web.server.ErrorPage; -import org.springframework.boot.web.server.ErrorPageRegistrar; -import org.springframework.boot.web.server.ErrorPageRegistry; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpStatus; - -import java.io.File; - -import static org.apache.rocketmq.client.ClientConfig.SEND_MESSAGE_WITH_VIP_CHANNEL_PROPERTY; - -@Data -@Configuration -@ConfigurationProperties(prefix = "rocketmq.config") -public class RMQConfigure { - - private String dataPath; - -} \ No newline at end of file diff --git a/src/main/java/com/win/mq/controller/ProduceController.java b/src/main/java/com/win/mq/controller/ProduceController.java index 5d415b6..7dcac2c 100644 --- a/src/main/java/com/win/mq/controller/ProduceController.java +++ b/src/main/java/com/win/mq/controller/ProduceController.java @@ -1,7 +1,7 @@ package com.win.mq.controller; import com.win.mq.common.CommonResult; -import com.win.mq.config.RMQConfigure; +import com.win.mq.config.MQConfigure; import com.win.mq.exception.GlobalErrorCodeConstants; import com.win.mq.rocket.RocketMQProducer; import com.win.mq.utils.FileUtil; @@ -12,12 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.DigestUtils; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.File; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @Slf4j @@ -26,7 +23,7 @@ import java.util.List; public class ProduceController { @Autowired - private RMQConfigure configure; + private MQConfigure configure; @Autowired private FileUtil fileUtil; @Autowired diff --git a/src/main/java/com/win/mq/utils/FileUtil.java b/src/main/java/com/win/mq/utils/FileUtil.java index 43115c1..50f3fe4 100644 --- a/src/main/java/com/win/mq/utils/FileUtil.java +++ b/src/main/java/com/win/mq/utils/FileUtil.java @@ -1,6 +1,6 @@ package com.win.mq.utils; -import com.win.mq.config.RMQConfigure; +import com.win.mq.config.MQConfigure; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -14,7 +14,7 @@ import java.io.IOException; @Component public class FileUtil { @Autowired - private RMQConfigure configure; + private MQConfigure configure; private String[] defaultTags; public String[] readTags(String fileName) {