Merge remote-tracking branch 'remotes/origin/develop' into release_temp

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -97,15 +97,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>

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());
                 }
             }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java

@@ -470,7 +470,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());
                 }
             }