feat(*): 优化代码

- 优化代码

feat(*): 优化代码
- 优化代码
张志伟
1 parent 67926cfa
Showing 6 changed files with 29 additions and 59 deletions
fw-hestia-common/src/main/java/cn/fw/hestia/common/utils/DateUtil.java
fw-hestia-common/src/main/java/cn/fw/hestia/common/utils/MessageFormatUtil.kt
fw-hestia-common/src/main/java/cn/fw/hestia/common/utils/StringUtils.java
fw-hestia-common/src/main/java/cn/fw/hestia/common/utils/ThreadPoolUtil.kt
fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/api/MessageCenterServiceImpl.kt
fw-hestia-server/src/main/java/cn/fw/hestia/server/task/SendMessageTask.kt
@@ -17,7 +17,7 @@ import java.util.Objects;
  */
 public final class DateUtil {
  
-    static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+    private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  
     /**
      * 默认构造器
-package cn.fw.hestia.common.utils;
+package cn.fw.hestia.common.utils
  
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.text.MessageFormat
  
 /**
  * @author kurisu
  * @description 占位符转换工具
  * @date 2019/5/30.
  */
-public class MessageFormatUtil {
-
-    public static String MessageFormatTransfer(String pattern, Object... arguments) {
-        List<Object> param = new ArrayList<>();
-        for (int i = 0; i < arguments.length; i++) {
-            if (arguments[i] instanceof Number) {
-                param.add(String.valueOf(arguments[i]));
-            }else {
-                param.add(arguments[i]);
+object MessageFormatUtil {
+    fun messageFormatTransfer(pattern: String?, vararg arguments: Any): String {
+        val param: MutableList<Any> = ArrayList()
+        for (i in arguments.indices) {
+            if (arguments[i] is Number) {
+                param.add(arguments[i].toString())
+            } else {
+                param.add(arguments[i])
             }
         }
-        return MessageFormat.format(pattern, param.toArray());
-    }
-
-    public static void main(String[] args) {
-        System.out.println("示例：" + MessageFormatTransfer("crm:valhalla:save:lock:key:{0}:{1}", 11111L, new Date()));
+        return MessageFormat.format(pattern, *param.toTypedArray())
     }
-
-}
+}
 \ No newline at end of file
@@ -27,7 +27,7 @@ public final class StringUtils {
      */
     public static final String regEx = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]";
  
-    public static final String regNo = "^[-\\+]?[\\d]*$";
+    public static final String regNo = "^[-+]?\\d*$";
  
     private StringUtils() {
     }
-package cn.fw.hestia.common.utils;
+package cn.fw.hestia.common.utils
  
-import cn.hutool.core.thread.ExecutorBuilder;
-import cn.hutool.core.thread.NamedThreadFactory;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
+import cn.hutool.core.thread.ExecutorBuilder
+import cn.hutool.core.thread.NamedThreadFactory
+import java.util.concurrent.ExecutorService
  
 /**
  * ThreadPoolUtil
@@ -15,32 +13,13 @@ import java.util.concurrent.LinkedBlockingQueue;
  * @description : ThreadPoolUtil
  * @date : 2023-04-19 17:31
  */
-public class ThreadPoolUtil {
-    private static volatile ThreadPoolUtil INSTANCE;
-    private final ExecutorService executor;
-
-    private ThreadPoolUtil() {
-        this.executor = ExecutorBuilder.create()
-                .setCorePoolSize(30)
-                .setMaxPoolSize(100)
-                .setThreadFactory(new NamedThreadFactory("hestia-custom-", false))
-                .setAllowCoreThreadTimeOut(true)
-                .useArrayBlockingQueue(512)
-                .build();
-    }
-
-    public static ThreadPoolUtil getInstance() {
-        if (INSTANCE == null) {
-            synchronized (ThreadPoolUtil.class) {
-                if (INSTANCE == null) {
-                    INSTANCE = new ThreadPoolUtil();
-                }
-            }
-        }
-        return INSTANCE;
-    }
  
-    public ExecutorService getExecutor() {
-        return executor;
-    }
-}
+object ThreadPoolUtil {
+    val executor: ExecutorService = ExecutorBuilder.create()
+        .setCorePoolSize(30)
+        .setMaxPoolSize(100)
+        .setThreadFactory(NamedThreadFactory("hestia-custom-", false))
+        .setAllowCoreThreadTimeOut(true)
+        .useArrayBlockingQueue(512)
+        .build()
+}
 \ No newline at end of file
@@ -44,7 +44,7 @@ class MessageCenterServiceImpl(private val messageCenterBizService: MessageCente
         BV.isNotEmpty(paramList) { "消息列表不能为空" }
         BV.isTrue(
             paramList!!.size <= maxSize
-        ) { MessageFormatUtil.MessageFormatTransfer("最多支持一次性发送{0}条", maxSize) }
+        ) { MessageFormatUtil.messageFormatTransfer("最多支持一次性发送{0}条", maxSize) }
         return success(
             messageCenterBizService.saveBatchMessage(
                 paramList
@@ -84,7 +84,7 @@ class SendMessageTask(
             id?.let {
                 CompletableFuture.runAsync(
                     { messageCenterBizService.clearHistory(it) },
-                    ThreadPoolUtil.getInstance().executor
+                    ThreadPoolUtil.executor
                 )
             }
         }