lighter 1 year ago
parent
commit
9000dda3d3

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>11.6.4</version>
+    <version>11.6.6</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

+ 5 - 1
src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/emr/EmrWebSocketController.java

@@ -45,11 +45,15 @@ public class EmrWebSocketController {
         return server.repeatedlyOpenTheSamePatient(sid);
     }
 
+    @PassToken
     @GetMapping("/sendAMessage")
     public ResultVo<String> sendAMessage(@RequestParam("sid") String sid,
                                          @RequestParam("key") String key,
                                          @RequestParam("message") String message) {
-        webSocketService.emrSendAMessage(sid, String.format("{\"%s\": \"%s\"}", key, message));
+        JSONObject obj = new JSONObject();
+        obj.put("sid", sid);
+        obj.put("msg", String.format("{\"%s\": \"%s\"}", key, message));
+        webSocketService.emrSendAMessage(obj);
         return ResultVoUtil.success();
     }
 

+ 2 - 2
src/main/java/thyyxxk/webserver/service/externalhttp/WebSocketService.java

@@ -70,6 +70,6 @@ public interface WebSocketService {
     @Post("/forcedKickingOutOfPersonnelByDocumentId")
     ResultVo<String> forcedKickingOutOfPersonnelByDocumentId(@JSONBody JSONObject js);
 
-    @Get("/emrSendAMessage?sid={sid}&msg={msg}")
-    void emrSendAMessage(@Var("sid") String sid, @Var("msg") String msg);
+    @Post("/emrSendAMessage")
+    void emrSendAMessage(@JSONBody JSONObject obj);
 }

+ 3 - 3
src/main/resources/application-prod.yml

@@ -79,9 +79,9 @@ logging:
 forest:
   timeout: 0
   read-timeout: 0
-  log-enabled: false
-  log-request: false
-  log-response-status: false
+  log-enabled: true
+  log-request: true
+  log-response-status: true
   variables:
     socketCenter: http://172.16.32.160:8707/socketApi
 

+ 3 - 3
src/main/resources/application-show.yml

@@ -76,9 +76,9 @@ spring:
 forest:
   timeout: 0
   read-timeout: 0
-  log-enabled: false
-  log-request: false
-  log-response-status: false
+  log-enabled: true
+  log-request: true
+  log-response-status: true
   variables:
     socketCenter: http://localhost:8707/socketApi
 

+ 3 - 3
src/main/resources/application.yml

@@ -81,9 +81,9 @@ spring:
 forest:
   timeout: 0
   read-timeout: 0
-  log-enabled: false
-  log-request: false
-  log-response-status: false
+  log-enabled: true
+  log-request: true
+  log-response-status: true
   variables:
     socketCenter: http://localhost:8707/socketApi