From 8cb73de540b531c204d785c67bd0f4cfa2c304b2 Mon Sep 17 00:00:00 2001
From: panchangqing <panchangqing4@h-partners.com>
Date: Thu, 24 Jul 2025 12:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dso=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E7=9A=84?=
 =?UTF-8?q?hap=E5=8C=85=E7=AD=BE=E5=90=8D=E5=A4=B1=E8=B4=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ohos/hapsigntool/utils/LogUtils.java  | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java
index f02b06cb..5444034f 100644
--- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java
+++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/LogUtils.java
@@ -90,7 +90,7 @@ public class LogUtils {
      * @param log log string
      */
     public void info(String log) {
-        logger.info(" INFO - " + log);
+        logger.info(() -> " INFO - " + log);
         OUT_HANDLER.flush();
     }
 
@@ -101,7 +101,7 @@ public class LogUtils {
      * @param arg arg
      */
     public void info(String log, Object arg) {
-        logger.info(" INFO - " + replaceArgs(log, arg));
+        logger.info(() -> " INFO - " + replaceArgs(log, arg));
         OUT_HANDLER.flush();
     }
 
@@ -113,7 +113,7 @@ public class LogUtils {
      * @param arg2 arg
      */
     public void info(String log, Object arg1, Object arg2) {
-        logger.info(" INFO - " + replaceArgs(log, arg1, arg2));
+        logger.info(() -> " INFO - " + replaceArgs(log, arg1, arg2));
         OUT_HANDLER.flush();
     }
 
@@ -123,7 +123,7 @@ public class LogUtils {
      * @param log log string
      */
     public void warn(String log) {
-        logger.warning(" WARN - " + log);
+        logger.warning(() -> " WARN - " + log);
         ERR_HANDLER.flush();
     }
 
@@ -134,7 +134,7 @@ public class LogUtils {
      * @param arg arg
      */
     public void warn(String log, Object arg) {
-        logger.warning(" WARN - " + replaceArgs(log, arg));
+        logger.warning(() -> " WARN - " + replaceArgs(log, arg));
         ERR_HANDLER.flush();
     }
 
@@ -158,7 +158,7 @@ public class LogUtils {
      * @param arg2 arg
      */
     public void warn(String log, Object arg1, Object arg2) {
-        logger.warning(" WARN - " + replaceArgs(log, arg1, arg2));
+        logger.warning(() -> " WARN - " + replaceArgs(log, arg1, arg2));
         ERR_HANDLER.flush();
     }
 
@@ -179,7 +179,7 @@ public class LogUtils {
      * @param log log string
      */
     public void debug(String log) {
-        logger.config(" DEBUG - " + log);
+        logger.config(() -> " DEBUG - " + log);
         OUT_HANDLER.flush();
     }
 
@@ -191,7 +191,7 @@ public class LogUtils {
      * @param arg2 arg
      */
     public void debug(String log, Object arg1, Object arg2) {
-        logger.config(" DEBUG - " + replaceArgs(log, arg1, arg2));
+        logger.config(() -> " DEBUG - " + replaceArgs(log, arg1, arg2));
         OUT_HANDLER.flush();
     }
 
@@ -213,7 +213,7 @@ public class LogUtils {
      * @param arg arg
      */
     public void debug(String log, Object arg) {
-        logger.config(" DEBUG - " + replaceArgs(log, arg));
+        logger.config(() -> " DEBUG - " + replaceArgs(log, arg));
         OUT_HANDLER.flush();
     }
 
@@ -223,7 +223,7 @@ public class LogUtils {
      * @param log log string
      */
     public void error(String log) {
-        logger.severe(" ERROR - " + log);
+        logger.severe(() -> " ERROR - " + log);
         ERR_HANDLER.flush();
     }
 
@@ -257,7 +257,7 @@ public class LogUtils {
      * @param arg arg
      */
     public void error(String log, Object arg) {
-        logger.severe(" ERROR - " + replaceArgs(log, arg));
+        logger.severe(() -> " ERROR - " + replaceArgs(log, arg));
         ERR_HANDLER.flush();
     }
 
@@ -269,7 +269,7 @@ public class LogUtils {
      * @param arg2 arg
      */
     public void error(String log, Object arg1, Object arg2) {
-        logger.severe(" ERROR - " + replaceArgs(log, arg1, arg2));
+        logger.severe(() -> " ERROR - " + replaceArgs(log, arg1, arg2));
         ERR_HANDLER.flush();
     }
 
@@ -282,21 +282,32 @@ public class LogUtils {
      * @param arg3 arg
      */
     public void error(String log, Object arg1, Object arg2, Object arg3) {
-        logger.severe(" ERROR - " + replaceArgs(log, arg1, arg2, arg3));
+        logger.severe(() -> " ERROR - " + replaceArgs(log, arg1, arg2, arg3));
         ERR_HANDLER.flush();
     }
 
     private static String replaceArgs(String line, Object... args) {
+        if (line == null) {
+            return null;
+        }
         Matcher matcher = PATTERN.matcher(line);
-        String result = line;
         if (!matcher.find()) {
             return line;
         }
-        for (Object arg : args) {
-            Matcher m = PATTERN.matcher(result);
-            result = m.replaceFirst(String.valueOf(arg));
+        matcher.reset();
+        StringBuffer result = new StringBuffer();
+        int index = 0;
+        while (matcher.find()) {
+            matcher.appendReplacement(result, "");
+            if (args != null && index < args.length) {
+                result.append(args[index++]);
+            } else {
+                result.append(matcher.group());
+                break;
+            }
         }
-        return result;
+        matcher.appendTail(result);
+        return result.toString();
     }
 
     private static String getJarConfig(String configFileName) throws LogConfigException {
-- 
Gitee