From 4849cc50b3e91fabf4147d378953211fd22f8289 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 7 Jul 2020 10:26:14 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=EF=BC=9Aresimin?= =?UTF-8?q?e=E3=80=81govvoice+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice/gov-voice-server/deploy/docker-compose-test.yml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml index 64a93fed78..534a815584 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.58 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.59 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml index 7c0df9fcde..d373324986 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.28 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.29 ports: - "8094:8094" network_mode: host # 使用现有网络 From a65ee54d5e90e12623a186087afe80dac313fb5a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 7 Jul 2020 10:38:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=9C=80=E5=8F=91=E5=B8=83=EF=BC=9Aresimine=E3=80=81govvoice?= =?UTF-8?q?=E3=80=81resigroup,=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice/gov-voice-server/deploy/docker-compose-prod.yml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml index a91f4e4c9a..36d357c786 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.58 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.59 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml index ed98c25963..2b0c7460a7 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.28 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.29 ports: - "8094:8094" network_mode: host # 使用现有网络 From 3b37988b4c8063cfcd1b0b96257744f39e7a148a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 7 Jul 2020 12:47:16 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=9C=80=E5=8F=91=E5=B8=83=EF=BC=9Agovvoice0.3.60?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice/gov-voice-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml index 36d357c786..8fcad365f2 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.59 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.60 ports: - "8105:8105" network_mode: host # 使用现有网络 From 8e4226cd440d154d2a85c48756b50384ee0b31b5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Jul 2020 13:27:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=83=A8=E7=BD=B2gateway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/deploy/docker-compose-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index 5bdf5fda68..bf31e2a0ca 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.22 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.23 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/deploy/docker-compose-test.yml b/epmet-gateway/deploy/docker-compose-test.yml index 44bcb9c5dd..1d72f6bc4b 100644 --- a/epmet-gateway/deploy/docker-compose-test.yml +++ b/epmet-gateway/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.22 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.23 ports: - "8080:8080" network_mode: host # 使用现有网络 From 309f737972c4422a0ace964b4099e3bc4a23fa4b Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Jul 2020 13:44:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=B8=AAip=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/commons/tools/utils/IpUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java index 86d279f3b6..b100daac7a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java @@ -54,7 +54,7 @@ public class IpUtils { ip = request.getRemoteAddr(); } //对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割 - if (ip != null && ip.length() > 15) { //"***.***.***.***".length() = 15 + if (ip != null) { //"***.***.***.***".length() = 15 if (ip.indexOf(",") > 0) { ip = ip.substring(0, ip.indexOf(",")); } From 67fe5173cf0d7edca876e4532c0df572d6c4a706 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 7 Jul 2020 15:36:29 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=EF=BC=9Aresigoup+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-test.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../invitation/service/impl/GroupInvitationServiceImpl.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 281ea59d07..e260e52f61 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.61 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.62 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index 5a39890745..ed45553393 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.61 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.62 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml index 6d5b2048fa..8ba5a78e5e 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.61 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.62 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 0b734ec6b3..f5a85b9ff7 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.61 + 0.3.62 com.epmet resi-group diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index 120e09d831..30c1ee44ba 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java @@ -199,7 +199,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl Date: Tue, 14 Jul 2020 22:28:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=93=8D=E5=BA=94=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scan/common/enu/SysResponseEnum.java | 2 + ...ception.java => ExecuteHttpException.java} | 13 ++++-- .../scan/controller/ScanController.java | 10 ++--- .../scan/service/impl/ScanServiceImpl.java | 45 +++++++++---------- 4 files changed, 37 insertions(+), 33 deletions(-) rename epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/{ExeCuteHttpException.java => ExecuteHttpException.java} (63%) diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SysResponseEnum.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SysResponseEnum.java index 67ee3cc9d2..a05b536f45 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SysResponseEnum.java +++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SysResponseEnum.java @@ -24,6 +24,8 @@ public enum SysResponseEnum { /*审核内容 业务 01*/ SCAN_TASK_LIST_PARAM_ERROR(110010001,"任务列表不能为空"), SCAN_PARAM_ERROR(110010002,"参数格式不正确"), + EXECUTE_ALI_RETURN_CODE_NOT_OK(110010003,"调用第三方检测服务响应异常"), + EXECUTE_ALI_DO_ACTION_EXCEPTION(110010004,"调用第三方检测服务异常"), ; private Integer code; diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/ExeCuteHttpException.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/ExecuteHttpException.java similarity index 63% rename from epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/ExeCuteHttpException.java rename to epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/ExecuteHttpException.java index 99daf84bae..1eb4f8d0e3 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/ExeCuteHttpException.java +++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/exception/ExecuteHttpException.java @@ -8,16 +8,23 @@ import com.epmet.openapi.scan.common.enu.SysResponseEnum; * @email liujianjun@yunzongnet.com * @date 2020-06-05 10:31 **/ -public class ExeCuteHttpException extends RuntimeException { +public class ExecuteHttpException extends RuntimeException { private int code; private String msg; - public ExeCuteHttpException(String msg) { + public ExecuteHttpException(String msg) { this(SysResponseEnum.EXCEPTION.getCode(), msg); } - public ExeCuteHttpException(int code, String... params) { + public ExecuteHttpException(int code, String... params) { this.code = code; this.msg = MessageUtils.getMessage(code, params); + } + + public int getCode() { + return code; + } + public String getMsg() { + return msg; } } diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/controller/ScanController.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/controller/ScanController.java index efaae3ddd5..e32460ce44 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/controller/ScanController.java +++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/controller/ScanController.java @@ -24,7 +24,6 @@ public class ScanController { @Autowired private ScanService scanService; - /** * desc:图片同步检测接口 * @@ -34,8 +33,7 @@ public class ScanController { @RequestMapping("imgSyncScan") public Result ImgSyncScan(@RequestBody ImgScanParam param) { ValidatorUtils.validateEntity(param); - Result scanResultResult = scanService.sendSyncImgScan(param); - return scanResultResult; + return scanService.sendSyncImgScan(param); } /** @@ -47,13 +45,11 @@ public class ScanController { @RequestMapping("textSyncScan") public Result textSyncScan(@RequestBody TextScanParam param) { ValidatorUtils.validateEntity(param); - Result scanResultResult = scanService.sendTextScan(param); - return scanResultResult; + return scanService.sendTextScan(param); } //@RequestMapping("imgAsyncScan") public Result ImgAsyncScan(@RequestBody ImgScanParam param) { - Result scanResultResult = scanService.sendASyncImgScan(param); - return scanResultResult; + return scanService.sendASyncImgScan(param); } } diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java index 58fd107bc0..1a88b5b86f 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java +++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java @@ -15,7 +15,7 @@ import com.epmet.openapi.scan.common.enu.ImgSceneEnum; import com.epmet.openapi.scan.common.enu.SuggestionEnum; import com.epmet.openapi.scan.common.enu.SysResponseEnum; import com.epmet.openapi.scan.common.enu.TextSceneEnum; -import com.epmet.openapi.scan.common.exception.ExeCuteHttpException; +import com.epmet.openapi.scan.common.exception.ExecuteHttpException; import com.epmet.openapi.scan.common.util.IAcsClientUtil; import com.epmet.openapi.scan.support.param.ImgScanParam; import com.epmet.openapi.scan.support.param.ImgTask; @@ -49,7 +49,6 @@ public class ScanServiceImpl implements ScanService { @Override public Result sendTextScan(TextScanParam textScanParam) { - //默认参数 // 鉴黄 暴恐涉政 textScanParam.setScenes(TextSceneEnum.getTextSceneList()); @@ -69,7 +68,7 @@ public class ScanServiceImpl implements ScanService { try { textScanRequest.setHttpContent(JSON.toJSONString(textScanParam).getBytes(SysConstant.UTF8), SysConstant.UTF8, FormatType.JSON); } catch (UnsupportedEncodingException e) { - log.error("sendTextScan exception", e.getMessage()); + log.error("sendTextScan parse param exception", e); } @@ -78,18 +77,18 @@ public class ScanServiceImpl implements ScanService { */ textScanRequest.setConnectTimeout(3000); textScanRequest.setReadTimeout(6000); + try { SyncScanResult textScanResult = executeSyncText(textScanRequest); return new Result().ok(textScanResult); - } catch (Exception e) { - log.error("sendTextScan exception", e); - throw new ExeCuteHttpException(SysResponseEnum.EXCEPTION.getCode(), SysResponseEnum.EXCEPTION.getMsg()); + } catch (ExecuteHttpException e) { + log.error("sendTextScan execute Exception", e); + return new Result().error(e.getCode(), e.getMsg()); } } @Override public Result sendSyncImgScan(ImgScanParam imgScanParam) { - ImageSyncScanRequest imageSyncScanRequest = new ImageSyncScanRequest(); imageSyncScanRequest.setAcceptFormat(FormatType.JSON); // 指定api返回格式 imageSyncScanRequest.setMethod(com.aliyuncs.http.MethodType.POST); // 指定请求方法 @@ -109,7 +108,7 @@ public class ScanServiceImpl implements ScanService { try { imageSyncScanRequest.setHttpContent(JSON.toJSONString(imgScanParam).getBytes(SysConstant.UTF8), SysConstant.UTF8, FormatType.JSON); } catch (UnsupportedEncodingException e) { - log.error("sendSyncImgScan exception", e.getMessage()); + log.error("sendSyncImgScan parse param exception", e); return new Result().error(SysResponseEnum.SCAN_PARAM_ERROR.getCode(), SysResponseEnum.SCAN_PARAM_ERROR.getMsg()); } @@ -122,9 +121,9 @@ public class ScanServiceImpl implements ScanService { try { SyncScanResult scanResult = executeSyncImg(imageSyncScanRequest); return new Result().ok(scanResult); - } catch (Exception e) { - log.error("sendImgScan execute Exception", e); - return new Result().error(SysResponseEnum.EXCEPTION.getCode(), SysResponseEnum.EXCEPTION.getMsg()); + } catch (ExecuteHttpException e) { + log.error("sendImgScan execute exception,param:{},fail msg:{}", JSON.toJSONString(imgScanParam), e.getMsg()); + return new Result().error(e.getCode(), e.getMsg()); } } @@ -149,7 +148,7 @@ public class ScanServiceImpl implements ScanService { try { imageAsyncScanRequest.setHttpContent(JSON.toJSONString(imgScanParam).getBytes(SysConstant.UTF8), SysConstant.UTF8, FormatType.JSON); } catch (UnsupportedEncodingException e) { - log.error("sendASyncImgScan exception", e.getMessage()); + log.error("sendASyncImgScan parse param exception", e); return new Result().error(SysResponseEnum.SCAN_PARAM_ERROR.getCode(), SysResponseEnum.SCAN_PARAM_ERROR.getMsg()); } @@ -163,7 +162,7 @@ public class ScanServiceImpl implements ScanService { ImgAsyncScanResult scanResult = null;//executeAsyncImg(imageAsyncScanRequest); return new Result().ok(scanResult); } catch (Exception e) { - log.error("sendImgScan execute Exception", e); + //log.error("sendASyncImgScan execute exception,param:{},fail msg:{}",JSON.toJSONString(imgScanParam), e.getMsg()); return new Result().error(SysResponseEnum.EXCEPTION.getCode(), SysResponseEnum.EXCEPTION.getMsg()); } } @@ -209,15 +208,15 @@ public class ScanServiceImpl implements ScanService { return result; } else { log.warn("executeSyncText response not success. code:{}", scrResponse.getInteger(SysConstant.CODE)); - throw new ExeCuteHttpException("executeSyncText detect not success. code:" + scrResponse.getInteger(SysConstant.CODE)); + throw new ExecuteHttpException(SysResponseEnum.EXECUTE_ALI_RETURN_CODE_NOT_OK.getCode(), SysResponseEnum.EXECUTE_ALI_RETURN_CODE_NOT_OK.getMsg() + ",status:" + httpResponse.getStatus()); } } else { - log.warn("executeSyncText response not success. status:{}", httpResponse.getStatus()); - throw new ExeCuteHttpException("response not success. status:" + httpResponse.getStatus()); + log.warn("executeSyncText response status is not success. httpResponse:{}", JSON.toJSONString(httpResponse)); + throw new ExecuteHttpException(SysResponseEnum.EXECUTE_ALI_RETURN_CODE_NOT_OK.getCode(), SysResponseEnum.EXECUTE_ALI_RETURN_CODE_NOT_OK.getMsg() + ",status:" + httpResponse.getStatus()); } } catch (Exception e) { - log.warn("executeSyncText exception", e); - throw new ExeCuteHttpException(SysResponseEnum.EXCEPTION.getCode(), SysResponseEnum.EXCEPTION.getMsg()); + log.error("executeSyncText exception IAcsClientUtil do action exception", e); + throw new ExecuteHttpException(SysResponseEnum.EXECUTE_ALI_DO_ACTION_EXCEPTION.getCode(), SysResponseEnum.EXECUTE_ALI_DO_ACTION_EXCEPTION.getMsg()); } } @@ -260,15 +259,15 @@ public class ScanServiceImpl implements ScanService { return result; } else { log.warn("executeSyncImg detect not success. code:{}", scrResponse.getInteger(SysConstant.CODE)); - throw new ExeCuteHttpException("detect not success. code:" + scrResponse.getInteger(SysConstant.CODE)); + throw new ExecuteHttpException(SysResponseEnum.EXECUTE_ALI_RETURN_CODE_NOT_OK.getCode(), SysResponseEnum.EXECUTE_ALI_RETURN_CODE_NOT_OK.getMsg() + ",status:" + httpResponse.getStatus()); } } else { - log.warn("executeSyncImg response not success. status:{}", httpResponse.getStatus()); - throw new ExeCuteHttpException("response not success. status:" + httpResponse.getStatus()); + log.warn("executeSyncImg response status is not success. httpResponse:{}", JSON.toJSONString(httpResponse)); + throw new ExecuteHttpException(SysResponseEnum.EXECUTE_ALI_RETURN_CODE_NOT_OK.getCode(), SysResponseEnum.EXECUTE_ALI_RETURN_CODE_NOT_OK.getMsg() + ",status:" + httpResponse.getStatus()); } } catch (Exception e) { - log.warn("executeSyncImg exception", e); - throw new ExeCuteHttpException(SysResponseEnum.EXCEPTION.getCode(), SysResponseEnum.EXCEPTION.getMsg()); + log.error("executeSyncImg exception IAcsClientUtil do action exception", e); + throw new ExecuteHttpException(SysResponseEnum.EXECUTE_ALI_DO_ACTION_EXCEPTION.getCode(), SysResponseEnum.EXECUTE_ALI_DO_ACTION_EXCEPTION.getMsg()); } } }