From 05a274723ec0113346955e25c59a50ec4e7430e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 23 十二月 2022 11:18:06 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/News.java |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/core/News.java b/src/main/java/com/zy/core/News.java
index 596bb4e..ce0133c 100644
--- a/src/main/java/com/zy/core/News.java
+++ b/src/main/java/com/zy/core/News.java
@@ -1,5 +1,6 @@
 package com.zy.core;
 
+import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Array;
@@ -13,6 +14,13 @@
  */
 @Slf4j
 public class News {
+
+    public static void main(String[] args) {
+        News.info("info{}", 1);
+        News.warn("warn{}", 2);
+        News.error("error{}", 3);
+        System.out.println(JSON.toJSONString(NEWS_QUEUE.data()));
+    }
 
     interface NewsSupport<T> { boolean execute(T t); }
 
@@ -73,14 +81,6 @@
 
     }
 
-    public static void info(String format) {
-        offer(NewsLevel.INFO, format, null);
-    }
-
-    public static void info(String format, Object argument) {
-        offer(NewsLevel.INFO, format, new Object[]{argument});
-    }
-
     public static void info(String format, Object... arguments) {
         offer(NewsLevel.INFO, format, arguments);
     }
@@ -94,7 +94,21 @@
     }
 
     private static boolean offer(NewsLevel level, String msg, Object[] args) {
-        return NEWS_QUEUE.offer(new NewsDomain(level, msg, new Date()));
+        return NEWS_QUEUE.offer(new NewsDomain(level, replace(msg, args), new Date()));
+    }
+
+    private static String replace(String str, Object[] objs){
+        if (null == objs || objs.length == 0 || null == str || "".equals(str.trim())) {
+            return str;
+        } else {
+            StringBuilder sb = new StringBuilder(str);
+            for (Object obj : objs) {
+                int idx = sb.indexOf("{}");
+                if (idx == -1) { break; }
+                sb.replace(idx, idx + 2, String.valueOf(obj));
+            }
+            return sb.toString();
+        }
     }
 
     static class NewsDomain {

--
Gitblit v1.9.1