Merge branch 'master' of https://github.com/yetel/EasyChatJavaFXClient

Author: zed1201

README.md

@@ -7,3 +7,8 @@
 2. 按照后端的要求先将后端启动起来
 3. 然后配置ServerConf类里面的后端服务器ip
 4. 具体流程参考后端提供的接口文档，有较为详细的说明
+
+## EasyChat相关开源项目
+
+#### 服务端：[EasyChatServer](https://github.com/yetel/EasyChatServer)
+#### Android客户端：[EasyChatAndroidClient](https://github.com/yetel/EasyChatAndroidClient)

pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.38.Final</version>
+            <version>4.1.42.Final</version>
         </dependency>
 
         <dependency>