Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SoundServiceImpl.java

@@ -196,7 +196,7 @@ public class SoundServiceImpl implements SoundService {
                 double pitch1 = Math.abs(pitchs_s.get(i));
                 double pitch2 = Math.abs(pitchs_r.get(i));
                 double pitchGap = Math.abs(pitch1-pitch2);
-                if(pitchGap>pitch1||pitchGap>20){
+                if(pitchGap>pitch1||pitchGap>15){
                     pitchGap = pitch1;
                 }else if(pitchGap<5){
                     pitchGap = 0;
@@ -250,9 +250,9 @@ public class SoundServiceImpl implements SoundService {
             if(f!=null){
                 f.delete();
             }
-            if(f_r!=null){
-                f_r.deleteOnExit();
-            }
+//            if(f_r!=null){
+//                f_r.deleteOnExit();
+//            }
         }
 
         result.put("score", score);

mec-teacher/pom.xml

@@ -35,6 +35,11 @@
 			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-websocket</artifactId>
+		</dependency>
+
 		<!-- swagger-spring-boot -->
 		<dependency>
 			<groupId>com.spring4all</groupId>

mec-teacher/src/main/java/com/ym/mec/teacher/config/WebSocketConfig.java

@@ -0,0 +1,21 @@
+package com.ym.mec.teacher.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+/**
+ * @Author Joburgess
+ * @Date 2021/6/8 0008
+ */
+@Configuration
+@EnableWebSocket
+public class WebSocketConfig {
+
+    @Bean
+    public ServerEndpointExporter serverEndpoint() {
+        return new ServerEndpointExporter();
+    }
+
+}

mec-teacher/src/main/java/com/ym/mec/teacher/websocket/SoundWebSocket.java

@@ -0,0 +1,50 @@
+package com.ym.mec.teacher.websocket;
+
+import org.springframework.stereotype.Component;
+
+import javax.websocket.OnClose;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+import java.io.IOException;
+
+/**
+ * @Author Joburgess
+ * @Date 2021/6/8 0008
+ */
+@ServerEndpoint("/soundPoint")
+@Component
+public class SoundWebSocket {
+
+    /**
+     * 连接成功
+     *
+     * @param session
+     */
+    @OnOpen
+    public void onOpen(Session session) {
+        System.out.println("连接成功");
+    }
+
+    /**
+     * 连接关闭
+     *
+     * @param session
+     */
+    @OnClose
+    public void onClose(Session session) {
+        System.out.println("连接关闭");
+    }
+
+    /**
+     * 接收到消息
+     *
+     * @param text
+     */
+    @OnMessage
+    public String onMsg(String text) throws IOException {
+        return "servet 发送：" + text;
+    }
+
+}