From d2b25b83fe4398f94e6c106c2403aa980f279a8e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 9 Aug 2021 17:58:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=9D=E9=A2=98?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=B1=E8=B4=A5=20=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=AF=94=E8=BE=83=E8=B0=83=E6=95=B4=E4=B8=BAwarn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/topic/service/impl/ResiTopicServiceImpl.java  | 2 +-
 .../epmet/modules/topic/service/impl/TopicDraftServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index a53442897c..9e67dcd909 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -289,7 +289,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
             } else {
                 if (!textSyncScanResult.getData().isAllPass()) {
-                    log.error(String.format(TopicConstant.CREATE_TOPIC, topicContent));
+                    log.warn(String.format(TopicConstant.CREATE_TOPIC, topicContent));
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 2fcce302e5..022a9cfcae 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -468,7 +468,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                     operationDTO.setCreatedBy(tokenDto.getUserId());
                     topicDraftOperationService.save(operationDTO);
 
-                    log.error(String.format(TopicConstant.CREATE_TOPIC, topicContent));
+                    log.warn(String.format(TopicConstant.CREATE_TOPIC, topicContent));
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                 }
             }

From 837c5b9eadd374e3dde562ba663985ca8f291dbe Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 10 Aug 2021 10:43:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?resource=20=E4=B8=8Bexcel=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-aggregator/data-aggregator-server/pom.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 84e74d7e89..0f216610be 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -91,15 +91,23 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+            <!-- 避免font文件的二进制文件格式压缩破坏 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
         </plugins>
         <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
         <resources>
             <resource>
                 <filtering>true</filtering>
                 <directory>${basedir}/src/main/resources</directory>
-                <excludes>
-                    <exclude>**/*.xlsx</exclude>
-                </excludes>
             </resource>
         </resources>
     </build>