Browse Source

接口错误

yingp 7 years ago
parent
commit
316744d527

+ 6 - 7
base-servers/socket/socket-api/src/main/java/com/usoftchina/saas/socket/api/SocketMessageApi.java

@@ -2,9 +2,7 @@ package com.usoftchina.saas.socket.api;
 
 import com.usoftchina.saas.base.Result;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -21,9 +19,10 @@ public interface SocketMessageApi {
      * @param message
      * @return
      */
-    @RequestMapping("/message/clients/{clientId}")
-    Result sendToClient(@PathVariable("clientId") String clientId,
-                        @RequestParam(value = "dest", required = false) String dest, String message);
+    @PostMapping("/message/clients")
+    Result sendToClient(@RequestParam("clientId") String clientId,
+                        @RequestParam(value = "dest", required = false) String dest,
+                        @RequestParam("message") String message);
 
     /**
      * 广播信息
@@ -32,6 +31,6 @@ public interface SocketMessageApi {
      * @param message
      * @return
      */
-    @RequestMapping("/message/clients")
-    Result sendToAllClients(@RequestParam(value = "dest", required = false) String dest, String message);
+    @PostMapping("/message/clients/all")
+    Result sendToAllClients(String dest, @RequestParam("message") String message);
 }

+ 4 - 5
base-servers/socket/socket-server/src/main/java/com/usoftchina/saas/socket/controller/MessageController.java

@@ -25,9 +25,8 @@ public class MessageController {
      * @param message
      * @return
      */
-    @RequestMapping("/clients/{clientId}")
-    public Result sendToClient(@PathVariable String clientId,
-                               @RequestParam(value = "dest", required = false) String dest, String message) {
+    @PostMapping("/clients")
+    public Result sendToClient(@RequestParam String clientId, String dest, @RequestParam String message) {
         /**
          * 前端使用
          * <pre>
@@ -45,8 +44,8 @@ public class MessageController {
      * @param message
      * @return
      */
-    @RequestMapping("/clients")
-    public Result sendToAllClients(@RequestParam(value = "dest", required = false) String dest, String message) {
+    @PostMapping("/clients/all")
+    public Result sendToAllClients(String dest, @RequestParam String message) {
         /**
          * 前端使用
          * <pre>