From 35a95f07eeb76b829330cd1314d2737413c3ee4e Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Thu, 11 Jun 2020 10:38:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9openApi=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
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 ++
 .../java/com/epmet/service/impl/ArticleServiceImpl.java   | 8 ++++----
 .../gov-voice-server/src/main/resources/bootstrap.yml     | 2 +-
 .../epmet/openapi/scan/common/enu/SysResponseEnum.java    | 1 -
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml
index ae10e72c5e..1284d33f70 100644
--- a/epmet-module/gov-voice/gov-voice-server/pom.xml
+++ b/epmet-module/gov-voice/gov-voice-server/pom.xml
@@ -134,6 +134,7 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
+                <openapi.scan.server.url>http://localhost:8107/epmetscan/api</openapi.scan.server.url>
             </properties>
         </profile>
         <profile>
@@ -166,6 +167,7 @@
                 <nacos.ip/>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
+                <openapi.scan.server.url>http://localhost:8107/epmetscan/api</openapi.scan.server.url>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index bfc9a6ade6..74915f7882 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -121,8 +121,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	@Autowired
 	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
-	@Value("${openapi.scan.server.host}")
-	private String scanApiHost;
+	@Value("${openapi.scan.server.url}")
+	private String scanApiUrl;
 	@Value("${openapi.scan.method.imgSyncScan}")
 	private String imgSyncScanMethod;
 	@Value("${openapi.scan.method.textSyncScan}")
@@ -974,12 +974,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 			if(!CollectionUtils.isEmpty(imgScanParamDTO.getTasks())){
 			log.info("scanContent imgScanParamDTO:{}", JSON.toJSONString(imgScanParamDTO));
-				imgSyncScanResult = ScanContentUtils.imgSyncScan(scanApiHost.concat(imgSyncScanMethod), imgScanParamDTO);
+				imgSyncScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
 				log.info("scanContent imgSyncScanResult:{}", JSON.toJSONString(imgSyncScanResult));
 			}
 			if(!CollectionUtils.isEmpty(textScanParamDTO.getTasks())){
 			log.info("scanContent textScanParamDTO:{}", JSON.toJSONString(textScanParamDTO));
-				textSyncScanResult = ScanContentUtils.textSyncScan(scanApiHost.concat(textSyncScanMethod), textScanParamDTO);
+				textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
 				log.info("scanContent textSyncScanResult:{}", JSON.toJSONString(textSyncScanResult));
 			}
 
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
index b33cc8bcde..8504cb2d5a 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
@@ -106,7 +106,7 @@ ribbon:
 openapi:
   scan:
     server:
-      host: http://localhost:8107/epmetscan/api
+      url: @openapi.scan.server.url@
     method:
       imgSyncScan: /imgSyncScan
       textSyncScan: /textSyncScan
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 4cd76b8ca5..330cdb87e8 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
@@ -20,7 +20,6 @@ public enum SysResponseEnum {
 	 */
 	/*通用枚举 */
 	EXCEPTION(10001,"系统异常"),
-	AUTH_FAIL(10002,"验签失败"),
 
 
 	/*审核内容 业务 01*/