dromara-org
/
dynamic-tp
mirror of https://github.com/dromara/dynamic-tp.git
16
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

format code

This commit is contained in:
yanhom 2024-03-09 15:56:37 +08:00
parent e8b5bf3c8d
commit d0412f6162
6 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
adapter/adapter-dubbo/src/main/java/org/dromara/dynamictp/adapter/dubbo/apache/ApacheDubboDtpAdapter.java
View File

@ -95,27 +95,29 @@ public class ApacheDubboDtpAdapter extends AbstractDtpAdapter {
if (DubboVersion.compare(DubboVersion.VERSION_2_7_5, currVersion) > 0) {
// 当前dubbo版本 < 2.7.5
val handlers = JVMTI.getInstances(WrappedChannelHandler.class);
if (CollectionUtils.isNotEmpty(handlers)) {
DataStore dataStore = ExtensionLoader.getExtensionLoader(DataStore.class).getDefaultExtension();
handlers.forEach(handler -> {
//获取WrappedChannelHandler中的原始线程池
val originExecutor = ReflectionUtil.getFieldValue(EXECUTOR_FIELD, handler);
if (originExecutor instanceof ThreadPoolExecutor) {
URL url = handler.getUrl();
//低版本跳过消费者线程池配置
if (!CONSUMER_SIDE.equalsIgnoreCase(url.getParameter(SIDE_KEY))) {
String port = String.valueOf(url.getPort());
String tpName = genTpName(port);
//增强原始线程池,替换为动态线程池代理
enhanceOriginExecutor(tpName, (ThreadPoolExecutor) originExecutor, EXECUTOR_FIELD, handler);
//获取增强后的新动态线程池
Object newExexutor = ReflectionUtil.getFieldValue(EXECUTOR_FIELD, handler);
//替换dataStore中的线程池
dataStore.put(EXECUTOR_SERVICE_COMPONENT_KEY, port, newExexutor);
}
}
});
if (CollectionUtils.isEmpty(handlers)) {
return;
}
DataStore dataStore = ExtensionLoader.getExtensionLoader(DataStore.class).getDefaultExtension();
handlers.forEach(handler -> {
//获取WrappedChannelHandler中的原始线程池
val originExecutor = ReflectionUtil.getFieldValue(EXECUTOR_FIELD, handler);
if (!(originExecutor instanceof ExecutorService)) {
return;
}
URL url = handler.getUrl();
//低版本跳过消费者线程池配置
if (!CONSUMER_SIDE.equalsIgnoreCase(url.getParameter(SIDE_KEY))) {
String port = String.valueOf(url.getPort());
String tpName = genTpName(port);
//增强原始线程池,替换为动态线程池代理
enhanceOriginExecutor(tpName, (ThreadPoolExecutor) originExecutor, EXECUTOR_FIELD, handler);
//获取增强后的新动态线程池
Object newExexutor = ReflectionUtil.getFieldValue(EXECUTOR_FIELD, handler);
//替换dataStore中的线程池
dataStore.put(EXECUTOR_SERVICE_COMPONENT_KEY, port, newExexutor);
}
});
return;
}

1
common/src/main/java/org/dromara/dynamictp/common/notifier/DingNotifier.java
View File

@ -98,5 +98,4 @@ public class DingNotifier extends AbstractHttpNotifier {
}
return builder.build();
}
}

3
common/src/main/java/org/dromara/dynamictp/common/notifier/LarkNotifier.java
View File

@ -102,10 +102,9 @@ public class LarkNotifier extends AbstractHttpNotifier {
}
UrlBuilder builder = UrlBuilder.of(Optional.ofNullable(platform.getWebhook()).orElse(LarkNotifyConst.LARK_WEBHOOK));
List<String> segments = builder.getPath().getSegments();
if (StringUtils.isNotBlank(platform.getUrlKey()) && !Objects.equals(platform.getUrlKey(), segments.get(segments.size() - 1))) {
if (!Objects.equals(platform.getUrlKey(), segments.get(segments.size() - 1))) {
builder.addPath(platform.getUrlKey());
}
return builder.build();
}
}

3
common/src/main/java/org/dromara/dynamictp/common/notifier/WechatNotifier.java
View File

@ -58,10 +58,9 @@ public class WechatNotifier extends AbstractHttpNotifier {
return platform.getWebhook();
}
UrlBuilder builder = UrlBuilder.of(Optional.ofNullable(platform.getWebhook()).orElse(WechatNotifyConst.WECHAT_WEB_HOOK));
if (StringUtils.isNotBlank(platform.getUrlKey()) && StringUtils.isBlank(builder.getQuery().get(WechatNotifyConst.KEY_PARAM))) {
if (StringUtils.isBlank(builder.getQuery().get(WechatNotifyConst.KEY_PARAM))) {
builder.addQuery(WechatNotifyConst.KEY_PARAM, platform.getUrlKey());
}
return builder.build();
}
}

2
dependencies/pom.xml vendored
View File

@ -20,7 +20,7 @@
<logback.version>1.2.10</logback.version>
<log4j.version>2.17.1</log4j.version>
<hutool.version>5.8.22</hutool.version>
<hutool.version>5.8.25</hutool.version>
<guava.version>31.1-jre</guava.version>
<jackson-core.version>2.13.4</jackson-core.version>
<jackson-databind.version>2.13.4</jackson-databind.version>

2
extension/extension-notify-yunzhijia/src/main/java/org/dromara/dynamictp/extension/notify/yunzhijia/YunZhiJiaNotifier.java
View File

@ -59,7 +59,7 @@ public class YunZhiJiaNotifier extends AbstractHttpNotifier {
if (StringUtils.isBlank(builder.getQuery().get(YunZhiJiaNotifyConst.YZJ_TYPE_PARAM))) {
builder.addQuery(YunZhiJiaNotifyConst.YZJ_TYPE_PARAM, 0);
}
if (StringUtils.isNotBlank(platform.getUrlKey()) && StringUtils.isBlank(builder.getQuery().get(YunZhiJiaNotifyConst.YZJ_TOKEN_PARAM))) {
if (StringUtils.isBlank(builder.getQuery().get(YunZhiJiaNotifyConst.YZJ_TOKEN_PARAM))) {
builder.addQuery(YunZhiJiaNotifyConst.YZJ_TOKEN_PARAM, platform.getUrlKey());
}
return builder.build();