swagger控制

src/main/java/com/chinaitop/SwaggerConfig.java

@@ -1,6 +1,7 @@
 package com.chinaitop;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -13,6 +14,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @Configuration
 @EnableSwagger2
+@ConditionalOnProperty(name = "swagger.enable", havingValue = "true")
 public class SwaggerConfig {
 
 	@Value("${eureka.instance.hostname}")

src/main/java/com/chinaitop/depot/storage/controller/JkqCrkController.java

@@ -51,10 +51,6 @@ public class JkqCrkController {
 	@Resource
 	private StorageKcglJkqyqApplyDefaultService storageKcglJkqyqApplyDefaultService;
 
-	// 获取出入库ip地址
-	@Value("${report-Url}")
-	private String changeUrl;
-	
 	@RequestMapping(value="/getApplyList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="架空期申请查询", notes = "支持分页")
 	@ApiImplicitParams({
@@ -479,20 +475,7 @@ public class JkqCrkController {
 		}
 		jso = jso + str + "]}";
 		try {
-		String url = changeUrl+"/business-management/changeStoragehous/saveJcq";
-        String count= HTTPUtils.doPost(url,jso);
-        if(count.contains("Success") || count.contains("200")){
-        	if(isUpload == 0) {
-        		dataKcglJkq.setIsUpload(1);
-        		dataKcglJkq.setYqsqNo(yqsqNo);
-        		storageKcglJkqyqApplyDefaultService.updateJkqStatus(dataKcglJkq);
-        		dataKcglJkq1.setIsUpload(1);
-        		dataKcglJkq1.setYqsqNo(yqsqNo);
-        		storageKcglJkqyqApplyDefaultService.updateJkq1Status(dataKcglJkq1);
-        	}
-            modelMap.put("status", "success");
-            modelMap.put("msg", "成功！");
-        }
+
 	 } catch (Exception e){
             e.printStackTrace();
             modelMap.put("status", "error");

src/main/java/com/chinaitop/depot/storage/controller/StorageChangeStoragehouseTaskController.java

@@ -67,8 +67,8 @@ public class StorageChangeStoragehouseTaskController {
 	private String url;
 	
 	// 获取出入库ip地址
-	@Value("${report-Url}")
-	private String changeUrl;
+//	@Value("${report-Url}")
+//	private String changeUrl;
 	/**
 	 * 得到当前倒仓主表中数据
 	 * 
@@ -557,14 +557,14 @@ public class StorageChangeStoragehouseTaskController {
 		str = str.substring(0, str.length()-1);
 		jso = jso + str + "]}";
 		try {
-		String url = changeUrl+"/business-management/changeStoragehous/save";
-		
-        String count= HTTPUtils.doPost(url,jso);
-        
-        if(count.contains("Success") || count.contains("200")){
-            modelMap.put("status", "success");
-            modelMap.put("msg", "成功！");
-        }
+//		String url = changeUrl+"/business-management/changeStoragehous/save";
+//		
+//        String count= HTTPUtils.doPost(url,jso);
+//        
+//        if(count.contains("Success") || count.contains("200")){
+//            modelMap.put("status", "success");
+//            modelMap.put("msg", "成功！");
+//        }
 	 } catch (Exception e){
             e.printStackTrace();
             modelMap.put("status", "error");
@@ -626,14 +626,14 @@ public class StorageChangeStoragehouseTaskController {
 		str = str.substring(0, str.length()-1);
 		jso = jso + str + "]}";
 		try {
-		String url = changeUrl+"/business-management/changeStoragehous/save";
-		
-        String count= HTTPUtils.doPost(url,jso);
-        
-        if(count.contains("Success") || count.contains("200")){
-            modelMap.put("status", "success");
-            modelMap.put("msg", "成功！");
-        }
+//		String url = changeUrl+"/business-management/changeStoragehous/save";
+//		
+//        String count= HTTPUtils.doPost(url,jso);
+//        
+//        if(count.contains("Success") || count.contains("200")){
+//            modelMap.put("status", "success");
+//            modelMap.put("msg", "成功！");
+//        }
 	 } catch (Exception e){
             e.printStackTrace();
             modelMap.put("status", "error");

src/main/resources/bootstrap.yml

@@ -10,6 +10,7 @@ eureka:
       defaultZone: http://tj_admin:Admin_1234@${eureka.instance.hostname}:9001/eureka/
   instance:
     hostname: 172.16.0.16
+    #hostname: localhost
     prefer-ip-address: true
     # 每隔10s发送一次心跳(默认30s)
     lease-renewal-interval-in-seconds: 10
@@ -24,18 +25,22 @@ management:
   server:
     port: -1
 
+#是否开启swaggeer? true开启,false关闭，生产环境要求关闭
+swagger:
+  enable: true
+
 spring:
   application:
     name: depot-qualitycheck
   # 数据库配置
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
-    username: gbasedbt
-    password: cDbK2S0go8
-    #url: jdbc:gbasedbt-sqli://10.223.3.63:9088/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    #url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
     #username: gbasedbt
-    #password: GBase123
+    #password: cDbK2S0go8
+    url: jdbc:gbasedbt-sqli://200.2.68.126:9088/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    username: gbasedbt
+    password: GBase123
     driver-class-name: com.gbasedbt.jdbc.IfxDriver
 
   # 缓存配置
@@ -68,7 +73,7 @@ cxf:
 crk-webservice: /Base/webServices/StoreChangeServer?wsdl
 
 #省平台倒仓审批接口
-report-Url: http://172.16.2.10:88/api
+#report-Url: http://172.16.2.10:88/api
 
 #给市平台推自检/出库数据的接口
 reportForSPT-Url: http://172.16.0.72:8888