From 966a7db4861855a3eb32be0d4b88a41f526b178f Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Thu, 3 May 2018 17:41:26 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/demo/chat/Client.java         | 7 ++++---
 .../src/main/java/com/xwbing/demo/chat/Server.java         | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/demo/chat/Client.java b/boot-service/src/main/java/com/xwbing/demo/chat/Client.java
index bfa24b3..9cc6857 100644
--- a/boot-service/src/main/java/com/xwbing/demo/chat/Client.java
+++ b/boot-service/src/main/java/com/xwbing/demo/chat/Client.java
@@ -43,7 +43,7 @@ public class Client {
             ServerHandler handler = new ServerHandler();
             Thread t = new Thread(handler);
             t.start();
-			/*
+            /*
 			 * outputstream getoutputstream（） 通过socket获取输出流，用来将数据发送至服务端
 			 */
             Scanner sc = new Scanner(System.in);
@@ -72,12 +72,13 @@ public class Client {
     /**
      * 该线程任务是用来接收服务端发送过来的消息并输出到客户端的控制台上
      */
-    class ServerHandler implements Runnable {
+    private class ServerHandler implements Runnable {
+        @Override
         public void run() {
             try {
                 BufferedReader br = new BufferedReader(new InputStreamReader(
                         socket.getInputStream(), "utf-8"));
-                String message = null;
+                String message;
                 while ((message = br.readLine()) != null) {
                     System.out.println(message);
                 }
diff --git a/boot-service/src/main/java/com/xwbing/demo/chat/Server.java b/boot-service/src/main/java/com/xwbing/demo/chat/Server.java
index 0a60075..434d004 100644
--- a/boot-service/src/main/java/com/xwbing/demo/chat/Server.java
+++ b/boot-service/src/main/java/com/xwbing/demo/chat/Server.java
@@ -120,7 +120,7 @@ public class Server {
         //客户端地址信息
         private String host;
 
-        public ClientHandler(Socket socket) {
+        ClientHandler(Socket socket) {
             this.socket = socket;
 			/*
 			 * 通过socket可以获取远程计算机地址信息
@@ -131,6 +131,7 @@ public class Server {
             host = address.getHostAddress();
         }
 
+        @Override
         public void run() {
             PrintWriter pw = null;
             try {