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 @@ org.springframework.boot spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter - - - ch.qos.logback - logback-classic - - - org.slf4j - slf4j-log4j12 - - - org.apache.logging.log4j - log4j-to-slf4j - - - - cn.hutool hutool-all @@ -93,35 +73,6 @@ druid 1.1.10 - - - org.apache.logging.log4j - log4j-api - 2.11.2 - - - org.apache.logging.log4j - log4j-core - 2.11.2 - - - org.apache.logging.log4j - log4j-jcl - 2.11.2 - - - - com.lmax - disruptor - 3.4.2 - - - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.11.2 - org.springframework.boot spring-boot-starter-test 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 { 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 { 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 @@ hutool-all 5.8.22 + + ch.qos.logback + logback-classic + 1.2.3 + + + ch.qos.logback + logback-core + 1.2.3 + \ 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 { +}