From 24ed993dac6466b5dfe9a84c4b0a4087f95dcd1f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 May 2021 18:17:54 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/netty/server/WebSocketServer.java | 2 +-
src/main/java/com/xcong/excoin/ExcoinApplication.java | 2 +-
pom.xml | 10 +++++-----
src/main/resources/application.yml | 14 +++++++-------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index c36163d..2b52ce0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,11 +218,11 @@
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>io.netty</groupId>-->
-<!-- <artifactId>netty-all</artifactId>-->
-<!-- <version>${netty.version}</version>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
<!--<dependency>-->
<!--<groupId>com.squareup.okhttp3</groupId>-->
diff --git a/src/main/java/com/xcong/excoin/ExcoinApplication.java b/src/main/java/com/xcong/excoin/ExcoinApplication.java
index 57b9e57..8908837 100644
--- a/src/main/java/com/xcong/excoin/ExcoinApplication.java
+++ b/src/main/java/com/xcong/excoin/ExcoinApplication.java
@@ -32,6 +32,6 @@
@Override
public void run(String... args) throws Exception {
-// webSocketServer.start();
+ webSocketServer.start();
}
}
diff --git a/src/main/java/com/xcong/excoin/netty/server/WebSocketServer.java b/src/main/java/com/xcong/excoin/netty/server/WebSocketServer.java
index a2d9773..f40c91d 100644
--- a/src/main/java/com/xcong/excoin/netty/server/WebSocketServer.java
+++ b/src/main/java/com/xcong/excoin/netty/server/WebSocketServer.java
@@ -36,7 +36,7 @@
.channel(NioServerSocketChannel.class)
.childHandler(webSocketServerInitializer);
- channelFuture = b.bind(9999).sync();
+ channelFuture = b.bind(9998).sync();
log.info("[websocket服务器启动完成]-->{}", channelFuture.channel().localAddress());
} finally {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7574bc3..f76fb8b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8888
+ port: 8889
servlet:
context-path: /
@@ -7,12 +7,12 @@
profiles:
active: dev
datasource:
- url: jdbc:mysql://154.91.195.170:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: yd_otc
- password: yd_otc123!@#
-# url: jdbc:mysql://120.27.238.55:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
-# username: ct_test
-# password: 123456
+# url: jdbc:mysql://154.91.195.170:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+# username: yd_otc
+# password: yd_otc123!@#
+ url: jdbc:mysql://120.27.238.55:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: ct_test
+ password: 123456
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
--
Gitblit v1.9.1