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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java

@@ -45,7 +45,7 @@ public class ScanContentUtils {
 			return resultResult;
 		} catch (Exception e) {
 			log.debug("imgSyncScan param:{}", JSON.toJSONString(param));
-			return new Result<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage()));
 		}
 	}
 
@@ -72,7 +72,7 @@ public class ScanContentUtils {
 			return resultResult;
 		} catch (Exception e) {
 			log.error("textSyncScan exception:", e);
-			return new Result<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
 		}
 	}
 

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.45
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.46
     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.45</version>
+    <version>0.3.46</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>
@@ -134,7 +134,7 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
-                <openapi.scan.server.url>http://localhost:8107/epmetscan/api</openapi.scan.server.url>
+                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/epmetscan/api</openapi.scan.server.url>
             </properties>
         </profile>
         <profile>