From cb787a4264636183bfe76a64585fa68d18434c04 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 10 Jun 2020 11:19:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=B1=E8=B4=A5=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/utils/HttpClientManager.java | 2 +- .../commons/tools/utils/ScanContentUtils.java | 31 +++++++++-- .../scan/config/FastJsonConfiguration.java | 52 ------------------- 3 files changed, 28 insertions(+), 57 deletions(-) delete mode 100644 epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/FastJsonConfiguration.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java index adbbbf8f9a..20790e1d6a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java @@ -171,7 +171,7 @@ public class HttpClientManager { } public static void main(String[] args) { - String url = "http://192.168.1.130:8107/epmetscan/api/textSyncScan"; + String url = "http://localhost:8107/epmetscan/api/textSyncScan"; TextTaskDTO p = new TextTaskDTO(); p.setDataId("1"); p.setContent("neirong1"); 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 eaf5d8c893..9a757beae6 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 @@ -5,10 +5,14 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; import com.epmet.commons.tools.scan.param.TextScanParamDTO; +import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import java.util.ArrayList; +import java.util.List; + /** * 扫描内容工具类 * @@ -32,9 +36,12 @@ public class ScanContentUtils { Result result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(param)); log.debug("imgSyncScan result:{}", JSON.toJSONString(param)); if (result.success()) { - return new Result().ok(JSON.parseObject(result.getData(), SyncScanResult.class)); + return JSON.parseObject(result.getData(),Result.class); } - return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), result.getMsg()); + Result resultResult = new Result<>(); + resultResult.error(result.getCode(),result.getMsg()); + resultResult.setInternalMsg(result.getInternalMsg()); + return resultResult; } catch (Exception e) { log.debug("imgSyncScan param:{}", JSON.toJSONString(param)); return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage()); @@ -55,12 +62,28 @@ public class ScanContentUtils { Result result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(param)); log.debug("textSyncScan result:{}", JSON.toJSONString(result)); if (result.success()) { - return new Result().ok(JSON.parseObject(result.getData(), SyncScanResult.class)); + return JSON.parseObject(result.getData(),Result.class); } - return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), result.getMsg()); + Result resultResult = new Result<>(); + resultResult.error(result.getCode(),result.getMsg()); + resultResult.setInternalMsg(result.getInternalMsg()); + return resultResult; } catch (Exception e) { log.error("textSyncScan exception:", e); return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage()); } } + + public static void main(String[] args) { + String url = "http://localhost:8107/epmetscan/api/textSyncScan"; + TextTaskDTO p = new TextTaskDTO(); + p.setDataId("1"); + p.setContent("neirong1"); + List list = new ArrayList<>(); + list.add(p); + TextScanParamDTO param = new TextScanParamDTO(); + param.setTasks(list); + Result result = ScanContentUtils.textSyncScan(url, param); + System.out.println(JSON.toJSONString(result)); + } } diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/FastJsonConfiguration.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/FastJsonConfiguration.java deleted file mode 100644 index 8270a85299..0000000000 --- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/FastJsonConfiguration.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.epmet.openapi.scan.config; - -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.alibaba.fastjson.support.config.FastJsonConfig; -import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; -import org.springframework.boot.autoconfigure.http.HttpMessageConverters; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.MediaType; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.StringHttpMessageConverter; - -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; - -/** - * @author jianjun liu - * @email liujianjun@yunzongnet.com - * @date 2020-06-05 14:14 - **/ -@Configuration -public class FastJsonConfiguration { - - @Bean - public HttpMessageConverters fastJsonHttpMessageConverters() { - FastJsonHttpMessageConverter fastJsonHttpMessageConverter = new FastJsonHttpMessageConverter(); - FastJsonConfig fastJsonConfig = new FastJsonConfig(); - - List fastMediaTypes = new ArrayList<>(); - - // 处理中文乱码问题 - fastJsonConfig.setCharset(Charset.forName("UTF-8")); - fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat); - // 设置时间格式 - fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss"); - - fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8); - fastJsonHttpMessageConverter.setSupportedMediaTypes(fastMediaTypes); - - // 在转换器中添加配置信息 - fastJsonHttpMessageConverter.setFastJsonConfig(fastJsonConfig); - HttpMessageConverter converter = fastJsonHttpMessageConverter; - - StringHttpMessageConverter stringConverter = new StringHttpMessageConverter(); - stringConverter.setDefaultCharset(Charset.forName("UTF-8")); - stringConverter.setSupportedMediaTypes(fastMediaTypes); - - return new HttpMessageConverters(stringConverter, converter); - } - -}