From 28fed91df94b0b45ff3f7bab94ad1ce5c09ddb24 Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 15 Sep 2023 15:55:12 +0800 Subject: [PATCH] :recycle: Refactoring code. PigXLogProperties.java to PigxLogProperties.java --- .../com/pig4cloud/pigx/common/log/LogAutoConfiguration.java | 6 +++--- .../{PigXLogProperties.java => PigxLogProperties.java} | 4 ++-- .../com/pig4cloud/pigx/common/log/event/SysLogListener.java | 4 ++-- .../com/pig4cloud/pigx/common/log/util/SysLogUtils.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/config/{PigXLogProperties.java => PigxLogProperties.java} (94%) diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/LogAutoConfiguration.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/LogAutoConfiguration.java index a6f4ac79a..4b443205b 100644 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/LogAutoConfiguration.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/LogAutoConfiguration.java @@ -22,7 +22,7 @@ package com.pig4cloud.pigx.common.log; import com.pig4cloud.pigx.admin.api.feign.RemoteLogService; import com.pig4cloud.pigx.common.core.util.KeyStrResolver; import com.pig4cloud.pigx.common.log.aspect.SysLogAspect; -import com.pig4cloud.pigx.common.log.config.PigXLogProperties; +import com.pig4cloud.pigx.common.log.config.PigxLogProperties; import com.pig4cloud.pigx.common.log.event.SysLogListener; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -38,12 +38,12 @@ import org.springframework.scheduling.annotation.EnableAsync; */ @EnableAsync @Configuration(proxyBeanMethods = false) -@EnableConfigurationProperties(PigXLogProperties.class) +@EnableConfigurationProperties(PigxLogProperties.class) @ConditionalOnProperty(value = "pigx.log.enabled", matchIfMissing = true) public class LogAutoConfiguration { @Bean - public SysLogListener sysLogListener(PigXLogProperties logProperties, RemoteLogService remoteLogService) { + public SysLogListener sysLogListener(PigxLogProperties logProperties, RemoteLogService remoteLogService) { return new SysLogListener(remoteLogService, logProperties); } diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/config/PigXLogProperties.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/config/PigxLogProperties.java similarity index 94% rename from pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/config/PigXLogProperties.java rename to pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/config/PigxLogProperties.java index b0f14efdc..4b500ad92 100644 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/config/PigXLogProperties.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/config/PigxLogProperties.java @@ -30,8 +30,8 @@ import java.util.List; */ @Getter @Setter -@ConfigurationProperties(PigXLogProperties.PREFIX) -public class PigXLogProperties { +@ConfigurationProperties(PigxLogProperties.PREFIX) +public class PigxLogProperties { public static final String PREFIX = "pigx.log"; diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/event/SysLogListener.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/event/SysLogListener.java index dc637201c..dba01c182 100755 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/event/SysLogListener.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/event/SysLogListener.java @@ -26,7 +26,7 @@ import com.pig4cloud.pigx.admin.api.dto.SysLogDTO; import com.pig4cloud.pigx.admin.api.feign.RemoteLogService; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.jackson.PigxJavaTimeModule; -import com.pig4cloud.pigx.common.log.config.PigXLogProperties; +import com.pig4cloud.pigx.common.log.config.PigxLogProperties; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -49,7 +49,7 @@ public class SysLogListener implements InitializingBean { private final RemoteLogService remoteLogService; - private final PigXLogProperties logProperties; + private final PigxLogProperties logProperties; @SneakyThrows @Async diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java index c5e333bc8..7b228ec85 100755 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/util/SysLogUtils.java @@ -24,7 +24,7 @@ import cn.hutool.extra.spring.SpringUtil; import cn.hutool.http.HttpUtil; import com.pig4cloud.pigx.admin.api.dto.SysLogDTO; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; -import com.pig4cloud.pigx.common.log.config.PigXLogProperties; +import com.pig4cloud.pigx.common.log.config.PigxLogProperties; import lombok.experimental.UtilityClass; import org.springframework.core.StandardReflectionParameterNameDiscoverer; import org.springframework.expression.EvaluationContext; @@ -64,7 +64,7 @@ public class SysLogUtils { sysLog.setServiceId(getClientId()); // get 参数脱敏 - PigXLogProperties logProperties = SpringUtil.getBean(PigXLogProperties.class); + PigxLogProperties logProperties = SpringUtil.getBean(PigxLogProperties.class); Map paramsMap = MapUtil.removeAny(request.getParameterMap(), ArrayUtil.toArray(logProperties.getExcludeFields(), String.class)); sysLog.setParams(HttpUtil.toParams(paramsMap));