From 33e1ac2dde3ffbf1e9de84286b76cde412e8b3a5 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 16 Dec 2021 17:26:57 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-64300=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E6=97=B6=E6=97=A5=E5=BF=97=E6=8E=A8=E9=80=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../loghandler/LogEventConverter.java         | 27 -------------------
 .../mainframe/socketio/DesignerSocketIO.java  |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogEventConverter.java

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogEventConverter.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogEventConverter.java
deleted file mode 100644
index 92995add5..000000000
--- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogEventConverter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.fr.design.mainframe.loghandler;
-
-import com.fr.third.apache.log4j.spi.LoggingEvent;
-import com.fr.third.apache.logging.log4j.Level;
-import com.fr.third.apache.logging.log4j.core.LogEvent;
-import com.fr.third.apache.logging.log4j.core.impl.Log4jLogEvent;
-import com.fr.third.apache.logging.log4j.message.SimpleMessage;
-
-/**
- * 兼容log4j1和2之间logEvent之间的转换
- *
- * @author hades
- * @version 11.0
- * Created by hades on 2021/12/9
- */
-public class LogEventConverter {
-
-    public static LogEvent convert(LoggingEvent loggingEvent) {
-        SimpleMessage message = new SimpleMessage(loggingEvent.getRenderedMessage());
-        return Log4jLogEvent.newBuilder().
-                setMessage(message).
-                setLevel(Level.getLevel(loggingEvent.getLevel().toString())).
-                build();
-    }
-
-
-}
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
index 1742e3c3d..092c7b30f 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
@@ -11,7 +11,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.loghandler.DesignerLogger;
-import com.fr.design.mainframe.loghandler.LogEventConverter;
 import com.fr.design.mainframe.share.ui.base.MouseClickListener;
 import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
 import com.fr.design.mainframe.toast.ToastMsgDialog;
@@ -34,6 +33,7 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.base.WorkspaceConstants;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import com.fr.workspace.server.socket.LogEventConverter;
 import io.socket.client.IO;
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;