format code

dromara · Mar 9, 2024 · d0412f6 · d0412f6
1 parent e8b5bf3
commit d0412f6
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 27 deletions.
diff --git a/...dubbo/src/main/java/org/dromara/dynamictp/adapter/dubbo/apache/ApacheDubboDtpAdapter.java b/...dubbo/src/main/java/org/dromara/dynamictp/adapter/dubbo/apache/ApacheDubboDtpAdapter.java
@@ -95,27 +95,29 @@ protected void initialize() {
         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;
         }
 

diff --git a/common/src/main/java/org/dromara/dynamictp/common/notifier/DingNotifier.java b/common/src/main/java/org/dromara/dynamictp/common/notifier/DingNotifier.java
@@ -98,5 +98,4 @@ private String getTargetUrl(String secret, String accessToken, String webhook) {
         }
         return builder.build();
     }
-
 }
diff --git a/common/src/main/java/org/dromara/dynamictp/common/notifier/LarkNotifier.java b/common/src/main/java/org/dromara/dynamictp/common/notifier/LarkNotifier.java
@@ -102,10 +102,9 @@ protected String buildUrl(NotifyPlatform platform) {
         }
         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();
     }
-
 }
diff --git a/common/src/main/java/org/dromara/dynamictp/common/notifier/WechatNotifier.java b/common/src/main/java/org/dromara/dynamictp/common/notifier/WechatNotifier.java
@@ -58,10 +58,9 @@ protected String buildUrl(NotifyPlatform platform) {
             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();
     }
-
 }
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -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>

diff --git a/...jia/src/main/java/org/dromara/dynamictp/extension/notify/yunzhijia/YunZhiJiaNotifier.java b/...jia/src/main/java/org/dromara/dynamictp/extension/notify/yunzhijia/YunZhiJiaNotifier.java
@@ -59,7 +59,7 @@ protected String buildUrl(NotifyPlatform platform) {
         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();