Merge remote-tracking branch 'remotes/origin/dev' into release

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.46
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.47
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.46</version>
+    <version>0.3.47</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -978,11 +978,17 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				log.info("scanContent imgScanParamDTO:{}", JSON.toJSONString(imgScanParamDTO));
 				imgSyncScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
 				log.info("scanContent imgSyncScanResult:{}", JSON.toJSONString(imgSyncScanResult));
+				if (!imgSyncScanResult.success()){
+					throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(),imgSyncScanResult.getMsg());
+				}
 			}
 			if (!CollectionUtils.isEmpty(textScanParamDTO.getTasks())) {
 				log.info("scanContent textScanParamDTO:{}", JSON.toJSONString(textScanParamDTO));
 				textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
 				log.info("scanContent textSyncScanResult:{}", JSON.toJSONString(textSyncScanResult));
+				if (!textSyncScanResult.success()){
+					throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(),textSyncScanResult.getMsg());
+				}
 			}