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

@@ -20,6 +20,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
@@ -35,6 +36,7 @@ import java.util.Set;
  * @author: jianjun liu
  */
 @Slf4j
+@Component
 public class HttpClientManager {
 	private static int connectionTimeout = 3000;// 连接超时时间,毫秒
 	private static int soTimeout = 10000;// 读取数据超时时间，毫秒

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

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
 
 /**
  * 扫描内容工具类
@@ -17,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
  * @date 2020-06-08 8:28
  **/
 @Slf4j
+@Component
 public class ScanContentUtils {
 	/**
 	 * desc:图片同步扫描

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -941,6 +941,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		SyncScanResult imgSyncScanResult = null;
 		SyncScanResult textSyncScanResult = null;
 		try {
+			log.info("scanContent imgScanParamDTO:{}", JSON.toJSONString(imgScanParamDTO));
+			log.info("scanContent textScanParamDTO:{}", JSON.toJSONString(textScanParamDTO));
 			imgSyncScanResult = ScanContentUtils.imgSyncScan(scanApiHost.concat(imgSyncScanMethod),imgScanParamDTO);
 			textSyncScanResult = ScanContentUtils.textSyncScan(scanApiHost.concat(textSyncScanMethod),textScanParamDTO);
 		} catch (Exception e) {