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

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

@@ -157,7 +157,7 @@ public class HttpClientManager {
 			}
 		} catch (Exception e) {
 			log.error("execute exception", e);
-			new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+			return new Result<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
 		} finally {
 			httpMethod.releaseConnection();
 			try {
@@ -167,11 +167,11 @@ public class HttpClientManager {
 			} catch (IOException e) {
 			}
 		}
-		throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+		return new Result<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 	}
 
 	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");

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<String> result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(param));
 			log.debug("imgSyncScan result:{}", JSON.toJSONString(param));
 			if (result.success()) {
-				return new Result<SyncScanResult>().ok(JSON.parseObject(result.getData(), SyncScanResult.class));
+				return JSON.parseObject(result.getData(),Result.class);
 			}
-			return new Result<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), result.getMsg());
+			Result<SyncScanResult> 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<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
@@ -55,12 +62,28 @@ public class ScanContentUtils {
 			Result<String> result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(param));
 			log.debug("textSyncScan result:{}", JSON.toJSONString(result));
 			if (result.success()) {
-				return new Result<SyncScanResult>().ok(JSON.parseObject(result.getData(), SyncScanResult.class));
+				return JSON.parseObject(result.getData(),Result.class);
 			}
-			return new Result<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), result.getMsg());
+			Result<SyncScanResult> 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<SyncScanResult>().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<TextTaskDTO> list = new ArrayList<>();
+		list.add(p);
+		TextScanParamDTO param = new TextScanParamDTO();
+		param.setTasks(list);
+		Result<SyncScanResult> result = ScanContentUtils.textSyncScan(url, param);
+		System.out.println(JSON.toJSONString(result));
+	}
 }

epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/FastJsonConfiguration.java

@@ -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<MediaType> 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);
-	}
-
-}