浏览代码

活检websocket 变更

Michael Wang 5 年之前
父节点
当前提交
97d96e8a5c
共有 3 个文件被更改,包括 11 次插入9 次删除
  1. 6 6
      .env.development
  2. 4 2
      src/features/OnlineExam/Examing/FaceId.vue
  3. 1 1
      src/features/OnlineExam/Examing/ws.js

+ 6 - 6
.env.development

@@ -1,6 +1,6 @@
-VUE_APP_TK_SERVER_HTML_URL=http://192.168.10.39:5220
-VUE_APP_TK_SERVER_API_URL=http://192.168.10.39:8008
-VUE_APP_WK_SERVER_SOCKET=wss://ecs-dev.qmth.com.cn:8878/oewebsocket/
-VUE_APP_WK_SERVER_SOCKET_FOR_AUDIO=wss://ecs-dev.qmth.com.cn:8878/oewebsocket/fileAnswer/
-VUE_APP_CORE_HOST_URL=https://192.168.10.39:8878
-VUE_APP_OE_HOST_URL=https://192.168.10.39:8878
+VUE_APP_TK_SERVER_HTML_URL=http://192.168.10.38:5220
+VUE_APP_TK_SERVER_API_URL=http://192.168.10.38:8008
+VUE_APP_WK_SERVER_SOCKET=wss://wuhan-dev.qmth.com.cn:8878/api/ws/faceBiopsy
+VUE_APP_WK_SERVER_SOCKET_FOR_AUDIO=wss://wuhan-dev.qmth.com.cn:8878/api/ws/fileAnswer
+VUE_APP_CORE_HOST_URL=https://192.168.10.38:8878
+VUE_APP_OE_HOST_URL=https://192.168.10.38:8878

+ 4 - 2
src/features/OnlineExam/Examing/FaceId.vue

@@ -197,7 +197,9 @@ export default {
     },
     openWebsocketToStartFaceIDTest() {
       this.closeWS();
-      this.ws = new WebSocket(VUE_APP_WK_SERVER_SOCKET + this.examRecordId);
+      this.ws = new WebSocket(
+        `${VUE_APP_WK_SERVER_SOCKET}?key=${this.$store.state.user.key}&token=${this.$store.state.user.token}`
+      );
       this.ws.onopen = function() {
         window._hmt.push([
           "_trackEvent",
@@ -212,7 +214,7 @@ export default {
           this.haveReceivedMsg = true;
           var receivedMsg = JSON.parse(response.data);
           // 两个结束点。第二个结束点:从websocket得到消息。
-          this.faceTestEnd(receivedMsg);
+          this.faceTestEnd(receivedMsg.content);
           clearTimeout(this.faceIdTimeout);
           clearInterval(this.timeCountInterval);
           this.$emit("closeFaceId");

+ 1 - 1
src/features/OnlineExam/Examing/ws.js

@@ -14,7 +14,7 @@ export function openWS({ examRecordDataId }) {
   console.log("in openWS", examRecordDataId);
   ws = new WebSocket(
     VUE_APP_WK_SERVER_SOCKET_FOR_AUDIO +
-      `${examRecordDataId}/${store.state.user.key}/${store.state.user.token}`
+      `?key=${store.state.user.key}&token=${store.state.user.token}`
   );
 
   ws.onopen = event => {