Merge branch 'vip_price_827'

audio-analysis/src/main/java/com/yonge/netty/server/NettyServer.java

@@ -51,7 +51,7 @@ public class NettyServer {
 	 */
 	private String webSocketPath = "/audioAnalysis";
 
-	private EventLoopGroup bossGroup = new NioEventLoopGroup();
+	private EventLoopGroup bossGroup = new NioEventLoopGroup(1);
 
 	private EventLoopGroup workGroup = new NioEventLoopGroup(5);
 

mec-im/pom.xml

@@ -100,7 +100,6 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>
-      <version>4.1.24.Final</version>
     </dependency>
   </dependencies>
 

pom.xml

@@ -30,6 +30,12 @@
 				<version>${spring-boot.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
+				<exclusions>
+					<exclusion>
+						<groupId>org.springframework.boot</groupId>
+        				<artifactId>spring-boot-starter-log4j2</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 
 			<dependency>
@@ -38,6 +44,12 @@
 				<version>${spring-cloud.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
+				<exclusions>
+					<exclusion>
+						<groupId>org.springframework.boot</groupId>
+        				<artifactId>spring-boot-starter-log4j2</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 
 			<dependency>