1.4.0.2版本修改代码提交

AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/remote/feign/AmosBankFeign.java

 package com.yeejoin.amos.patrol.service.remote.feign;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -13,23 +14,23 @@ import com.yeejoin.amos.patrol.common.entity.CommonResponse;
 
 
 //银行运控
-@FeignClient(name = "${AmosBank.fegin.name}")
+@FeignClient(name = "${gateway.fegin.name}")
 public interface AmosBankFeign {
 
 
-		    
-		@RequestMapping(value = "/api/protal/data", method = RequestMethod.GET)
+
+		@RequestMapping(value = "/api/protal/data", method = RequestMethod.GET,consumes= MediaType.APPLICATION_JSON_UTF8_VALUE)
 		CommonResponse pushSpcCheckResult( @RequestParam("date") String permissionType);
-	
-	    
-	    @RequestMapping(value = "/api/protal/hiddentrouble", method = RequestMethod.GET)
+
+
+	    @RequestMapping(value = "/api/protal/hiddentrouble", method = RequestMethod.GET,consumes= MediaType.APPLICATION_JSON_UTF8_VALUE)
 	    CommonResponse wakeUpOrRestartRiskFactorFlow( @RequestParam("date") String permissionType);
-	    
-	  
-	    @RequestMapping(value = "/rtsp/listVideoByPage", method = RequestMethod.POST ,consumes="application/json")
+
+
+	    @RequestMapping(value = "/rtsp/listVideoByPage", method = RequestMethod.POST ,consumes= MediaType.APPLICATION_JSON_UTF8_VALUE)
 		CommonResponse getVideos( @RequestBody MultiValueMap<String, Object>  param);
-	    
-	    @RequestMapping(value = "/rtsp/listVideoByPage/{orgCode}/{parentId}/{current}/{pageSize}", method = RequestMethod.POST)
+
+	    @RequestMapping(value = "/rtsp/listVideoByPage/{orgCode}/{parentId}/{current}/{pageSize}", method = RequestMethod.POST,consumes= MediaType.APPLICATION_JSON_UTF8_VALUE)
 		CommonResponse getVideos(
 				@PathVariable("orgCode") String orgCode,
 				@PathVariable("current") Integer current,

AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/remote/feign/AmosRiskFeign.java

@@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 /**
  * 风险系统
  */
-@FeignClient(name = "${AmosRisk.fegin.name}", configuration={MultipartSupportConfig.class})
+@FeignClient(name = "${gateway.fegin.name}", configuration={MultipartSupportConfig.class})
 public interface AmosRiskFeign {
 
-    @RequestMapping(value = "/api/risksource/data/patroldata", method = RequestMethod.PUT, consumes= MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/api/risksource/data/patroldata", method = RequestMethod.PUT, consumes= MediaType.APPLICATION_JSON_UTF8_VALUE)
     CommonResponse checkStatusPushToB(@RequestBody PointCheckInfoBusinessRespone pb);
 }

AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/remote/feign/PushFeign.java

@@ -21,24 +21,24 @@ import com.yeejoin.amos.patrol.service.business.param.PushMsgParam;
 public interface PushFeign {
 
 
-		    
+
 		@RequestMapping(value = "/api/user/sendMessage", method = RequestMethod.POST)
 		CommonResponse sendMessage( @RequestBody List<PushMsgParam> responses);
-	
-	    
+
+
 	    @RequestMapping(value = "/api/user/sendMessageone", method = RequestMethod.POST)
 	    CommonResponse sendMessageone( @RequestBody PushMsgParam responses);
-	    
-	  
+
+
 	    @RequestMapping(value = "/api/user/pushNoticeMany", method = RequestMethod.POST)
 	    CommonResponse pushNoticeMany( @RequestBody PushMsgParam responses);
-	    
+
 	    @RequestMapping(value = "/api/user/buildPushPayload", method = RequestMethod.POST)
 	    CommonResponse buildPushPayload( @RequestBody PushMsgParam responses);
-	    
+
 	    @RequestMapping(value = "/api/user/pushDevice", method = RequestMethod.GET)
 	    CommonResponse PushDevice( @RequestParam("alias") String alias);
-	    
+
 	    @RequestMapping(value = "/api/user/PushDeviceRegistration", method = RequestMethod.GET)
 	    CommonResponse PushDeviceRegistration( @RequestParam("registrationId") String registrationId,@RequestParam("alias") String alias);
 }

AmosBankPatrolStart/src/main/resources/application-dev.properties

 #\u7aef\u53e3
 #springcloud\u914d\u7f6e
-eureka.client.serviceUrl.defaultZone=http://172.16.10.175:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
 eureka.client.register-with-eureka=true
 eureka.client.fetch-registry=true
 eureka.client.healthcheck.enabled=true
@@ -11,14 +11,14 @@ ribbon.ReadTimeout=60000
 ribbon.OkToRetryOnAllOperations=true
 ribbon.MaxAutoRetriesNextServer=2
 ribbon.MaxAutoRetries=1
-server.port=9001
+server.port=9010
 #\u6570\u636e\u5e93\u914d\u7f6e
 
 #spring.datasource.url=jdbc:mysql://172.16.10.66:3306/amos_xian_bank?useSSL=false&&allowMultiQueries=true&serverTimezone=GMT&characterEncoding=utf8
 #spring.datasource.username=root
 #spring.datasource.password=root_123
 
-spring.datasource.url=jdbc:mysql://172.16.10.101:3306/amos_xian_bank?useSSL=false&&allowMultiQueries=true&serverTimezone=GMT%2b8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.10.66:3306/amos_xian_bank?useSSL=false&&allowMultiQueries=true&serverTimezone=GMT&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=root_123
 
@@ -47,16 +47,16 @@ Security.fegin.name=AMOS-API-PRIVILEGE
 
 #redis\u914d\u7f6e
 spring.redis.database=1
-spring.redis.host=127.0.0.1
+spring.redis.host=172.16.11.20
 spring.redis.port=6379
-spring.redis.password=
+spring.redis.password=1234560
 spring.redis.jedis.pool.max-active=200
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=10
 spring.redis.jedis.pool.min-idle=0
 spring.redis.timeout=1000
 spring.jackson.serialization.write-dates-as-timestamps=true
-  
+spring.main.allow-bean-definition-overriding=true
 
 
 #liquibase\u914d\u7f6e
@@ -91,7 +91,7 @@ params.isPush=true
 #\u5b89\u5168\u670d\u52a1\u540d\u79f0\uff08\u6ce8\u518c\u4e2d\u5fc3\u540d\u79f0\uff09
 #security.fegin.name=AmosSecurity-xjZjt
 #websocket\u670d\u52a1\u5730\u5740
-params.remoteWebsocketUrl=http://172.16.10.101:10600/
+params.remoteWebsocketUrl=http://172.16.11.20:10600/
 #\u5de5\u4f5c\u6d41\u5730\u5740
 #params.work.flow.address=
 #\u4ea4\u5927\u670d\u52a1\u5730\u5740
@@ -104,4 +104,5 @@ params.token=http://yeejoin.3322.org:3302/demo.html?token=
 spring.servlet.multipart.max-file-size=10480000
 spring.http.multipart.MaxRequestSize=50480000
 upload.root.path=C:/upload
-upload.server.address=http://172.16.3.41:9999/
+upload.server.address=http://172.16.3.41:9999/
\ No newline at end of file
+gateway.fegin.name=AMOS-BANK-SERVER-GATEWAY
\ No newline at end of file

AmosBankPatrolStart/src/main/resources/application-prod.properties

@@ -59,6 +59,7 @@ spring.redis.timeout=1000
 
 AmosBank.fegin.name=AmosBank-xian12238
 Security.fegin.name=AMOS-API-PRIVILEGE
+gateway.fegin.name=AMOS-BANK-SERVER-GATEWAY
 spring.jackson.serialization.write-dates-as-timestamps=true
 
 #liquibase

AmosBankPatrolStart/src/main/resources/application-test.properties

@@ -46,7 +46,7 @@ security.appKeyWeb=YH-PATROL2
 security.productApp=YH-PATROL2_APP
 security.appKeyApp=YH-PATROL2
 AmosBank.fegin.name=AmosBank-xian12238
-
+gateway.fegin.name=AMOS-BANK-SERVER-GATEWAYH
 #redis
 spring.redis.database=3
 spring.redis.host=127.0.0.1

AmosBankPatrolStart/src/main/resources/application.properties

@@ -3,10 +3,10 @@
 spring.application.name=YEEAMOSPATROL-2378
 #server.port=9001
 #spring.profiles.active=dev
-spring.profiles.active = prod
+spring.profiles.active = dev
 
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
 
 AmosRisk.fegin.name=YeeAmosRiskMode-237
 
-Push.fegin.name=AppMessagePushService15
+Push.fegin.name=JPUSH
\ No newline at end of file