diff --git a/doc/images/logo.png b/doc/images/logo.png index b31e90227..f76c41401 100644 Binary files a/doc/images/logo.png and b/doc/images/logo.png differ diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/cache/GroupVersionCache.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/cache/GroupVersionCache.java index c51843ab1..9bd6754fb 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/cache/GroupVersionCache.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/cache/GroupVersionCache.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.client.core.cache; import com.aizuda.easy.retry.client.core.client.request.ConfigHttpRequestHandler; import com.aizuda.easy.retry.client.core.client.request.RequestParam; -import com.aizuda.easy.retry.client.core.client.response.XRetryResponse; +import com.aizuda.easy.retry.client.core.client.response.EasyRetryResponse; import com.aizuda.easy.retry.client.core.Lifecycle; import com.aizuda.easy.retry.client.core.client.NettyHttpConnectClient; import com.aizuda.easy.retry.common.core.context.SpringContext; @@ -63,7 +63,7 @@ public class GroupVersionCache implements Lifecycle { XRetryRequest xRetryRequest = new XRetryRequest(getVersion()); ConfigHttpRequestHandler configHttpRequestHandler = SpringContext.getBeanByType(ConfigHttpRequestHandler.class); - XRetryResponse.cache(xRetryRequest, configHttpRequestHandler.callable()); + EasyRetryResponse.cache(xRetryRequest, configHttpRequestHandler.callable()); NettyHttpConnectClient.send(configHttpRequestHandler.method(), configHttpRequestHandler.getHttpUrl( new RequestParam()), configHttpRequestHandler.body(xRetryRequest)); diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/NettyHttpClientHandler.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/NettyHttpClientHandler.java index c19e13698..e96f70734 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/NettyHttpClientHandler.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/NettyHttpClientHandler.java @@ -1,8 +1,8 @@ package com.aizuda.easy.retry.client.core.client; import com.aizuda.easy.retry.client.core.client.request.BeatHttpRequestHandler; -import com.aizuda.easy.retry.client.core.client.response.XRetryResponse; -import com.aizuda.easy.retry.client.core.config.XRetryProperties; +import com.aizuda.easy.retry.client.core.client.response.EasyRetryResponse; +import com.aizuda.easy.retry.client.core.config.EasyRetryProperties; import com.aizuda.easy.retry.client.core.client.request.RequestParam; import com.aizuda.easy.retry.common.core.context.SpringContext; import com.aizuda.easy.retry.common.core.log.LogUtils; @@ -45,7 +45,7 @@ public class NettyHttpClientHandler extends SimpleChannelInboundHandler { - XRetryProperties xRetryProperties = SpringContext.getBeanByType(XRetryProperties.class); - XRetryProperties.ServerConfig server = xRetryProperties.getServer(); + EasyRetryProperties easyRetryProperties = SpringContext.getBeanByType(EasyRetryProperties.class); + EasyRetryProperties.ServerConfig server = easyRetryProperties.getServer(); LogUtils.info(log, "Reconnecting to:" + server.getHost() + ":" + server.getPort()); NettyHttpConnectClient.connect(); }, 10, TimeUnit.SECONDS); @@ -107,7 +107,7 @@ public class NettyHttpClientHandler extends SimpleChannelInboundHandler> responsePool = new ConcurrentHashMap<>(); - public XRetryResponse(XRetryRequest retryRequest, Consumer callable) { + public EasyRetryResponse(XRetryRequest retryRequest, Consumer callable) { responsePool.put(retryRequest.getRequestId(), callable); } diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/config/XRetryProperties.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/config/EasyRetryProperties.java similarity index 87% rename from easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/config/XRetryProperties.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/config/EasyRetryProperties.java index c536abf36..474a6e6be 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/config/XRetryProperties.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/config/EasyRetryProperties.java @@ -17,7 +17,7 @@ import java.util.Objects; @ConfigurationProperties(prefix = "easy-retry") @Getter @Setter -public class XRetryProperties { +public class EasyRetryProperties { /** * 服务端对应的group @@ -43,7 +43,7 @@ public class XRetryProperties { } public static String getGroup() { - XRetryProperties properties = SpringContext.applicationContext.getBean(XRetryProperties.class); + EasyRetryProperties properties = SpringContext.applicationContext.getBean(EasyRetryProperties.class); return Objects.requireNonNull(properties).group; } } diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/XRetryListener.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/EasyRetryListener.java similarity index 90% rename from easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/XRetryListener.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/EasyRetryListener.java index 6e6dd7284..811ba057a 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/XRetryListener.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/EasyRetryListener.java @@ -4,7 +4,7 @@ package com.aizuda.easy.retry.client.core.event; * @author: www.byteblogs.com * @date : 2022-03-03 15:50 */ -public interface XRetryListener { +public interface EasyRetryListener { void beforeRetry(String sceneName, String executorClassName, Object[] params); void successOnRetry(Object result, String sceneName, String executorClassName); void failureOnRetry(String sceneName, String executorClassName, Throwable e); diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/SimpleXRetryListener.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/SimpleEasyRetryListener.java similarity index 94% rename from easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/SimpleXRetryListener.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/SimpleEasyRetryListener.java index c643e9113..eb3f69abb 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/SimpleXRetryListener.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/event/SimpleEasyRetryListener.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; */ @Component @Slf4j -public class SimpleXRetryListener implements XRetryListener { +public class SimpleEasyRetryListener implements EasyRetryListener { @Override public void beforeRetry(String sceneName, String executorClassName, Object[] params) { diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/RetryAspect.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/RetryAspect.java index 5973654e0..2b6454088 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/RetryAspect.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/RetryAspect.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.client.core.intercepter; import cn.hutool.core.util.StrUtil; import com.aizuda.easy.retry.client.core.cache.GroupVersionCache; -import com.aizuda.easy.retry.client.core.config.XRetryProperties; +import com.aizuda.easy.retry.client.core.config.EasyRetryProperties; import com.aizuda.easy.retry.client.core.exception.EasyRetryClientException; import com.aizuda.easy.retry.client.core.strategy.RetryStrategy; import com.aizuda.easy.retry.client.core.annotation.Retryable; @@ -157,10 +157,10 @@ public class RetryAspect implements Ordered { AlarmContext context = AlarmContext.build() .text(retryErrorMoreThresholdTextMessageFormatter, EnvironmentUtils.getActiveProfile(), - XRetryProperties.getGroup(), + EasyRetryProperties.getGroup(), LocalDateTime.now().format(formatter), e.getMessage()) - .title("重试组件异常:[{}]", XRetryProperties.getGroup()) + .title("重试组件异常:[{}]", EasyRetryProperties.getGroup()) .notifyAttribute(notifyAttribute.getNotifyAttribute()); Alarm alarmType = altinAlarmFactory.getAlarmType(notifyAttribute.getNotifyType()); diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportHandler.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportHandler.java index 2d81ab831..7dc0a34a4 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportHandler.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportHandler.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.client.core.report; import com.aizuda.easy.retry.client.core.BizIdGenerate; import com.aizuda.easy.retry.client.core.RetryArgSerializer; -import com.aizuda.easy.retry.client.core.config.XRetryProperties; +import com.aizuda.easy.retry.client.core.config.EasyRetryProperties; import com.aizuda.easy.retry.client.core.Lifecycle; import com.aizuda.easy.retry.client.core.cache.RetryerInfoCache; import com.aizuda.easy.retry.client.core.exception.EasyRetryClientException; @@ -76,7 +76,7 @@ public class ReportHandler implements Lifecycle { retryTaskDTO.setBizId(bizId); retryTaskDTO.setExecutorName(targetClassName); retryTaskDTO.setArgsStr(serialize); - retryTaskDTO.setGroupName(XRetryProperties.getGroup()); + retryTaskDTO.setGroupName(EasyRetryProperties.getGroup()); retryTaskDTO.setSceneName(scene); String bizNoSpel = retryerInfo.getBizNo(); diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java index f43185b55..8e3d90859 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java @@ -2,8 +2,8 @@ package com.aizuda.easy.retry.client.core.report; import com.aizuda.easy.retry.client.core.RetryExecutor; import com.aizuda.easy.retry.client.core.RetryExecutorParameter; -import com.aizuda.easy.retry.client.core.client.response.XRetryResponse; -import com.aizuda.easy.retry.client.core.config.XRetryProperties; +import com.aizuda.easy.retry.client.core.client.response.EasyRetryResponse; +import com.aizuda.easy.retry.client.core.config.EasyRetryProperties; import com.github.rholder.retry.*; import com.google.common.base.Predicate; import com.aizuda.easy.retry.client.core.cache.GroupVersionCache; @@ -59,7 +59,7 @@ public class ReportListener implements Listener { XRetryRequest xRetryRequest = new XRetryRequest(list); ReportRetryInfoHttpRequestHandler requestHandler = SpringContext.getBeanByType(ReportRetryInfoHttpRequestHandler.class); - XRetryResponse.cache(xRetryRequest, requestHandler.callable()); + EasyRetryResponse.cache(xRetryRequest, requestHandler.callable()); NettyHttpConnectClient.send(requestHandler.method(), requestHandler.getHttpUrl(new RequestParam()), requestHandler.body(xRetryRequest)); return null; @@ -118,10 +118,10 @@ public class ReportListener implements Listener { AlarmContext context = AlarmContext.build() .text(reportErrorTextMessageFormatter, EnvironmentUtils.getActiveProfile(), - XRetryProperties.getGroup(), + EasyRetryProperties.getGroup(), LocalDateTime.now().format(formatter), e.getMessage()) - .title("上报异常:[{}]", XRetryProperties.getGroup()) + .title("上报异常:[{}]", EasyRetryProperties.getGroup()) .notifyAttribute(notifyAttribute.getNotifyAttribute()); AltinAlarmFactory altinAlarmFactory = SpringContext.getBeanByType(AltinAlarmFactory.class); diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java index f274220ce..67b5fb16b 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.client.core.strategy; import com.aizuda.easy.retry.client.core.RetryExecutor; import com.aizuda.easy.retry.client.core.RetryExecutorParameter; -import com.aizuda.easy.retry.client.core.event.XRetryListener; +import com.aizuda.easy.retry.client.core.event.EasyRetryListener; import com.aizuda.easy.retry.client.core.intercepter.RetrySiteSnapshot; import com.github.rholder.retry.Retryer; import com.github.rholder.retry.StopStrategy; @@ -27,7 +27,7 @@ import java.util.function.Consumer; public abstract class AbstractRetryStrategies implements RetryStrategy { @Autowired - private List XRetryListeners; + private List EasyRetryListeners; @Override public RetryerResultContext openRetry(String sceneName, String executorClassName, Object[] params) { @@ -52,8 +52,8 @@ public abstract class AbstractRetryStrategies implements RetryStrategy { retryerResultContext.setRetryerInfo(retryerInfo); try { - for (XRetryListener XRetryListener : XRetryListeners) { - XRetryListener.beforeRetry(sceneName, executorClassName, params); + for (EasyRetryListener EasyRetryListener : EasyRetryListeners) { + EasyRetryListener.beforeRetry(sceneName, executorClassName, params); } Object result = retryExecutor.call(retryer, doGetCallable(retryExecutor, params), getRetryErrorConsumer(retryerResultContext, params), getRetrySuccessConsumer(retryerResultContext)); @@ -79,8 +79,8 @@ public abstract class AbstractRetryStrategies implements RetryStrategy { Object result = retryerResultContext.getResult(); RetryerInfo retryerInfo = retryerResultContext.getRetryerInfo(); - for (XRetryListener XRetryListener : XRetryListeners) { - XRetryListener.successOnRetry(result, retryerInfo.getScene(), retryerInfo.getExecutorClassName()); + for (EasyRetryListener EasyRetryListener : EasyRetryListeners) { + EasyRetryListener.successOnRetry(result, retryerInfo.getScene(), retryerInfo.getExecutorClassName()); } doRetrySuccessConsumer(retryerResultContext).accept(retryerResultContext); @@ -99,8 +99,9 @@ public abstract class AbstractRetryStrategies implements RetryStrategy { RetryerInfo retryerInfo = context.getRetryerInfo(); try { - for (XRetryListener XRetryListener : XRetryListeners) { - XRetryListener.failureOnRetry(retryerInfo.getScene(), retryerInfo.getExecutorClassName(), throwable); + for (EasyRetryListener EasyRetryListener : EasyRetryListeners) { + EasyRetryListener + .failureOnRetry(retryerInfo.getScene(), retryerInfo.getExecutorClassName(), throwable); } } catch (Exception e) { log.error("失败监听者模式 处理失败 ", e); diff --git a/frontend/public/logo.png b/frontend/public/logo.png index 70c111e1f..f76c41401 100644 Binary files a/frontend/public/logo.png and b/frontend/public/logo.png differ