From 8cb8c4c834c8950895853b3a8128e9c4f943d9af Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Wed, 18 Dec 2024 09:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=9B=B8=E5=85=B3=E4=BE=9D=E8=B5=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electrmangnetic/pom.xml                       |  49 ----
 .../manage/mapper/RolePermissionMapper.java   |   3 +-
 .../manage/mapper/UserRoleMapper.java         |   3 +-
 .../manage/pojo/models/BaseModel.java         |   4 +-
 .../manage/pojo/models/EdFileInfo.java        |   4 +-
 .../serviceimpl/EDDataServiceImpl.java        |  20 +-
 .../serviceimpl/EdFileInfoServiceImpl.java    |  34 +--
 .../src/main/resources/application.properties |  25 +-
 .../src/main/resources/log4j.properties       |   5 -
 .../src/main/resources/log4j2-spring-prod.xml | 206 -----------------
 .../src/main/resources/log4j2-spring.xml      | 218 ------------------
 electromagnetic-common/pom.xml                |  10 +
 .../industry/software/common/util/EleLog.java |   9 +
 13 files changed, 56 insertions(+), 534 deletions(-)
 delete mode 100644 electrmangnetic/src/main/resources/log4j.properties
 delete mode 100644 electrmangnetic/src/main/resources/log4j2-spring-prod.xml
 delete mode 100644 electrmangnetic/src/main/resources/log4j2-spring.xml
 create mode 100644 electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleLog.java

diff --git a/electrmangnetic/pom.xml b/electrmangnetic/pom.xml
index f255d8a..0eae279 100644
--- a/electrmangnetic/pom.xml
+++ b/electrmangnetic/pom.xml
@@ -23,26 +23,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-to-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
@@ -93,35 +73,6 @@
             <artifactId>druid</artifactId>
             <version>1.1.10</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.11.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.11.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <version>2.11.2</version>
-        </dependency>
-        <!--使⽤log4j2的AsyncLogger,包含disruptor-->
-        <dependency>
-            <groupId>com.lmax</groupId>
-            <artifactId>disruptor</artifactId>
-            <version>3.4.2</version>
-        </dependency>
-        <!-- slf4j依赖-->
-        <!--与slf4j保持桥接-->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.11.2</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/RolePermissionMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/RolePermissionMapper.java
index 78575b2..e98ab0c 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/RolePermissionMapper.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/RolePermissionMapper.java
@@ -2,7 +2,8 @@ package com.electromagnetic.industry.software.manage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.electromagnetic.industry.software.manage.pojo.models.RolePermission;
-import org.mapstruct.Mapper;
+import org.apache.ibatis.annotations.Mapper;
+
 
 @Mapper
 public interface RolePermissionMapper extends BaseMapper<RolePermission> {
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserRoleMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserRoleMapper.java
index 84e69c7..a8c2e58 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserRoleMapper.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserRoleMapper.java
@@ -2,7 +2,8 @@ package com.electromagnetic.industry.software.manage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.electromagnetic.industry.software.manage.pojo.models.UserRole;
-import org.mapstruct.Mapper;
+import org.apache.ibatis.annotations.Mapper;
+
 
 @Mapper
 public interface UserRoleMapper extends BaseMapper<UserRole> {
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/BaseModel.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/BaseModel.java
index 4e813b7..8ec428b 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/BaseModel.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/BaseModel.java
@@ -2,11 +2,11 @@ package com.electromagnetic.industry.software.manage.pojo.models;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
-import lombok.experimental.SuperBuilder;
+import lombok.experimental.Accessors;
 
 import java.util.Date;
 
-@SuperBuilder
+@Accessors(chain = true)
 @Data
 public class BaseModel {
     /**
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
index 4770324..bdd7fc1 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
@@ -3,11 +3,11 @@ package com.electromagnetic.industry.software.manage.pojo.models;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
-import lombok.experimental.SuperBuilder;
+import lombok.experimental.Accessors;
 
 @EqualsAndHashCode(callSuper = true)
 @TableName("ed_file_info")
-@SuperBuilder
+@Accessors(chain = true)
 @Data
 public class EdFileInfo extends BaseModel {
     /**
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java
index c07c831..f472147 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EDDataServiceImpl.java
@@ -63,25 +63,25 @@ public class EDDataServiceImpl implements EDDataService {
     private EDDataMapper edDataMapper;
     @Resource
     private CategoryMapper categoryMapper;
-    @Value("${data.windows.path}")
+//    @Value("${data.windows.path}")
     private String uploadFilePath;
-    @Value("${data.file.storage.dir}")
+//    @Value("${data.file.storage.dir}")
     private String fileStorageDir;
-    @Value("${data.import.cache.dir}")
+//    @Value("${data.import.cache.dir}")
     private String importCacheDir;
-    @Value("${file.encode.passwd}")
+//    @Value("${file.encode.passwd}")
     private String encodePasswd;
-    @Value("${data.type.folder}")
+//    @Value("${data.type.folder}")
     private String dataTypeFolder;
-    @Value("${data.windows.path}")
+//    @Value("${data.windows.path}")
     private String windowsDir;
-    @Value("${data.file.cache.dir}")
+//    @Value("${data.file.cache.dir}")
     private String fileCacheDir;
-    @Value("${data.upload.cache.dir}")
+//    @Value("${data.upload.cache.dir}")
     private String uploadCacheDir;
-    @Value("${data.export.cache.dir}")
+//    @Value("${data.export.cache.dir}")
     private String exportCacheDir;
-    @Value("${data.type.file}")
+//    @Value("${data.type.file}")
     private String dataTypeFile;
 
     @Override
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 1ae1aeb..9000c6a 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -83,23 +83,23 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             Date now = new Date();
             String currentUserId = UserThreadLocal.getUserId();
             String newPrjId = String.valueOf(id + 1);
-            EdFileInfo fileInfo = EdFileInfo.builder()
-                    .id(newPrjId)
-                    .fileId(IdWorker.getSnowFlakeIdString())
-                    .fileName(prjName)
-                    .fileVersion(100)
-                    .fileTime(EleCommonUtil.getNowTimeStr())
-                    .dataType(EleDataTypeEnum.FOLDER.code)
-                    .dataStatus(EleDataStatusEnum.NOT_PUBLISHED.code)
-                    .effectFlag(EffectFlagEnum.EFFECT.code)
-                    .saveStatus(EleDataSaveStatusEnum.SUCCESS.code)
-                    .filePath(newPrjId)
-                    .sort(1)
-                    .createdTime(now)
-                    .updateTime(now)
-                    .createdBy(currentUserId)
-                    .updatedBy(currentUserId)
-                    .build();
+
+            EdFileInfo fileInfo = new EdFileInfo();
+            fileInfo.setId(newPrjId)
+                    .setFileId(IdWorker.getSnowFlakeIdString())
+                    .setFileName(prjName)
+                    .setFileVersion(100)
+                    .setFileTime(EleCommonUtil.getNowTimeStr())
+                    .setDataType(EleDataTypeEnum.FOLDER.code)
+                    .setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code)
+                    .setEffectFlag(EffectFlagEnum.EFFECT.code)
+                    .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
+                    .setFilePath(newPrjId)
+                    .setSort(1)
+                    .setCreatedTime(now)
+                    .setUpdateTime(now)
+                    .setCreatedBy(currentUserId)
+                    .setUpdatedBy(currentUserId);
             this.save(fileInfo);
             // 保存到文件系统
             fileSystemService.createDirectory(eleDataPath);
diff --git a/electrmangnetic/src/main/resources/application.properties b/electrmangnetic/src/main/resources/application.properties
index 2081a39..e2a1d29 100644
--- a/electrmangnetic/src/main/resources/application.properties
+++ b/electrmangnetic/src/main/resources/application.properties
@@ -1,14 +1,7 @@
 #required
 spring.application.name=electromagnetic-data
-# security
-run.mode=NORMAL
-com.alipay.env=shared
-#log
 logging.file.path=./logs
 loggerPath=electromagnetic-data
-logging.level.com.aliyun.fsi.insurance=${LOG_LEVEL:INFO}
-#日志配置
-logging.config=classpath:${LOG_CONFIG:log4j2-spring.xml}
 spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.url=jdbc:mysql://139.224.43.89:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
 spring.datasource.username=comac
@@ -21,23 +14,9 @@ mybatis-plus.mapper-locations=classpath:sqlmapper/*.xml
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 pagehelper.helperDialect=mysql
 pagehelper.reasonable=false
-server.port=8888
+server.port=12395
 #windows文件存储目录，用于测试
 data.windows.path=E:/tmp/eleData/
 data.linux.path=/szsd/data/eleData
 prj.folder.max.length=6
-##文件缓存路径
-#data.file.cache.dir=/szsd/cache/
-##文件存储路径
-#data.file.storage.dir=/szsd/fileStorage/
-##上传文件时文件的缓存文件夹名称
-#data.upload.cache.dir=upload
-##导出数据时文件的缓存文件夹名称
-#data.export.cache.dir=export
-##导入数据时文件的缓存文件夹名称
-#data.import.cache.dir=import
-#file.encode.passwd=adknfhkj87654knd
-##数据类型中的文件类型为file
-#data.type.file=file
-##数据类型中的文件夹类型为folder
-#data.type.folder=folder
+
diff --git a/electrmangnetic/src/main/resources/log4j.properties b/electrmangnetic/src/main/resources/log4j.properties
deleted file mode 100644
index f15f1e7..0000000
--- a/electrmangnetic/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-log4j.rootLogger=DEBUG, stdout
-# Console output...
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%t] - %m%n
\ No newline at end of file
diff --git a/electrmangnetic/src/main/resources/log4j2-spring-prod.xml b/electrmangnetic/src/main/resources/log4j2-spring-prod.xml
deleted file mode 100644
index ca47405..0000000
--- a/electrmangnetic/src/main/resources/log4j2-spring-prod.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-    <properties>
-        <property name="LOG_LEVEL" value="INFO"/>
-        <property name="APP_NAME" value="electromagnetic-data"/>
-        <property name="LOG_HOME" value="./logs/${APP_NAME}"/>
-        <property name="LOG_LAYOUT"
-                  value="%d{yyyy-MM-dd HH:mm:ss.SSS},%t,%r,%-5p,%X{SOFA-TraceId},%X{SOFA-SpanId},%c{2},%m%n%throwable"/>
-        <property name="SIMPLE_LAYOUT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%"/>
-    </properties>
-
-    <Appenders>
-        <Console name="STDOUT-APPENDER" target="SYSTEM_OUT">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-        </Console>
-        <Console name="STDERR-APPENDER" target="SYSTEM_ERR">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-        </Console>
-
-        <!-- 错误节点日志 -->
-        <RollingFile name="ERROR-APPENDER" fileName="${LOG_HOME}/common-error.log"
-                     filePattern="${LOG_HOME}/common-error-%d{yyyy-MM-dd}_%i.log" append="true">
-            <Filters>
-                <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
-            </Filters>
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <!-- 业务日常节点日志-->
-        <RollingFile name="COMMON-APPENDER" fileName="${LOG_HOME}/common-default.log"
-                     filePattern="${LOG_HOME}/common-default-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-        <!-- 业务日常节点日志-->
-        <RollingFile name="DOMAIN-CALL-APPENDER" fileName="${LOG_HOME}/domain-call.log"
-                     filePattern="${LOG_HOME}/domain-call-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${SIMPLE_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-        <!-- 消息监听日志 -->
-        <RollingFile name="MSG-LISTEN-APPENDER" fileName="${LOG_HOME}/msg-listen.log"
-                     filePattern="${LOG_HOME}/msg-listen-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <!-- 异步任务日志 -->
-        <RollingFile name="TASK-SCHEDULER-APPENDER" fileName="${LOG_HOME}/task-scheduler.log"
-                     filePattern="${LOG_HOME}/task-scheduler-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <!-- SOFA日常节点日志 -->
-        <RollingFile name="SOFA-DEFAULT-APPENDER" fileName="${LOG_HOME}/sofa-default.log"
-                     filePattern="${LOG_HOME}/sofa-default-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <!-- 调用外部系统日志 -->
-        <RollingFile name="INTEGRATION-APPENDER" fileName="${LOG_HOME}/integration.log"
-                     filePattern="${LOG_HOME}/integration-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <RollingFile name="COMMON-MONITOR-APPENDER" fileName="${LOG_HOME}/common-monitor.log"
-                     filePattern="${LOG_HOME}/common-monitor-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-    </Appenders>
-
-    <Loggers>
-        <AsyncRoot includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-        </AsyncRoot>
-
-        <AsyncLogger name="com.alipay.sofa" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="SOFA-DEFAULT-APPENDER"/>
-        </AsyncLogger>
-        <AsyncLogger name="com.aliyun.fsi.insurance" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-        </AsyncLogger>
-
-        <Logger name="INTEGRATION" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="INTEGRATION-APPENDER"/>
-        </Logger>
-        <Logger name="SERIOUS-ALERT" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-        </Logger>
-        <Logger name="DOMAIN-ERROR" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-        </Logger>
-        <Logger name="DOMAIN-DIGEST" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-        </Logger>
-        <Logger name="DOMAIN-CALL" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="DOMAIN-CALL-APPENDER"/>
-        </Logger>
-        <Logger name="DOMAIN-SERVICE" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-        </Logger>
-        <Logger name="TASK-SCHEDULER" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="TASK-SCHEDULER-APPENDER"/>
-        </Logger>
-
-        <Logger name="MSG-LISTEN" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="MSG-LISTEN-APPENDER"/>
-        </Logger>
-        <Logger name="AbstractMessageListenerXFlush" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="MSG-LISTEN-APPENDER"/>
-        </Logger>
-        <Logger name="COMMON-MONITOR" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-MONITOR-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </Logger>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/electrmangnetic/src/main/resources/log4j2-spring.xml b/electrmangnetic/src/main/resources/log4j2-spring.xml
deleted file mode 100644
index 698bf69..0000000
--- a/electrmangnetic/src/main/resources/log4j2-spring.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-    <properties>
-        <property name="LOG_LEVEL" value="DEBUG"/>
-        <property name="APP_NAME" value="electromagnetic-data"/>
-        <property name="LOG_HOME" value="./logs/${APP_NAME}"/>
-        <property name="LOG_LAYOUT"
-                  value="%d{yyyy-MM-dd HH:mm:ss.SSS},%t,%r,%-5p,%X{SOFA-TraceId},%X{SOFA-SpanId},%c{2},%m%n%throwable"/>
-        <property name="SIMPLE_LAYOUT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%"/>
-    </properties>
-
-    <Appenders>
-        <Console name="STDOUT-APPENDER" target="SYSTEM_OUT">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-        </Console>
-        <Console name="STDERR-APPENDER" target="SYSTEM_ERR">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-        </Console>
-
-        <!-- 错误节点日志 -->
-        <RollingFile name="ERROR-APPENDER" fileName="${LOG_HOME}/common-error.log"
-                     filePattern="${LOG_HOME}/common-error-%d{yyyy-MM-dd}_%i.log" append="true">
-            <Filters>
-                <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
-            </Filters>
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <!-- 业务日常节点日志-->
-        <RollingFile name="COMMON-APPENDER" fileName="${LOG_HOME}/common-default.log"
-                     filePattern="${LOG_HOME}/common-default-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-        <!-- 业务日常节点日志-->
-        <RollingFile name="DOMAIN-CALL-APPENDER" fileName="${LOG_HOME}/domain-call.log"
-                     filePattern="${LOG_HOME}/domain-call-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${SIMPLE_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-        <!-- 消息监听日志 -->
-        <RollingFile name="MSG-LISTEN-APPENDER" fileName="${LOG_HOME}/msg-listen.log"
-                     filePattern="${LOG_HOME}/msg-listen-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <!-- 异步任务日志 -->
-        <RollingFile name="TASK-SCHEDULER-APPENDER" fileName="${LOG_HOME}/task-scheduler.log"
-                     filePattern="${LOG_HOME}/task-scheduler-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <!-- SOFA日常节点日志 -->
-        <RollingFile name="SOFA-DEFAULT-APPENDER" fileName="${LOG_HOME}/sofa-default.log"
-                     filePattern="${LOG_HOME}/sofa-default-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <!-- 调用外部系统日志 -->
-        <RollingFile name="INTEGRATION-APPENDER" fileName="${LOG_HOME}/integration.log"
-                     filePattern="${LOG_HOME}/integration-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-
-        <RollingFile name="COMMON-MONITOR-APPENDER" fileName="${LOG_HOME}/common-monitor.log"
-                     filePattern="${LOG_HOME}/common-monitor-%d{yyyy-MM-dd}_%i.log" append="true">
-            <PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <DefaultRolloverStrategy max="300">
-                <Delete basePath="${LOG_HOME}" maxDepth="1">
-                    <IfLastModified age="15d"/>
-                    <IfFileName glob="${LOG_HOME}*.log"/>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
-    </Appenders>
-
-    <Loggers>
-        <AsyncRoot includeLocation="true" level="INFO">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </AsyncRoot>
-
-        <AsyncLogger name="com.alipay.sofa" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="SOFA-DEFAULT-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </AsyncLogger>
-        <AsyncLogger name="com.aliyun.fsi.insurance" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </AsyncLogger>
-
-        <Logger name="INTEGRATION" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="INTEGRATION-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </Logger>
-        <Logger name="SERIOUS-ALERT" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-            <AppenderRef ref="STDERR-APPENDER"/>
-        </Logger>
-        <Logger name="DOMAIN-CALL" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
-            <AppenderRef ref="DOMAIN-CALL-APPENDER"/>
-        </Logger>
-        <Logger name="DOMAIN-ERROR" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-            <AppenderRef ref="STDERR-APPENDER"/>
-        </Logger>
-        <Logger name="DOMAIN-DIGEST" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </Logger>
-        <Logger name="DOMAIN-SERVICE" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </Logger>
-
-        <Logger name="TASK-SCHEDULER" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="TASK-SCHEDULER-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </Logger>
-
-        <Logger name="MSG-LISTEN" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="MSG-LISTEN-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </Logger>
-        <Logger name="AbstractMessageListenerXFlush" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="MSG-LISTEN-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </Logger>
-        <Logger name="COMMON-MONITOR" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
-            <AppenderRef ref="ERROR-APPENDER"/>
-            <AppenderRef ref="COMMON-MONITOR-APPENDER"/>
-            <AppenderRef ref="STDOUT-APPENDER"/>
-        </Logger>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/electromagnetic-common/pom.xml b/electromagnetic-common/pom.xml
index 58d52ab..68972c7 100644
--- a/electromagnetic-common/pom.xml
+++ b/electromagnetic-common/pom.xml
@@ -39,6 +39,16 @@
             <artifactId>hutool-all</artifactId>
             <version>5.8.22</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.2.3</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleLog.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleLog.java
new file mode 100644
index 0000000..7f6acf4
--- /dev/null
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleLog.java
@@ -0,0 +1,9 @@
+package com.electromagnetic.industry.software.common.util;
+
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Setter
+public class EleLog {
+}