From 279a1ac29ec6b910c2b00addf3bdc0c458035b03 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 15 Jun 2020 13:46:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8api?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 5de52c225b..b26e45ec72 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -134,7 +134,7 @@ true - http://localhost:8107/epmetscan/api + https://epmet-dev.elinkservice.cn/epmetscan/api From ead6dd244623ce121c9e020a887bbeb5e5334bd0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 15 Jun 2020 14:11:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/ScanContentUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java index 52dde4192d..1db37e4042 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java +++ b/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().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().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage()); + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage()); } } From a78ef457ce6637737c1c12955ef917fa5d7f2875 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 15 Jun 2020 14:15:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index c9e2d066c1..5870796221 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/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 # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index e815409f2a..564131814a 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/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"> 4.0.0 - 0.3.45 + 0.3.46 gov-voice com.epmet