'提交'

src/main/java/com/steerinfo/dil/controller/WebSocketController.java

@@ -40,4 +40,9 @@ public class WebSocketController {
     public RESTfulResult getMessageCount(@PathVariable String id,@RequestParam()String readFlag){
         return webSocketFeign.getMessageCount(id,readFlag);
     }
+
+    @GetMapping("/getBaseWebsocketPush")
+    public RESTfulResult getBaseWebsocketPush(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        return webSocketFeign.basewebsocketpushsList(parmas,pageNum,pageSize);
+    }
 }

src/main/java/com/steerinfo/dil/feign/WebSocketFeign.java

@@ -18,11 +18,16 @@ import java.util.HashMap;
 public interface WebSocketFeign {
     @PostMapping("api/v1/websocket/basewebsocketsends/readWebsocket/{id}")
     RESTfulResult readWebsocket(@PathVariable("id") String sendId);
-
     @PostMapping("api/v1/websocket/basewebsocketsends/sendWebsocket/{id}")
     RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String,Object> map);
     @GetMapping("api/v1/websocket/basewebsocketsends/")
     RESTfulResult list(@RequestParam("parmas")HashMap<String,Object> parmas,@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);
     @GetMapping("api/v1/websocket/basewebsocketsends/getMessageCount/{id}")
     RESTfulResult getMessageCount(@PathVariable String id,@RequestParam()String readFlag);
+    @GetMapping("api/v1/websocket/basewebsocketpushs/")
+    RESTfulResult basewebsocketpushsList(@RequestParam("parmas")HashMap<String,Object> parmas,@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);
+    @GetMapping("api/v1/websocket/basewebsocketpushs/noPage")
+    RESTfulResult noPage(@RequestParam HashMap<String,Object> parmas);
+    @GetMapping("api/v1/websocket/basewebsocketpushs/{id}")
+    RESTfulResult get(@PathVariable String id);
 }

src/main/resources/application-prod.yml

@@ -46,7 +46,7 @@ openfeign:
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.214:9001}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:localhost:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
 
 
 #远程调用

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8