diff --git "a/notes/github\345\234\250\347\272\277\347\211\210.txt" "b/notes/github\345\234\250\347\272\277\347\211\210.txt"
new file mode 100644
index 0000000..61a74f8
--- /dev/null
+++ "b/notes/github\345\234\250\347\272\277\347\211\210.txt"
@@ -0,0 +1 @@
+https://github.com/coding-technology/JavaCore.git
\ No newline at end of file
diff --git a/notes/netty/netty.assets/1596880013533.png b/notes/netty/netty.assets/1596880013533.png
new file mode 100644
index 0000000..5e7a913
Binary files /dev/null and b/notes/netty/netty.assets/1596880013533.png differ
diff --git a/notes/netty/netty.assets/1596880060937.png b/notes/netty/netty.assets/1596880060937.png
new file mode 100644
index 0000000..1e9ad9d
Binary files /dev/null and b/notes/netty/netty.assets/1596880060937.png differ
diff --git a/notes/netty/netty.assets/1597652263171.png b/notes/netty/netty.assets/1597652263171.png
new file mode 100644
index 0000000..28a3ca1
Binary files /dev/null and b/notes/netty/netty.assets/1597652263171.png differ
diff --git a/notes/netty/netty.assets/1598257901806.png b/notes/netty/netty.assets/1598257901806.png
new file mode 100644
index 0000000..08b1d82
Binary files /dev/null and b/notes/netty/netty.assets/1598257901806.png differ
diff --git a/notes/netty/netty.assets/1598860295543.png b/notes/netty/netty.assets/1598860295543.png
new file mode 100644
index 0000000..444917b
Binary files /dev/null and b/notes/netty/netty.assets/1598860295543.png differ
diff --git a/notes/netty/netty.assets/1598860500419.png b/notes/netty/netty.assets/1598860500419.png
new file mode 100644
index 0000000..7e2066a
Binary files /dev/null and b/notes/netty/netty.assets/1598860500419.png differ
diff --git a/notes/netty/netty.assets/1598860966092.png b/notes/netty/netty.assets/1598860966092.png
new file mode 100644
index 0000000..4438d1d
Binary files /dev/null and b/notes/netty/netty.assets/1598860966092.png differ
diff --git a/notes/netty/netty.assets/1598863051468.png b/notes/netty/netty.assets/1598863051468.png
new file mode 100644
index 0000000..ddcd18f
Binary files /dev/null and b/notes/netty/netty.assets/1598863051468.png differ
diff --git a/notes/netty/netty.assets/1599466437487.png b/notes/netty/netty.assets/1599466437487.png
new file mode 100644
index 0000000..f63f46a
Binary files /dev/null and b/notes/netty/netty.assets/1599466437487.png differ
diff --git a/notes/netty/netty.assets/1599467032397.png b/notes/netty/netty.assets/1599467032397.png
new file mode 100644
index 0000000..e3d35c3
Binary files /dev/null and b/notes/netty/netty.assets/1599467032397.png differ
diff --git a/notes/netty/netty.assets/1599469946932.png b/notes/netty/netty.assets/1599469946932.png
new file mode 100644
index 0000000..f5d1322
Binary files /dev/null and b/notes/netty/netty.assets/1599469946932.png differ
diff --git a/notes/netty/netty.md b/notes/netty/netty.md
new file mode 100644
index 0000000..bce9f70
--- /dev/null
+++ b/notes/netty/netty.md
@@ -0,0 +1,926 @@
+# netty
+
+前置课程：NIO
+
+重要性：
+
+hadoop  spark  dubbo  等众多知名的框架，阿里巴巴、facebook、twtitter等知名公司都使用到了netty作为底层框架。
+
+稳定性：netty4.x 
+
+netty.io
+
+jboss公司的项目
+
+核心：netty是一个异步的、基于事件驱动模式的网络应用框架。
+
+
+
+## 搭建netty开发环境
+
+1.安装Jdk
+
+2.下载安装gradle
+
+(1)下载gradle-5.3-all.zip
+
+（2）环境变量： GRADLE_HOME ：上一步gradle解压后的根目录
+
+（3）PATH:  %GRADLE_HOME%\bin
+
+（4）curl： 下载windows版curl，只需要将curl.exe所在目录配置到path中即可。
+
+3.创建netty工程
+
+4.增加netty依赖
+
+build.gradle
+
+```xml
+plugins {
+    id 'java'
+}
+
+group 'com.yanqun'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+//    mavenCentral()
+    maven{ url 'http://maven.aliyun.com/nexus/content/groups/public'}
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile group: 'io.netty', name: 'netty-all', version: '4.1.50.Final'
+}
+
+```
+
+## 第一个netty的hello world
+
+模板化代码：类似JDBC
+
+具体的模板流程(以服务端为例)
+
+ - 入口类/主程序类
+
+   	- 配置一些参数 
+
+ - 内置初始化器（处理器）
+
+   	- 调用一些内置的类
+
+ - 自定义初始化器（处理器）
+
+   	- 编写一些自定义的类
+
+netty强大的核心：
+
+​	netty内部提供了非常强大的类库（内置初始化器），每个初始化器都可以完成一个 小的功能。因此，以后在开发时，我们第一步需要先将 需要完成的功能 分解成若干部；第二步 只需要在netty类库中寻找，看哪些已有类能够帮助我们直接实现； 第三步，如果某个功能netty没有提供，则编写自定义初始化器
+
+总结： 分解功能 ->在类库中找 ->如果还些找不到，自定义编写
+
+   
+
+实现：
+
+第一步：入口类
+
+```java
+package helloworld;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+
+/*
+ * Created by 颜群
+ */
+public class NettyServerTest {//入口类
+
+    public static void main(String[] args) {
+
+        //创建事件循环组 （master -slaver）
+        EventLoopGroup bossGroup =  new NioEventLoopGroup() ;//接收客户端连接，并分发给workerGroup
+        EventLoopGroup workerGroup =  new NioEventLoopGroup() ;//真正的处理连接
+        //启动
+        ServerBootstrap serverBootstrap = new ServerBootstrap();
+        try {
+            ChannelFuture channelFuture = serverBootstrap.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class)
+
+                    //综合（内置+自定义）初始化器
+                    .childHandler(new NettyServerInit())
+
+                    .bind(8888)
+                    .sync();
+            channelFuture.channel().closeFuture().sync() ;
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }finally{
+            bossGroup.shutdownGracefully();
+            workerGroup.shutdownGracefully() ;
+        }
+
+    }
+
+}
+
+```
+
+第二步：编写综合初始化器（内置+自定义的）
+
+```java
+package helloworld;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.http.HttpObject;
+import io.netty.handler.codec.http.HttpServerCodec;
+
+/*
+ * Created by 颜群
+ */
+//综合（内置+自定义）初始化器
+public class NettyServerInit extends ChannelInitializer<SocketChannel> {
+    //当连接注册到channel时，执行此方法
+    @Override
+    protected void initChannel(SocketChannel ch) throws Exception {
+        ChannelPipeline pipeline = ch.pipeline();
+        //内置初始化器 （编码初始化器：HttpServerCodec）
+        pipeline.addLast( "HttpServerCodec",new HttpServerCodec()  )  ;
+
+        //自定义初始化器（NettyServerHandler）
+        pipeline.addLast("NettyServerHandler",new NettyServerHandler());
+    }
+}
+
+```
+
+第三步：编写自定义初始化器
+
+```java
+package helloworld;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.*;
+import io.netty.util.CharsetUtil;
+
+/*
+ * Created by 颜群
+ */
+public class NettyServerHandler extends SimpleChannelInboundHandler<HttpObject> {
+    //doGet  doPost
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
+        if(msg instanceof HttpRequest){
+            //定义响应内容
+            ByteBuf content = Unpooled.copiedBuffer("welcome netty family...", CharsetUtil.UTF_8);
+            //封装响应对象
+            DefaultFullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK, content);
+            response.headers().set(HttpHeaderNames.CONTENT_TYPE,"text/plain") ;
+            response.headers().set(HttpHeaderNames.CONTENT_LENGTH  , content.readableBytes() ) ;//不是content.readByte()
+
+            ctx.writeAndFlush(response) ;
+
+        }
+    }
+}
+
+```
+
+流程
+
+![1596880013533](netty.assets/1596880013533.png)
+
+​	
+
+![1596880060937](netty.assets/1596880060937.png)
+
+
+
+步骤：
+
+​	Test -Init + Handler
+
+说明：浏览器在发起请求时，会默认请求图标favicon.ico文件，因此会比curl多发出一次请求。
+
+
+
+分析：
+
+自定义处理器依次继承：
+
+SimpleChannelInboundHandler->ChannelInboundHandlerAdapter->ChannelInboundHandler->ChannelHandler
+
+另一条继承链：ChannelHandler<- ChannelOutboundHandler
+
+![1597652263171](netty.assets/1597652263171.png)
+
+继承链中的各个方法
+
+netty遵循了事件回调机制：类似于ajax/javascript/html：在不同的阶段，会自动的执行一些方法，生命周期方法。
+
+
+
+通过curl请求netty服务端，多次的请求结果是一致的
+
+
+
+2次请求：
+
+正常请求内容：浏览器会保存请求状态。
+
+​	初始化和销毁工作只执行一次（Http1.1,Keep-alive持续连接机制，第一次访问结束后 并不会立刻关闭连接）
+
+请求favicon.ico：
+
+	- 第二次请求时，会结束上次一对favicon.ico的请求。
+	- 每次请求 都是一个完整的回路
+
+
+
+## 案例：点对点聊天
+
+![1598257901806](netty.assets/1598257901806.png)
+
+
+
+服务端
+
+1.入口类
+
+```.java
+package dot2dot;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+
+/*
+ * Created by 颜群
+ * 入口类->初始化器 ->自定义处理器
+ */
+public class MyNettyServerTest {
+
+    public static void main(String[] args) {
+
+        //创建事件循环组 （master -slaver）
+        EventLoopGroup bossGroup =  new NioEventLoopGroup() ;//接收客户端连接，并分发给workerGroup
+        EventLoopGroup workerGroup =  new NioEventLoopGroup() ;//真正的处理连接
+        //启动
+        ServerBootstrap serverBootstrap = new ServerBootstrap();
+        try {
+            ChannelFuture channelFuture = serverBootstrap.group(bossGroup, workerGroup)
+                    .channel(NioServerSocketChannel.class)
+
+                    //综合（内置+自定义）初始化器
+                    .childHandler(new MyNettyServerInit())
+
+                    .bind(8888)
+                    .sync();
+            channelFuture.channel().closeFuture().sync() ;
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }finally{
+            bossGroup.shutdownGracefully();
+            workerGroup.shutdownGracefully() ;
+        }
+
+    }
+
+}
+
+```
+
+2.初始化器
+
+```java
+package dot2dot;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+
+/*
+ * Created by 颜群
+ *
+ * netty自带类库解决
+ */
+public class MyNettyServerInit extends ChannelInitializer<SocketChannel> {
+    @Override
+    protected void initChannel(SocketChannel ch) throws Exception {
+
+        //合并、解码
+
+        ChannelPipeline pipeline = ch.pipeline();
+        //解码
+        pipeline.addLast("LengthFieldBasedFrameDecoder",new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE,0,8,0,8 )) ;
+        //合并
+        pipeline.addLast("LengthFieldPrepender", new LengthFieldPrepender(8)) ;
+
+        //统一乱码
+        pipeline.addLast("StringDecoder",new StringDecoder(CharsetUtil.UTF_8));
+        pipeline.addLast("StringEncoder",new StringEncoder(CharsetUtil.UTF_8));
+
+        pipeline.addLast("MyNettyServerHandler",new MyNettyServerHandler()) ;
+
+
+    }
+}
+
+```
+
+3.自定义处理器
+
+```java
+package dot2dot;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+import java.util.Scanner;
+
+/*
+ * Created by 颜群
+ * 自定义功能：聊天
+ */
+public class MyNettyServerHandler extends SimpleChannelInboundHandler<String> {
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
+        //接收消息
+        System.out.println("服务端 接收到了"+ctx.channel().remoteAddress()+",消息是："+msg);
+
+        //发送消息
+        System.out.println("请输入内容：");
+        String send = new Scanner(System.in).nextLine() ;
+        ctx.channel().writeAndFlush(send) ;
+    }
+}
+
+```
+
+
+
+客户端
+
+1.入口类
+
+```java
+package dot2dot;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+
+/*
+ * Created by 颜群
+ * 入口类->初始化器 ->自定义处理器
+ */
+public class MyNettyClientTest {
+
+    public static void main(String[] args) {
+
+        //创建事件循环组
+        EventLoopGroup eventLoopGroup =  new NioEventLoopGroup() ;
+
+        //启动
+       Bootstrap bootstrap = new Bootstrap();
+        try {
+            bootstrap.group(eventLoopGroup)
+                    .channel(NioSocketChannel.class)
+                    //综合（内置+自定义）初始化器
+                    .handler(new MyNettyClientInit());
+
+            ChannelFuture channelFuture = bootstrap.connect("127.0.0.1", 8888).sync();
+            channelFuture.channel().closeFuture().sync() ;//future模式
+
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }finally{
+            eventLoopGroup.shutdownGracefully();
+        }
+
+    }
+
+}
+
+```
+
+
+
+2.初始化器
+
+```java
+package dot2dot;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+
+/*
+ * Created by 颜群
+ */
+public class MyNettyClientInit extends ChannelInitializer<SocketChannel> {
+    @Override
+    protected void initChannel(SocketChannel ch) throws Exception {
+
+        //合并、解码
+        ChannelPipeline pipeline = ch.pipeline();
+        //解码
+        pipeline.addLast("LengthFieldBasedFrameDecoder",new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE,0,8,0,8 )) ;
+        //合并
+        pipeline.addLast("LengthFieldPrepender", new LengthFieldPrepender(8)) ;
+
+        //统一乱码
+        pipeline.addLast("StringDecoder",new StringDecoder(CharsetUtil.UTF_8));
+        pipeline.addLast("StringEncoder",new StringEncoder(CharsetUtil.UTF_8));
+
+        pipeline.addLast("MyNettyClientHandler",new MyNettyClientHandler()) ;
+
+
+
+    }
+}
+
+```
+
+
+
+3.自定义处理器
+
+```java
+	package dot2dot;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+import java.util.Scanner;
+
+/*
+ * Created by 颜群
+ */
+public class MyNettyClientHandler extends SimpleChannelInboundHandler {
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
+
+        //接收消息
+        System.out.println("客户端 接收到了"+ctx.channel().remoteAddress()+",消息是："+msg);
+
+        //发送消息
+        System.out.println("请输入内容：");
+        String send = new Scanner(System.in).nextLine() ;
+        ctx.channel().writeAndFlush(send) ;
+    }
+
+    //为了 避免 客户端和服务端 都在等待对方发送第一条消息，就需要  有人（客户端）主动发送第一条消息
+
+
+    //当连接成功时，会触发channelActive()方法
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        ctx.writeAndFlush("开始聊天吧...") ;
+    }
+}
+
+```
+
+案例：点对多点/点对端/ 聊天室
+
+Netty - NIO
+
+参照：**亿级流量Java高并发与网络编程实战**
+
+只看代码：扫码，在公众号回复“资料”
+
+![1598860966092](netty.assets/1598860966092.png)
+
+端口冲突的处理办法：
+
+查看端口冲突的PID:    netstat -ano|findstr 8888  ，结果18484
+
+结束进程taskkill /pid 18484 /f
+
+
+
+## 使用netty实现心跳机制
+
+![1598860295543](netty.assets/1598860295543.png)
+
+在弱网环境中，事件驱动的机制 会失效。使用心跳机制解决。
+
+![1598860500419](netty.assets/1598860500419.png)
+
+心跳机制：远端的双方，每隔一段时间 会1接收对方的消息 2给对方法消息；如果一方长时间 接收不到 对方的消息，就可以认为对方处于异常环境，此时就可以切断对方的连接
+
+netty提供的心跳机制处理器：IdleStateHandler
+
+服务端代码
+
+入口类
+
+```java
+package heartbeat;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+
+/*
+ * Created by 颜群
+ * 入口类->初始化器 ->自定义处理器
+ */
+public class MyNettyServerTest {
+
+    public static void main(String[] args) {
+
+        //创建事件循环组 （master -slaver）
+        EventLoopGroup bossGroup =  new NioEventLoopGroup() ;//接收客户端连接，并分发给workerGroup
+        EventLoopGroup workerGroup =  new NioEventLoopGroup() ;//真正的处理连接
+        //启动
+        ServerBootstrap serverBootstrap = new ServerBootstrap();
+        try {
+            ChannelFuture channelFuture = serverBootstrap.group(bossGroup, workerGroup)
+                    .channel(NioServerSocketChannel.class)
+
+                    //综合（内置+自定义）初始化器
+                    .childHandler(new MyNettyServerInit())
+
+                    .bind(8888)
+                    .sync();
+            channelFuture.channel().closeFuture().sync() ;
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }finally{
+            bossGroup.shutdownGracefully();
+            workerGroup.shutdownGracefully() ;
+        }
+
+    }
+
+}
+
+```
+
+初始化器
+
+```java
+package heartbeat;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.handler.timeout.IdleStateHandler;
+import io.netty.util.CharsetUtil;
+
+/*
+ * Created by 颜群
+ *
+ */
+public class MyNettyServerInit extends ChannelInitializer<SocketChannel> {
+    @Override
+    protected void initChannel(SocketChannel ch) throws Exception {
+
+
+        ChannelPipeline pipeline = ch.pipeline();
+        //netty自带的处理器
+        //三个参数：readerIdleTimeSeconds、writerIdleTimeSeconds、allIdleTimeSeconds
+        pipeline.addLast( "",  new IdleStateHandler(30,5,7));
+        //自定义处理器
+        pipeline.addLast("MyNettyServerHandler",new MyNettyServerHandler()) ;
+
+
+    }
+}
+
+```
+
+自定义处理器
+
+```java
+package heartbeat;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.timeout.IdleStateEvent;
+
+import java.util.Scanner;
+
+/*
+ * Created by 颜群
+ * 自定义功能：聊天
+ */
+public class MyNettyServerHandler extends SimpleChannelInboundHandler<Object> {
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
+        //接收客户端 主动发来的消息
+    }
+
+    //可以用于处理心跳机制的方法
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        //用于心跳机制的 数据类型
+        if(evt instanceof IdleStateEvent){
+            String eventType = null ;
+            IdleStateEvent event = (IdleStateEvent)evt ;
+            //获取具体的超时事件
+            switch (event.state() ){
+                case READER_IDLE:
+                    eventType = "读空闲" ;
+                    break ;
+                case WRITER_IDLE:
+                    eventType = "写空闲" ;
+                    break ;
+                case ALL_IDLE:
+                    eventType = "读写空闲" ;
+                    break ;
+            }
+            System.out.println( ctx.channel().remoteAddress() +"超时事件：【"+ eventType+"】");
+            ctx.channel().close() ;
+
+        }
+    }
+}
+
+```
+
+客户单通过curl模拟
+
+![1598863051468](netty.assets/1598863051468.png)
+
+## 使用Netty实现websocket通信
+
+传统的http请求：
+
+1.客户端发起请求，服务端接收并作出响应。每次请求，都是由客户端发起的，是**单向请求**
+
+2.物理层、数据链路层 、*网络层* 、传输层(TCP协议) 、会话层 、表示层 、应用层（http协议）
+
+TCP协议 连接是经过三次握手，关闭是经过四次握手。
+
+每一次客户端向服务端发起请求，然后交互，都会经过三次握手 和四次握手。每次客户端与服务端通信，都必须 建立连接、通信、关闭连接
+
+
+
+webscoket优点：
+
+1.支持客户端 和服务端的双向通信 （全双工通信）
+
+![1599466437487](netty.assets/1599466437487.png)
+
+2.支持长连接通信：第一次通信时需要建立连接，之后在一定时间内如果再次通信，则无需重新建立建立。
+
+流程示意图
+
+重点：客户端和服务端是等价的，二者的功能相同
+
+![1599467032397](netty.assets/1599467032397.png)
+
+如何实现？
+
+入口类 - 初始化器 - 自定处理器
+
+netty难在哪？难在积累
+
+​	看官方API文档
+
+​    看书籍《netty实战》等
+
+初始化器 （使用Netty内置类）- 自定处理器（自己编码）
+
+一个功能：分解成5个小功能  = 3个netty自带的类 + 2个自定义类
+
+netty端
+
+```java
+package ws.dot2dot;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+
+/*
+ * Created by 颜群
+ * 入口类->初始化器 ->自定义处理器
+ */
+public class MyNettyServerTest {
+
+    public static void main(String[] args) {
+
+        //创建事件循环组 （master -slaver）
+        EventLoopGroup bossGroup =  new NioEventLoopGroup() ;//接收客户端连接，并分发给workerGroup
+        EventLoopGroup workerGroup =  new NioEventLoopGroup() ;//真正的处理连接
+        //启动
+        ServerBootstrap serverBootstrap = new ServerBootstrap();
+        try {
+            ChannelFuture channelFuture = serverBootstrap.group(bossGroup, workerGroup)
+                    .channel(NioServerSocketChannel.class)
+
+                    //综合（内置+自定义）初始化器
+                    .childHandler(new MyNettyServerInit())
+
+                    .bind(8888)
+                    .sync();
+            channelFuture.channel().closeFuture().sync() ;
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }finally{
+            bossGroup.shutdownGracefully();
+            workerGroup.shutdownGracefully() ;
+        }
+
+    }
+
+}
+
+```
+
+
+
+```java
+package ws.dot2dot;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+
+/*
+ * Created by 颜群
+ *
+ * netty自带类库解决
+ */
+public class MyNettyServerInit extends ChannelInitializer<SocketChannel> {
+    @Override
+    protected void initChannel(SocketChannel ch) throws Exception {
+
+        //netty自带的类
+        ChannelPipeline pipeline = ch.pipeline();
+        //服务端解析器
+        pipeline.addLast("HttpServerCodec", new HttpServerCodec()) ;
+        //组装工具类：可以将多个请求、响应进行组装的工具类
+        pipeline.addLast("HttpObjectAggregator", new HttpObjectAggregator(4096)) ;
+        //localhost:8888/myWebsocket
+        pipeline.addLast("WebSocketServerProtocolHandler",new WebSocketServerProtocolHandler("/myWebsocket"));
+
+        //自定义
+        pipeline.addLast("MyNettyServerHandler",new MyNettyServerHandler()) ;
+
+
+    }
+}
+
+```
+
+自定义处理器
+
+```java
+package ws.dot2dot;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+
+import java.util.Scanner;
+
+/*
+ * Created by 颜群
+ * 自定义功能：聊天
+ */
+public class MyNettyServerHandler extends SimpleChannelInboundHandler<TextWebSocketFrame> {
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, TextWebSocketFrame msg) throws Exception {
+        //接收消息
+        System.out.println("server接收到的客户端消息：" + msg.text());
+        //向客户端发出响应
+        ctx.channel().writeAndFlush(new TextWebSocketFrame("hello client...")) ;
+    }
+
+
+    //监听是否有客户端链接上了
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("有客户端连接上了："+ctx.channel().id());
+    }
+
+    //监听是否有客户端断开了
+    @Override
+    public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("有客户端断开了："+ctx.channel().id());
+    }
+}
+
+```
+
+
+
+js端
+
+```js
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title>Title</title>
+        <script type="text/javascript">
+            var webSocket = new WebSocket("ws://localhost:8888/myWebsocket") ;
+
+
+
+            //向服务端发送消息
+            function sendMessage(msg){
+                if(webSocket.readyState == webSocket.OPEN)
+                        webSocket.send(msg) ;
+            }
+
+            //接收服务端消息
+            webSocket.onmessage = function(event){
+                document.getElementById("tip").innerText = "接收的消息：" + event.data ;
+            }
+
+
+            //监听服务端是否开启
+            webSocket.onopen= function(event){
+                document.getElementById("tip").innerText ="连接开启" ;
+            }
+
+            //监听服务端是否关闭
+            webSocket.onclose= function(event){
+                document.getElementById("tip").innerText ="连接关闭" ;
+            }
+
+
+        </script>
+
+    </head>
+
+
+    <body>
+
+        <form>
+            <textarea name="message"></textarea>
+
+            <input type="button" onclick="sendMessage(this.form.message.value)" value="发送"/>
+        </form>
+
+
+      <div id="tip"></div>
+    </body>
+</html>
+```
+
+
+
+![1599469946932](netty.assets/1599469946932.png)
+
+
+
+三大步：难点 就在于 寻找一些 netty自带的工具类。
+
+如果能找到：  netty自带工具类  + 自定义类
+
+如果找不到：  相当于 没用netty
+
+找到一部分： netty自带的一些工具类  + 自定义类 
\ No newline at end of file
diff --git "a/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.assets/1594024091872.png" "b/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.assets/1594024091872.png"
new file mode 100644
index 0000000..ee2167c
Binary files /dev/null and "b/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.assets/1594024091872.png" differ
diff --git "a/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.assets/1594027935455.png" "b/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.assets/1594027935455.png"
new file mode 100644
index 0000000..5a984b9
Binary files /dev/null and "b/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.assets/1594027935455.png" differ
diff --git "a/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.assets/1595211856571.png" "b/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.assets/1595211856571.png"
new file mode 100644
index 0000000..94839b4
Binary files /dev/null and "b/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.assets/1595211856571.png" differ
diff --git "a/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.md" "b/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.md"
index bc00238..d64df26 100644
--- "a/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.md"
+++ "b/notes/\345\276\256\346\234\215\345\212\241/\345\276\256\346\234\215\345\212\241.md"
@@ -826,51 +826,301 @@ public class JWTClient {
         System.out.println("payload:"+claims.getIssuedAt());
         System.out.println("payload:"+claims.getExpiration());
         System.out.println("payload:"+claims.getAudience());
-
         System.out.println("signature:"+jws.getSignature());
+        System.out.println(jws.getSignature().equals(token.split("\\.")[2]));
+    }
+
+    public static void main(String[] args) {
+        visitServer();
+    }
+
+}
 
+```
 
+ Spring Boot整合jwt
 
-        System.out.println(jws.getSignature().equals(token.split("\\.")[2]));
+为了让所有的功能模块 都能拥有 分布式校验功能（jwt)，需要将这个校验功能 放到通用模块中。micro_commom：
+
+1.引入jwt依赖
+
+```xml
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+```
+
+2.配置
+
+```xml
+省略
+```
+
+
+
+3.编码
+
+```java
+package util;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.Date;
 
+/*
+ * Created by 颜群
+ */
+@ConfigurationProperties("jwt.config")
+public class JwtUtil {
+    private String key ;
+    private long ttl ;
 
+    public String getKey() {
+        return key;
+    }
 
+    public void setKey(String key) {
+        this.key = key;
+    }
 
+    public long getTtl() {
+        return ttl;
     }
 
-    public static void main(String[] args) {
-        visitServer();
+    public void setTtl(long ttl) {
+        this.ttl = ttl;
+    }
+
+    //服务端生成jwt-token的方法 （JWTServer）
+    public String createJWT(String id, String subject,String roles){
+        Date now = new Date() ;
+      long nowMillis =   System.currentTimeMillis() ;
+
+      return  Jwts.builder().setId(id)
+                .setSubject(subject)
+                .setIssuedAt( now  )
+                .setExpiration( new Date( nowMillis +  ttl   )   )
+                .signWith( SignatureAlgorithm.HS256, key   )
+                .claim("roles",roles).compact() ;//token
     }
 
+
+    //客户单发送jwt-token时进行的校验方法 (JWTClient)
+     public Claims parseJWT(String token){
+        return Jwts.parser().setSigningKey(key).parseClaimsJws(token).getBody() ;
+     }
 }
 
+
 ```
 
 
 
+微服务的校验逻辑：第一登录时 获取token；以后再操作时，需要拿着token去访问。
 
+![1594024091872](微服务.assets/1594024091872.png)
 
 
 
 
 
+登录工程：
 
+micro_people
 
+PeopleController.java
 
+```java
+ //用户名：username
+    //密码：password
+    @PostMapping(value="/login")
+    public Message login(@RequestBody Map<String,String> login){
+        //controller -sercice -dao 模拟操作
+        String uname =    login.get("username") ;
+        String upwd = login.get("password") ;
+        //findUserByUsernameAndPassword
+        //zs/abc -> 返回这个人的全部信息 User(zs/abc,id(1001).....)
+
+        System.out.println("1111");
+        //假设数据库中的zs/abc  （并且：假设这个人的id1001,这个人是管理员权限admin   ）
+        if(uname.equals("zs") && upwd.equals("abc")){
+            //登录成功，服务端生成token
+            //String id, String subject,String roles
+            String token = jwtUtil.createJWT("1001", "zs", "admin");
+
+            Map map = new HashMap() ;
+            map.put("token",token) ;
+            map.put("username",uname) ;
+
+            System.out.println("登录成功");
+            //登录成功：返回token\用户名
+            return new Message(true,StatusCode.OK,map) ;
+        }else{
+            System.out.println("登录失败");
+            return new Message(false,StatusCode.ERROR) ;
+        }
 
 
+    }
+```
+
+xml
+
+```
+jwt:  config:    
+	key: yanqun    
+	ttl: 1800
+```
+
+![1594027935455](微服务.assets/1594027935455.png)
+
+
+
+sb方式的解析：
+
+客户端校验token - 服务端token  
+
+客户端如何 携带 token去校验？ 自定义请求头 Header
 
+key-value
 
+key:  authentication
 
+value: yanqun-token
 
+在需要校验的操作上，增加jwt解析：
+
+```java
+
+    @DeleteMapping("deleteById/{id}")
+    public Message deleteById( @PathVariable("id") Integer  id){
+
+        //删除之前 先通过jwt进行权限校验
+        /*
+                已经存在生成jwt
+
+                现在：解析jwt
+                        1.客户端将jwt 传递给服务端 （postman模拟）
+                        2.解析jwt
+         */
+        //假设此时，客户端postman已经将jwt(token)传递过来了
+        String authentication = request.getHeader("authentication");
+        if(authentication == null) {//请求时（postman)时，并没有携带jwt
+            return new Message(false,StatusCode.ERROR,"权限不足！") ;
+        }
+
+        String token = authentication.substring(7);//从yanqun-token截取出token
+        Claims claims = jwtUtil.parseJWT(token);
+        String roles = (String)claims.get("roles");
+        System.out.println(roles+"roles");
+        if(!roles.equals("admin")){
+            return new Message(false,StatusCode.ERROR,"权限不足！") ;
+        }
+
+
+        boolean result =cityService.deleteById(id) ;
+        return  new Message(true, StatusCode.OK,   result );
+    }
+```
+
+![1595211856571](微服务.assets/1595211856571.png)
 
 
 
+为了减少代码的冗余量，建议 将解析操作 放到拦截器中。一个微服务，一个拦截器。
 
+定义拦截器
 
+```java
+package com.yanqun.micro_city.interceptor;
+
+import io.jsonwebtoken.Claims;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import util.JwtUtil;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
+/*
+ * Created by 颜群
+ */
+@Component
+public class JwtInterceptor extends HandlerInterceptorAdapter {
 
 
+    //请求 ->拦截器(pre) -> 增删改
+    @Autowired
+    private JwtUtil jwtUtil ;
 
+    @Autowired
+    private HttpServletRequest request ;
+
+
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        System.out.println("jwt拦截器...");
+        String authentication = request.getHeader("authentication");
+        if(authentication != null && authentication.startsWith("yanqun-")) {
+            String token = authentication.substring(7);
+            Claims claims = jwtUtil.parseJWT(token);
+            String roles = (String)claims.get("roles");
+            if(roles.equals("admin")){
+                request.setAttribute("claims",claims);
+            }
+        }
+        return true;
+    }
+}
+
+```
+
+配置拦截器规则
+
+```java
+@Configuration
+public class JwtConfig  extends WebMvcConfigurationSupport {
+
+    @Autowired
+    private JwtInterceptor jwtInterceptor;
+
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(jwtInterceptor)
+                .addPathPatterns("/**")
+                .excludePathPatterns("/**/login");   //假设city项目中的登录映射叫 login,则排除登录
+    }
+}
+
+```
+
+使用拦截器
+
+```java
+    @DeleteMapping("deleteById/{id}")
+    public Message deleteById( @PathVariable("id") Integer  id){
+        //如果拦截器 判断权限足够，则会在request中 放入一个claims参数；否则，没有claims参数
+        Claims claims = (Claims)request.getAttribute("claims");
+        if(claims == null){
+            return new Message(false,StatusCode.ERROR,"权限不足") ;
+        }
+
+        boolean result =cityService.deleteById(id) ;
+        return  new Message(true, StatusCode.OK,   result );
+    }
+
+```
 
diff --git "a/notes/\351\235\242\350\257\225\351\242\230/1.JAVA\345\237\272\347\241\200\351\235\242\350\257\225\351\242\2301-50.md" "b/notes/\351\235\242\350\257\225\351\242\230/1.JAVA\345\237\272\347\241\200\351\235\242\350\257\225\351\242\230.md"
similarity index 100%
rename from "notes/\351\235\242\350\257\225\351\242\230/1.JAVA\345\237\272\347\241\200\351\235\242\350\257\225\351\242\2301-50.md"
rename to "notes/\351\235\242\350\257\225\351\242\230/1.JAVA\345\237\272\347\241\200\351\235\242\350\257\225\351\242\230.md"
diff --git a/sources/NettyProject/.gradle/5.3/executionHistory/executionHistory.bin b/sources/NettyProject/.gradle/5.3/executionHistory/executionHistory.bin
new file mode 100644
index 0000000..4cf89e8
Binary files /dev/null and b/sources/NettyProject/.gradle/5.3/executionHistory/executionHistory.bin differ
diff --git a/sources/NettyProject/.gradle/5.3/executionHistory/executionHistory.lock b/sources/NettyProject/.gradle/5.3/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..05b9446
Binary files /dev/null and b/sources/NettyProject/.gradle/5.3/executionHistory/executionHistory.lock differ
diff --git a/sources/NettyProject/.gradle/5.3/fileChanges/last-build.bin b/sources/NettyProject/.gradle/5.3/fileChanges/last-build.bin
new file mode 100644
index 0000000..f76dd23
Binary files /dev/null and b/sources/NettyProject/.gradle/5.3/fileChanges/last-build.bin differ
diff --git a/sources/NettyProject/.gradle/5.3/fileContent/fileContent.lock b/sources/NettyProject/.gradle/5.3/fileContent/fileContent.lock
new file mode 100644
index 0000000..2634bad
Binary files /dev/null and b/sources/NettyProject/.gradle/5.3/fileContent/fileContent.lock differ
diff --git a/sources/NettyProject/.gradle/5.3/fileHashes/fileHashes.bin b/sources/NettyProject/.gradle/5.3/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..d5b3bdd
Binary files /dev/null and b/sources/NettyProject/.gradle/5.3/fileHashes/fileHashes.bin differ
diff --git a/sources/NettyProject/.gradle/5.3/fileHashes/fileHashes.lock b/sources/NettyProject/.gradle/5.3/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..87f9653
Binary files /dev/null and b/sources/NettyProject/.gradle/5.3/fileHashes/fileHashes.lock differ
diff --git a/sources/NettyProject/.gradle/5.3/gc.properties b/sources/NettyProject/.gradle/5.3/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/sources/NettyProject/.gradle/5.3/javaCompile/classAnalysis.bin b/sources/NettyProject/.gradle/5.3/javaCompile/classAnalysis.bin
new file mode 100644
index 0000000..ab16240
Binary files /dev/null and b/sources/NettyProject/.gradle/5.3/javaCompile/classAnalysis.bin differ
diff --git a/sources/NettyProject/.gradle/5.3/javaCompile/javaCompile.lock b/sources/NettyProject/.gradle/5.3/javaCompile/javaCompile.lock
new file mode 100644
index 0000000..d8ea118
Binary files /dev/null and b/sources/NettyProject/.gradle/5.3/javaCompile/javaCompile.lock differ
diff --git a/sources/NettyProject/.gradle/5.3/javaCompile/taskHistory.bin b/sources/NettyProject/.gradle/5.3/javaCompile/taskHistory.bin
new file mode 100644
index 0000000..681aeb3
Binary files /dev/null and b/sources/NettyProject/.gradle/5.3/javaCompile/taskHistory.bin differ
diff --git a/sources/NettyProject/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/sources/NettyProject/.gradle/buildOutputCleanup/buildOutputCleanup.lock
new file mode 100644
index 0000000..1dea2f3
Binary files /dev/null and b/sources/NettyProject/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/sources/NettyProject/.gradle/buildOutputCleanup/cache.properties b/sources/NettyProject/.gradle/buildOutputCleanup/cache.properties
new file mode 100644
index 0000000..d02950a
--- /dev/null
+++ b/sources/NettyProject/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Mon Aug 03 18:35:56 CST 2020
+gradle.version=5.3
diff --git a/sources/NettyProject/.gradle/buildOutputCleanup/outputFiles.bin b/sources/NettyProject/.gradle/buildOutputCleanup/outputFiles.bin
new file mode 100644
index 0000000..35c3289
Binary files /dev/null and b/sources/NettyProject/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/sources/NettyProject/.gradle/vcs-1/gc.properties b/sources/NettyProject/.gradle/vcs-1/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/sources/NettyProject/.idea/gradle.xml b/sources/NettyProject/.idea/gradle.xml
new file mode 100644
index 0000000..4cf50c3
--- /dev/null
+++ b/sources/NettyProject/.idea/gradle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="createEmptyContentRootDirectories" value="true" />
+        <option name="distributionType" value="LOCAL" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="D:/dev/gradle/gradle-5.3" />
+        <option name="gradleJvm" value="1.8" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+        <option name="useAutoImport" value="true" />
+        <option name="useQualifiedModuleNames" value="true" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/sources/NettyProject/.idea/misc.xml b/sources/NettyProject/.idea/misc.xml
new file mode 100644
index 0000000..bc8d0a3
--- /dev/null
+++ b/sources/NettyProject/.idea/misc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/sources/NettyProject/.idea/uiDesigner.xml b/sources/NettyProject/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/sources/NettyProject/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/sources/NettyProject/.idea/workspace.xml b/sources/NettyProject/.idea/workspace.xml
new file mode 100644
index 0000000..b87a434
--- /dev/null
+++ b/sources/NettyProject/.idea/workspace.xml
@@ -0,0 +1,804 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="a5c0f369-c74c-489c-a78f-697cf091c99c" name="Default Changelist" comment="" />
+    <ignored path="$PROJECT_DIR$/out/" />
+    <ignored path="$PROJECT_DIR$/.gradle/" />
+    <ignored path="$PROJECT_DIR$/build/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="DefaultGradleProjectSettings">
+    <option name="testRunner" value="GRADLE" />
+    <option name="delegatedBuild" value="true" />
+    <option name="isMigrated" value="true" />
+  </component>
+  <component name="ExternalProjectsData">
+    <projectState path="$PROJECT_DIR$">
+      <ProjectState />
+    </projectState>
+  </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <projects_view>
+          <tree_state>
+            <expand>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="NettyProject" type="f1a62948:ProjectNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="NettyProject" type="f1a62948:ProjectNode" />
+                <item name="Source Sets" type="e897c970:GradleViewContributor$SourceSetsNode" />
+              </path>
+            </expand>
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/webSocketClient.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="60">
+              <caret line="19" column="11" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyServerTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="280">
+              <caret line="25" column="21" lean-forward="true" selection-end-line="41" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyServerHandler.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="249">
+              <caret line="20" lean-forward="true" selection-end-line="34" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyServerInit.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="244">
+              <caret line="32" column="13" lean-forward="true" selection-end-line="38" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+        <option value="HTML File" />
+      </list>
+    </option>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>msg</find>
+    </findStrings>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/build.gradle" />
+        <option value="$PROJECT_DIR$/src/main/java/helloworld/NettyServerInit.java" />
+        <option value="$PROJECT_DIR$/src/main/java/helloworld/NettyServerTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/helloworld/StaticImport.java" />
+        <option value="$PROJECT_DIR$/src/main/java/helloworld/NettyServerHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/dot2dot/NettyServerInit.java" />
+        <option value="$PROJECT_DIR$/src/main/java/dot2dot/MyNettyServerHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/dot2dot/MyNettyServerTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/dot2dot/MyNettyClientInit.java" />
+        <option value="$PROJECT_DIR$/src/main/java/dot2dot/MyNettyClientHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/dot2dot/MyNettyClientTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/chat.java" />
+        <option value="$PROJECT_DIR$/src/main/java/heartbeat/MyNettyServerHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/heartbeat/MyNettyServerInit.java" />
+        <option value="$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyServerTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyServerHandler.java" />
+        <option value="$PROJECT_DIR$/src/main/java/dot2dot/abc.html" />
+        <option value="$PROJECT_DIR$/src/main/java/ws/dot2dot/webSocketClient.html" />
+        <option value="$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyServerInit.java" />
+      </list>
+    </option>
+  </component>
+  <component name="MavenProjectNavigator">
+    <treeState>
+      <expand />
+      <select />
+    </treeState>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="740" />
+    <option name="y" value="110" />
+    <option name="width" value="835" />
+    <option name="height" value="630" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="NettyProject" type="b2602c69:ProjectViewProjectNode" />
+              <item name="NettyProject" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="NettyProject" type="b2602c69:ProjectViewProjectNode" />
+              <item name="NettyProject" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="NettyProject" type="b2602c69:ProjectViewProjectNode" />
+              <item name="NettyProject" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="NettyProject" type="b2602c69:ProjectViewProjectNode" />
+              <item name="NettyProject" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="NettyProject" type="b2602c69:ProjectViewProjectNode" />
+              <item name="NettyProject" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="dot2dot" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="NettyProject" type="b2602c69:ProjectViewProjectNode" />
+              <item name="NettyProject" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="dot2dot" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="DefaultHtmlFileTemplate" value="HTML File" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/ws" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.side.proportion" value="0.49885058" />
+    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="helloworld" />
+    </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="dot2dot" />
+    </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\github\JavaCore\src\NettyProject\src\main\java\ws" />
+      <recent name="D:\github\JavaCore\src\NettyProject\src\main\java\heartbeat" />
+      <recent name="D:\github\JavaCore\src\NettyProject\src\main\java\chat" />
+    </key>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="Application.MyNettyServerTest (3)">
+    <configuration name="MyNettyClientTest (1)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="chat.MyNettyClientTest" />
+      <module name="NettyProject.main" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="chat.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MyNettyClientTest" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="dot2dot.MyNettyClientTest" />
+      <module name="NettyProject.main" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="dot2dot.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MyNettyServerTest (1)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="chat.MyNettyServerTest" />
+      <module name="NettyProject.main" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="chat.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MyNettyServerTest (2)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="heartbeat.MyNettyServerTest" />
+      <module name="NettyProject.main" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="heartbeat.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MyNettyServerTest (3)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="ws.dot2dot.MyNettyServerTest" />
+      <module name="NettyProject.main" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="ws.dot2dot.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.MyNettyServerTest (3)" />
+        <item itemvalue="Application.MyNettyServerTest (2)" />
+        <item itemvalue="Application.MyNettyClientTest (1)" />
+        <item itemvalue="Application.MyNettyServerTest (1)" />
+        <item itemvalue="Application.MyNettyClientTest" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="a5c0f369-c74c-489c-a78f-697cf091c99c" name="Default Changelist" comment="" />
+      <created>1596450641813</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1596450641813</updated>
+      <workItem from="1596450920226" duration="1410000" />
+      <workItem from="1596503115442" duration="1789000" />
+      <workItem from="1596702924293" duration="151000" />
+      <workItem from="1596875839137" duration="4164000" />
+      <workItem from="1597194916702" duration="559000" />
+      <workItem from="1597650617889" duration="3935000" />
+      <workItem from="1597801835061" duration="102000" />
+      <workItem from="1598256923878" duration="4313000" />
+      <workItem from="1598269508548" duration="122000" />
+      <workItem from="1598341588509" duration="208000" />
+      <workItem from="1598856861747" duration="5063000" />
+      <workItem from="1599011024341" duration="156000" />
+      <workItem from="1599465516850" duration="3273000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="25245000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Structure" order="0" side_tool="true" weight="0.25" />
+      <window_info id="Image Layers" order="1" />
+      <window_info id="Designer" order="2" />
+      <window_info id="UI Designer" order="3" />
+      <window_info id="Capture Tool" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Web" order="6" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="7" visible="true" weight="0.22788204" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32956153" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.31683168" />
+      <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
+      <window_info anchor="bottom" id="Debug" order="5" weight="0.42149928" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32956153" />
+      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
+      <window_info active="true" anchor="bottom" id="Spring" order="12" visible="true" weight="0.34512022" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Messages" order="14" weight="0.09618105" />
+      <window_info anchor="bottom" id="Build" order="15" weight="0.32956153" />
+      <window_info anchor="bottom" id="JProfiler" order="16" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="2" />
+      <window_info anchor="right" id="Theme Preview" order="3" />
+      <window_info anchor="right" id="Maven" order="4" weight="0.32573727" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="right" id="Palette&#9;" order="6" />
+      <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
+      <window_info anchor="right" id="Database" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.3297587" />
+      <window_info anchor="right" id="Coverage" order="10" side_tool="true" />
+      <window_info anchor="right" id="Gradle" order="11" weight="0.3297587" />
+    </layout>
+    <layout-to-restore>
+      <window_info id="Structure" order="0" side_tool="true" weight="0.25" />
+      <window_info id="Image Layers" order="1" />
+      <window_info id="Designer" order="2" />
+      <window_info id="UI Designer" order="3" />
+      <window_info id="Capture Tool" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Web" order="6" side_tool="true" />
+      <window_info content_ui="combo" id="Project" order="7" visible="true" weight="0.22788204" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32956153" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.25176802" />
+      <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
+      <window_info anchor="bottom" id="Debug" order="5" weight="0.42149928" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32956153" />
+      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
+      <window_info active="true" anchor="bottom" id="Spring" order="12" visible="true" weight="0.34512022" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Messages" order="14" weight="0.09618105" />
+      <window_info anchor="bottom" id="Build" order="15" weight="0.32956153" />
+      <window_info anchor="bottom" id="JProfiler" order="16" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="2" />
+      <window_info anchor="right" id="Theme Preview" order="3" />
+      <window_info anchor="right" id="Maven" order="4" weight="0.32573727" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="right" id="Palette&#9;" order="6" />
+      <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
+      <window_info anchor="right" id="Database" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.3297587" />
+      <window_info anchor="right" id="Coverage" order="10" side_tool="true" />
+      <window_info anchor="right" id="Gradle" order="11" weight="0.3297587" />
+    </layout-to-restore>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/dev/gradle/resp/caches/modules-2/files-2.1/io.netty/netty-all/4.1.50.Final/c0c07db0bbef0c563f3e7dc9f54c618bed2340ee/netty-all-4.1.50.Final-sources.jar!/io/netty/channel/nio/NioEventLoopGroup.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="28">
+          <caret line="36" column="47" lean-forward="true" selection-start-line="36" selection-start-column="39" selection-end-line="36" selection-end-column="64" />
+          <folding>
+            <element signature="e#1764#1765#0" expanded="true" />
+            <element signature="e#1787#1788#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/dev/gradle/resp/caches/modules-2/files-2.1/io.netty/netty-all/4.1.50.Final/c0c07db0bbef0c563f3e7dc9f54c618bed2340ee/netty-all-4.1.50.Final-sources.jar!/io/netty/channel/MultithreadEventLoopGroup.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="32" column="111" selection-start-line="32" selection-start-column="97" selection-end-line="32" selection-end-column="111" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/dev/gradle/resp/caches/modules-2/files-2.1/io.netty/netty-all/4.1.50.Final/c0c07db0bbef0c563f3e7dc9f54c618bed2340ee/netty-all-4.1.50.Final-sources.jar!/io/netty/handler/codec/http/HttpServerCodec.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="31" column="34" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Java/jdk1.8.0_101/javafx-src.zip!/com/sun/prism/sw/SWTexture.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="265" column="19" selection-start-line="265" selection-start-column="19" selection-end-line="265" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/io/PrintStream.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="218">
+          <caret line="569" column="16" selection-start-line="569" selection-start-column="16" selection-end-line="569" selection-end-column="16" />
+          <folding>
+            <element signature="e#19907#19908#0" expanded="true" />
+            <element signature="e#19950#19951#0" expanded="true" />
+            <element signature="e#24380#24381#0" expanded="true" />
+            <element signature="e#24405#24406#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/System.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="218">
+          <caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/helloworld/StaticImport.java" />
+    <entry file="jar://D:/dev/gradle/resp/caches/modules-2/files-2.1/io.netty/netty-all/4.1.50.Final/c0c07db0bbef0c563f3e7dc9f54c618bed2340ee/netty-all-4.1.50.Final-sources.jar!/io/netty/channel/SimpleChannelInboundHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="41" column="70" lean-forward="true" selection-start-line="41" selection-start-column="70" selection-end-line="41" selection-end-column="70" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/dev/gradle/resp/caches/modules-2/files-2.1/io.netty/netty-all/4.1.50.Final/c0c07db0bbef0c563f3e7dc9f54c618bed2340ee/netty-all-4.1.50.Final-sources.jar!/io/netty/channel/ChannelInboundHandlerAdapter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="33" column="93" selection-start-line="33" selection-start-column="93" selection-end-line="33" selection-end-column="93" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/dev/gradle/resp/caches/modules-2/files-2.1/io.netty/netty-all/4.1.50.Final/c0c07db0bbef0c563f3e7dc9f54c618bed2340ee/netty-all-4.1.50.Final-sources.jar!/io/netty/channel/ChannelInboundHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="21" column="55" lean-forward="true" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/dev/gradle/resp/caches/modules-2/files-2.1/io.netty/netty-all/4.1.50.Final/c0c07db0bbef0c563f3e7dc9f54c618bed2340ee/netty-all-4.1.50.Final-sources.jar!/io/netty/channel/ChannelHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="177" column="17" selection-start-line="177" selection-start-column="17" selection-end-line="177" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/helloworld/NettyServerHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="25" selection-start-line="25" selection-end-line="25" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/helloworld/NettyServerTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="376">
+          <caret line="38" lean-forward="true" selection-start-line="12" selection-end-line="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/helloworld/NettyServerInit.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="282">
+          <caret line="19" column="4" lean-forward="true" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="49" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/dev/gradle/resp/caches/modules-2/files-2.1/io.netty/netty-all/4.1.50.Final/c0c07db0bbef0c563f3e7dc9f54c618bed2340ee/netty-all-4.1.50.Final-sources.jar!/io/netty/handler/codec/LengthFieldBasedFrameDecoder.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="556">
+          <caret line="235" column="31" lean-forward="true" selection-start-line="235" selection-start-column="31" selection-end-line="235" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/dot2dot/MyNettyServerTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="825">
+          <caret line="29" column="27" selection-end-line="41" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/dot2dot/MyNettyServerInit.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="429">
+          <caret line="20" column="5" selection-end-line="37" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/dot2dot/MyNettyClientTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="429">
+          <caret line="19" column="66" selection-end-line="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/dot2dot/MyNettyClientInit.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="363">
+          <caret line="18" column="14" selection-end-line="35" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/chat.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/chat/MyNettyServerHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/chat/MyNettyServerInitializer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/chat/MyNettyServerTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="15" column="138" lean-forward="true" selection-start-line="15" selection-start-column="138" selection-end-line="15" selection-end-column="138" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/chat/MyNettyClientTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="99">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/dot2dot/MyNettyClientHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="218">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/dev/gradle/resp/caches/modules-2/files-2.1/io.netty/netty-all/4.1.50.Final/c0c07db0bbef0c563f3e7dc9f54c618bed2340ee/netty-all-4.1.50.Final-sources.jar!/io/netty/handler/timeout/IdleStateHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="141" column="35" lean-forward="true" selection-start-line="137" selection-start-column="14" selection-end-line="141" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/heartbeat/MyNettyClientTest.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/heartbeat/MyNettyClientInit.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/heartbeat/MyNettyClientHandler.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/dot2dot/MyNettyServerHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="22" column="1" lean-forward="true" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="1" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/heartbeat/MyNettyServerInit.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="561">
+          <caret line="25" column="16" selection-end-line="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/heartbeat/MyNettyServerHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="33">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/heartbeat/MyNettyServerTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="561">
+          <caret line="21" column="13" selection-end-line="41" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyClientHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="12" column="10" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyClientInit.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="148">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyClientTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="148">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/dot2dot/abc.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="4" column="16" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyServerTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="280">
+          <caret line="25" column="21" lean-forward="true" selection-end-line="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyServerInit.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="244">
+          <caret line="32" column="13" lean-forward="true" selection-end-line="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/MyNettyServerHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="249">
+          <caret line="20" lean-forward="true" selection-end-line="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ws/dot2dot/webSocketClient.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="19" column="11" lean-forward="true" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.49885058" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
\ No newline at end of file
diff --git a/sources/NettyProject/build.gradle b/sources/NettyProject/build.gradle
new file mode 100644
index 0000000..3c3a926
--- /dev/null
+++ b/sources/NettyProject/build.gradle
@@ -0,0 +1,18 @@
+plugins {
+    id 'java'
+}
+
+group 'com.yanqun'
+version '1.0-SNAPSHOT'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+//    mavenCentral()
+    maven{ url 'http://maven.aliyun.com/nexus/content/groups/public'}
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile group: 'io.netty', name: 'netty-all', version: '4.1.50.Final'
+}
diff --git a/sources/NettyProject/settings.gradle b/sources/NettyProject/settings.gradle
new file mode 100644
index 0000000..1757358
--- /dev/null
+++ b/sources/NettyProject/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = 'NettyProject'
+
diff --git a/sources/NettyProject/src/main/java/chat/MyNettyClientHandler.java b/sources/NettyProject/src/main/java/chat/MyNettyClientHandler.java
new file mode 100644
index 0000000..a634116
--- /dev/null
+++ b/sources/NettyProject/src/main/java/chat/MyNettyClientHandler.java
@@ -0,0 +1,13 @@
+package chat;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+import java.util.Scanner;
+
+public class MyNettyClientHandler extends SimpleChannelInboundHandler<String> {
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, String receiveMsg) {
+        System.out.println(receiveMsg);
+    }
+}
diff --git a/sources/NettyProject/src/main/java/chat/MyNettyClientInitializer.java b/sources/NettyProject/src/main/java/chat/MyNettyClientInitializer.java
new file mode 100644
index 0000000..e834295
--- /dev/null
+++ b/sources/NettyProject/src/main/java/chat/MyNettyClientInitializer.java
@@ -0,0 +1,25 @@
+package chat;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.Delimiters;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+
+public class MyNettyClientInitializer  extends ChannelInitializer<SocketChannel> {
+    //连接被注册后，立刻执行此方法
+    protected void initChannel(SocketChannel sc) throws Exception {
+        ChannelPipeline pipeline = sc.pipeline();
+        //与服务端的Initializer作用相同：通过DelimiterBasedFrameDecoder将接收到的服务端消息，通过回车符（Delimiters.lineDelimiter()）进行分割。
+        pipeline.addLast("DelimiterBasedFrameDecoder", new DelimiterBasedFrameDecoder(2048, Delimiters.lineDelimiter()));
+        pipeline.addLast("StringDecoder",new StringDecoder(CharsetUtil.UTF_8)) ;
+        pipeline.addLast("StringEncoder",new StringEncoder(CharsetUtil.UTF_8)) ;
+        //自定义处理器
+        pipeline.addLast("MyNettyClientHandler", new MyNettyClientHandler());
+    }
+}
diff --git a/sources/NettyProject/src/main/java/chat/MyNettyClientTest.java b/sources/NettyProject/src/main/java/chat/MyNettyClientTest.java
new file mode 100644
index 0000000..cef208f
--- /dev/null
+++ b/sources/NettyProject/src/main/java/chat/MyNettyClientTest.java
@@ -0,0 +1,31 @@
+package chat;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioSocketChannel;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+public class MyNettyClientTest {
+    public static void main(String[] args) {
+        EventLoopGroup eventLoopGroup =  new NioEventLoopGroup() ;
+        try{
+            Bootstrap bootstrap = new Bootstrap();
+            bootstrap.group(eventLoopGroup).channel(NioSocketChannel.class).handler(new MyNettyClientInitializer());
+            Channel channel =  bootstrap.connect("127.0.0.1",8888).sync().channel();
+            BufferedReader bufferedReader =  new BufferedReader(new InputStreamReader(System.in)) ;
+           for(;;){//客户端不断的通过控制台向服务端发送消息
+                channel.writeAndFlush(bufferedReader.readLine() + "\r\n") ;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        finally {
+            eventLoopGroup.shutdownGracefully();
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/NettyProject/src/main/java/chat/MyNettyServerHandler.java b/sources/NettyProject/src/main/java/chat/MyNettyServerHandler.java
new file mode 100644
index 0000000..e3de1c5
--- /dev/null
+++ b/sources/NettyProject/src/main/java/chat/MyNettyServerHandler.java
@@ -0,0 +1,55 @@
+package chat;
+
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.DefaultChannelGroup;
+import io.netty.util.concurrent.GlobalEventExecutor;
+
+import java.util.Scanner;
+public class MyNettyServerHandler extends SimpleChannelInboundHandler<String> {
+    private static ChannelGroup channelGroup = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE) ;
+    //每当从服务端读取到客户端写入的信息时，就将该信息转发给所有的客户端Channel（实现聊天室的效果）。
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, String receiveMsg) throws Exception {
+        Channel channel = ctx.channel() ;
+        //遍历channelGroup，从而区分“我”和“别人”发出的消息，如果消息是自己发出的就显示“我”
+        channelGroup.forEach(chnl ->{//JDK8提供的lambda表达式
+        if(channel == chnl)
+            chnl.writeAndFlush("【我】发送的消息：" + receiveMsg + "\n") ;
+        else
+             chnl.writeAndFlush("【" + channel.remoteAddress()+"】发送的消息：" + receiveMsg +"\n");
+        }  );
+    }
+
+    //连接建立。每当从服务端收到新的客户端连接时，就将新客户端的Channel加入ChannelGroup列表中，并告知列表中的其他客户端Channel
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+        Channel channel = ctx.channel() ;
+        channelGroup.writeAndFlush("客户端-" + channel.remoteAddress() + "加入\n") ;
+        channelGroup.add(channel) ;
+    }
+
+    //监听客户端上线
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        Channel channel = ctx.channel() ;
+        System.out.println(channel.remoteAddress() + "上线");
+    }
+    //监听客户端下线
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        Channel channel = ctx.channel() ;
+        System.out.println(channel.remoteAddress() + "下线");
+    }
+    //连接断开。每当从服务端感知有客户端断开时，就将该客户端的Channel从ChannelGroup 列表中移除，并告知列表中的其他客户端Channel
+    @Override
+    public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
+        Channel channel = ctx.channel() ;
+        //会自动将channelGroup中断开的连接移除掉
+        channelGroup.writeAndFlush("客户端-" + channel.remoteAddress() + "离开\n") ;
+    }
+}
+
diff --git a/sources/NettyProject/src/main/java/chat/MyNettyServerInitializer.java b/sources/NettyProject/src/main/java/chat/MyNettyServerInitializer.java
new file mode 100644
index 0000000..b43ac4b
--- /dev/null
+++ b/sources/NettyProject/src/main/java/chat/MyNettyServerInitializer.java
@@ -0,0 +1,24 @@
+package chat;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.Delimiters;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+
+public class MyNettyServerInitializer extends ChannelInitializer<SocketChannel> {
+    protected void initChannel(SocketChannel sc) throws Exception {
+        ChannelPipeline pipeline = sc.pipeline();
+        //DelimiterBasedFrameDecoder(maxFrameLength, delimiters)：分隔符处理器；将接收到的客户端消息，通过回车符（Delimiters.lineDelimiter()）进行分割。
+        pipeline.addLast("DelimiterBasedFrameDecoder", new DelimiterBasedFrameDecoder(2048, Delimiters.lineDelimiter()));
+        pipeline.addLast("StringDecoder",new StringDecoder(CharsetUtil.UTF_8)) ;
+        pipeline.addLast("StringEncoder",new StringEncoder(CharsetUtil.UTF_8)) ;
+        //自定义处理器
+        pipeline.addLast("MyNettyServerHandler", new MyNettyServerHandler());
+    }
+}
diff --git a/sources/NettyProject/src/main/java/chat/MyNettyServerTest.java b/sources/NettyProject/src/main/java/chat/MyNettyServerTest.java
new file mode 100644
index 0000000..716f9f6
--- /dev/null
+++ b/sources/NettyProject/src/main/java/chat/MyNettyServerTest.java
@@ -0,0 +1,26 @@
+package chat;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+
+public class MyNettyServerTest {
+    public static void main(String[] args) {
+        EventLoopGroup bossGroup = new NioEventLoopGroup();
+        EventLoopGroup workerGroup = new NioEventLoopGroup();
+        try {
+            //ServerBootstrap：服务端启动时的初始化操作
+            ServerBootstrap serverBootstrap = new ServerBootstrap();
+            //将bossGroup和workerGroup注册到服务端的Channel上，并注册一个服务端的初始化器NettyServerInitializer（该初始化器中的initChannel()方法，会在连接被注册后立刻执行）；最后将端口号绑定到8888
+            ChannelFuture channelFuture =serverBootstrap.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class).childHandler(new MyNettyServerInitializer()).bind(8888).sync() ;
+            channelFuture.channel().closeFuture().sync();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            bossGroup.shutdownGracefully();
+            workerGroup.shutdownGracefully();
+        }
+    }
+}
diff --git a/sources/NettyProject/src/main/java/dot2dot/MyNettyClientHandler.java b/sources/NettyProject/src/main/java/dot2dot/MyNettyClientHandler.java
new file mode 100644
index 0000000..08db920
--- /dev/null
+++ b/sources/NettyProject/src/main/java/dot2dot/MyNettyClientHandler.java
@@ -0,0 +1,32 @@
+package dot2dot;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+import java.util.Scanner;
+
+/*
+ * Created by 颜群
+ */
+public class MyNettyClientHandler extends SimpleChannelInboundHandler {
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
+
+        //接收消息
+        System.out.println("客户端 接收到了"+ctx.channel().remoteAddress()+",消息是："+msg);
+
+        //发送消息
+        System.out.println("请输入内容：");
+        String send = new Scanner(System.in).nextLine() ;
+        ctx.channel().writeAndFlush(send) ;
+    }
+
+    //为了 避免 客户端和服务端 都在等待对方发送第一条消息，就需要  有人（客户端）主动发送第一条消息
+
+
+    //当连接成功时，会触发channelActive()方法
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        ctx.writeAndFlush("开始聊天吧...") ;
+    }
+}
diff --git a/sources/NettyProject/src/main/java/dot2dot/MyNettyClientInit.java b/sources/NettyProject/src/main/java/dot2dot/MyNettyClientInit.java
new file mode 100644
index 0000000..90261b2
--- /dev/null
+++ b/sources/NettyProject/src/main/java/dot2dot/MyNettyClientInit.java
@@ -0,0 +1,35 @@
+package dot2dot;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+
+/*
+ * Created by 颜群
+ */
+public class MyNettyClientInit extends ChannelInitializer<SocketChannel> {
+    @Override
+    protected void initChannel(SocketChannel ch) throws Exception {
+
+        //合并、解码
+        ChannelPipeline pipeline = ch.pipeline();
+        //解码
+        pipeline.addLast("LengthFieldBasedFrameDecoder",new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE,0,8,0,8 )) ;
+        //合并
+        pipeline.addLast("LengthFieldPrepender", new LengthFieldPrepender(8)) ;
+
+        //统一乱码
+        pipeline.addLast("StringDecoder",new StringDecoder(CharsetUtil.UTF_8));
+        pipeline.addLast("StringEncoder",new StringEncoder(CharsetUtil.UTF_8));
+
+        pipeline.addLast("MyNettyClientHandler",new MyNettyClientHandler()) ;
+
+
+
+    }
+}
diff --git a/sources/NettyProject/src/main/java/dot2dot/MyNettyClientTest.java b/sources/NettyProject/src/main/java/dot2dot/MyNettyClientTest.java
new file mode 100644
index 0000000..9ccc414
--- /dev/null
+++ b/sources/NettyProject/src/main/java/dot2dot/MyNettyClientTest.java
@@ -0,0 +1,41 @@
+package dot2dot;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+
+/*
+ * Created by 颜群
+ * 入口类->初始化器 ->自定义处理器
+ */
+public class MyNettyClientTest {
+
+    public static void main(String[] args) {
+
+        //创建事件循环组
+        EventLoopGroup eventLoopGroup =  new NioEventLoopGroup() ;
+
+        //启动
+       Bootstrap bootstrap = new Bootstrap();
+        try {
+            bootstrap.group(eventLoopGroup)
+                    .channel(NioSocketChannel.class)
+                    //综合（内置+自定义）初始化器
+                    .handler(new MyNettyClientInit());
+
+            ChannelFuture channelFuture = bootstrap.connect("127.0.0.1", 8888).sync();
+            channelFuture.channel().closeFuture().sync() ;//future模式
+
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }finally{
+            eventLoopGroup.shutdownGracefully();
+        }
+
+    }
+
+}
diff --git a/sources/NettyProject/src/main/java/dot2dot/MyNettyServerHandler.java b/sources/NettyProject/src/main/java/dot2dot/MyNettyServerHandler.java
new file mode 100644
index 0000000..50603a9
--- /dev/null
+++ b/sources/NettyProject/src/main/java/dot2dot/MyNettyServerHandler.java
@@ -0,0 +1,23 @@
+package dot2dot;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+import java.util.Scanner;
+
+/*
+ * Created by 颜群
+ * 自定义功能：聊天
+ */
+public class MyNettyServerHandler extends SimpleChannelInboundHandler<String> {
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
+        //接收消息
+        System.out.println("服务端 接收到了"+ctx.channel().remoteAddress()+",消息是："+msg);
+
+        //发送消息
+        System.out.println("请输入内容：");
+        String send = new Scanner(System.in).nextLine() ;
+        ctx.channel().writeAndFlush(send) ;
+    }
+}
diff --git a/sources/NettyProject/src/main/java/dot2dot/MyNettyServerInit.java b/sources/NettyProject/src/main/java/dot2dot/MyNettyServerInit.java
new file mode 100644
index 0000000..91568ce
--- /dev/null
+++ b/sources/NettyProject/src/main/java/dot2dot/MyNettyServerInit.java
@@ -0,0 +1,37 @@
+package dot2dot;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+
+/*
+ * Created by 颜群
+ *
+ * netty自带类库解决
+ */
+public class MyNettyServerInit extends ChannelInitializer<SocketChannel> {
+    @Override
+    protected void initChannel(SocketChannel ch) throws Exception {
+
+        //合并、解码
+
+        ChannelPipeline pipeline = ch.pipeline();
+        //解码
+        pipeline.addLast("LengthFieldBasedFrameDecoder",new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE,0,8,0,8 )) ;
+        //合并
+        pipeline.addLast("LengthFieldPrepender", new LengthFieldPrepender(8)) ;
+
+        //统一乱码
+        pipeline.addLast("StringDecoder",new StringDecoder(CharsetUtil.UTF_8));
+        pipeline.addLast("StringEncoder",new StringEncoder(CharsetUtil.UTF_8));
+
+        pipeline.addLast("MyNettyServerHandler",new MyNettyServerHandler()) ;
+
+
+    }
+}
diff --git a/sources/NettyProject/src/main/java/dot2dot/MyNettyServerTest.java b/sources/NettyProject/src/main/java/dot2dot/MyNettyServerTest.java
new file mode 100644
index 0000000..6d4e8f9
--- /dev/null
+++ b/sources/NettyProject/src/main/java/dot2dot/MyNettyServerTest.java
@@ -0,0 +1,41 @@
+package dot2dot;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+
+/*
+ * Created by 颜群
+ * 入口类->初始化器 ->自定义处理器
+ */
+public class MyNettyServerTest {
+
+    public static void main(String[] args) {
+
+        //创建事件循环组 （master -slaver）
+        EventLoopGroup bossGroup =  new NioEventLoopGroup() ;//接收客户端连接，并分发给workerGroup
+        EventLoopGroup workerGroup =  new NioEventLoopGroup() ;//真正的处理连接
+        //启动
+        ServerBootstrap serverBootstrap = new ServerBootstrap();
+        try {
+            ChannelFuture channelFuture = serverBootstrap.group(bossGroup, workerGroup)
+                    .channel(NioServerSocketChannel.class)
+
+                    //综合（内置+自定义）初始化器
+                    .childHandler(new MyNettyServerInit())
+
+                    .bind(8888)
+                    .sync();
+            channelFuture.channel().closeFuture().sync() ;
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }finally{
+            bossGroup.shutdownGracefully();
+            workerGroup.shutdownGracefully() ;
+        }
+
+    }
+
+}
diff --git a/sources/NettyProject/src/main/java/heartbeat/MyNettyServerHandler.java b/sources/NettyProject/src/main/java/heartbeat/MyNettyServerHandler.java
new file mode 100644
index 0000000..384634d
--- /dev/null
+++ b/sources/NettyProject/src/main/java/heartbeat/MyNettyServerHandler.java
@@ -0,0 +1,43 @@
+package heartbeat;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.timeout.IdleStateEvent;
+
+import java.util.Scanner;
+
+/*
+ * Created by 颜群
+ * 自定义功能：聊天
+ */
+public class MyNettyServerHandler extends SimpleChannelInboundHandler<Object> {
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
+        //接收客户端 主动发来的消息
+    }
+
+    //可以用于处理心跳机制的方法
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        //用于心跳机制的 数据类型
+        if(evt instanceof IdleStateEvent){
+            String eventType = null ;
+            IdleStateEvent event = (IdleStateEvent)evt ;
+            //获取具体的超时事件
+            switch (event.state() ){
+                case READER_IDLE:
+                    eventType = "读空闲" ;
+                    break ;
+                case WRITER_IDLE:
+                    eventType = "写空闲" ;
+                    break ;
+                case ALL_IDLE:
+                    eventType = "读写空闲" ;
+                    break ;
+            }
+            System.out.println( ctx.channel().remoteAddress() +"超时事件：【"+ eventType+"】");
+            ctx.channel().close() ;
+
+        }
+    }
+}
diff --git a/sources/NettyProject/src/main/java/heartbeat/MyNettyServerInit.java b/sources/NettyProject/src/main/java/heartbeat/MyNettyServerInit.java
new file mode 100644
index 0000000..e6f87a6
--- /dev/null
+++ b/sources/NettyProject/src/main/java/heartbeat/MyNettyServerInit.java
@@ -0,0 +1,31 @@
+package heartbeat;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.handler.timeout.IdleStateHandler;
+import io.netty.util.CharsetUtil;
+
+/*
+ * Created by 颜群
+ *
+ */
+public class MyNettyServerInit extends ChannelInitializer<SocketChannel> {
+    @Override
+    protected void initChannel(SocketChannel ch) throws Exception {
+
+
+        ChannelPipeline pipeline = ch.pipeline();
+        //netty自带的处理器
+        //三个参数：readerIdleTimeSeconds、writerIdleTimeSeconds、allIdleTimeSeconds
+        pipeline.addLast( "",  new IdleStateHandler(30,5,7));
+        //自定义处理器
+        pipeline.addLast("MyNettyServerHandler",new MyNettyServerHandler()) ;
+
+
+    }
+}
diff --git a/sources/NettyProject/src/main/java/heartbeat/MyNettyServerTest.java b/sources/NettyProject/src/main/java/heartbeat/MyNettyServerTest.java
new file mode 100644
index 0000000..92a6447
--- /dev/null
+++ b/sources/NettyProject/src/main/java/heartbeat/MyNettyServerTest.java
@@ -0,0 +1,41 @@
+package heartbeat;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+
+/*
+ * Created by 颜群
+ * 入口类->初始化器 ->自定义处理器
+ */
+public class MyNettyServerTest {
+
+    public static void main(String[] args) {
+
+        //创建事件循环组 （master -slaver）
+        EventLoopGroup bossGroup =  new NioEventLoopGroup() ;//接收客户端连接，并分发给workerGroup
+        EventLoopGroup workerGroup =  new NioEventLoopGroup() ;//真正的处理连接
+        //启动
+        ServerBootstrap serverBootstrap = new ServerBootstrap();
+        try {
+            ChannelFuture channelFuture = serverBootstrap.group(bossGroup, workerGroup)
+                    .channel(NioServerSocketChannel.class)
+
+                    //综合（内置+自定义）初始化器
+                    .childHandler(new MyNettyServerInit())
+
+                    .bind(8888)
+                    .sync();
+            channelFuture.channel().closeFuture().sync() ;
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }finally{
+            bossGroup.shutdownGracefully();
+            workerGroup.shutdownGracefully() ;
+        }
+
+    }
+
+}
diff --git a/sources/NettyProject/src/main/java/helloworld/NettyServerHandler.java b/sources/NettyProject/src/main/java/helloworld/NettyServerHandler.java
new file mode 100644
index 0000000..761b538
--- /dev/null
+++ b/sources/NettyProject/src/main/java/helloworld/NettyServerHandler.java
@@ -0,0 +1,87 @@
+package helloworld;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.*;
+import io.netty.util.CharsetUtil;
+
+import java.net.URI;
+
+/*
+ * Created by 颜群
+ */
+public class NettyServerHandler extends SimpleChannelInboundHandler<HttpObject> {
+    //doGet  doPost
+    //接收并处理请求
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
+        if(msg instanceof HttpRequest){
+            HttpRequest httpRequest =  (HttpRequest)msg ;
+          String requstTypeName =   httpRequest.method().name();
+
+            URI uri = new URI(httpRequest.uri());
+
+
+            if(!"/favicon.ico".equals( uri.getPath()    )){
+                System.out.println("请求方式：" + requstTypeName);
+
+                //定义响应内容
+                ByteBuf content = Unpooled.copiedBuffer("welcome netty family...", CharsetUtil.UTF_8);
+                //封装响应对象
+                DefaultFullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK, content);
+                response.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/plain");
+                response.headers().set(HttpHeaderNames.CONTENT_LENGTH, content.readableBytes());//不是content.readByte()
+
+                ctx.writeAndFlush(response); //return  刷新Servlet  doGet/doPost
+                System.out.println();
+            }
+
+        }
+    }
+
+
+    //当增加一个处理器时，自动触发该方法
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("1.增加了处理器");
+        super.handlerAdded(ctx);
+    }
+
+//  选择器  - 通道
+    @Override
+    public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("2.有新的通道被注册");
+        super.channelRegistered(ctx);
+    }
+
+    //当某个通道被激活时，触发
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("3.通道被激活...");
+        super.channelActive(ctx);
+    }
+
+    //当正在被激活的通道 失去激活状态时
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("4.激活状态失效");
+        super.channelInactive(ctx);
+    }
+
+    @Override
+    public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("5.通道被取消注册");
+        super.channelUnregistered(ctx);
+    }
+
+    //当发生异常时
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        System.out.println("发生了异常。。。");
+        super.exceptionCaught(ctx, cause);
+    }
+}
diff --git a/sources/NettyProject/src/main/java/helloworld/NettyServerInit.java b/sources/NettyProject/src/main/java/helloworld/NettyServerInit.java
new file mode 100644
index 0000000..c8d64ab
--- /dev/null
+++ b/sources/NettyProject/src/main/java/helloworld/NettyServerInit.java
@@ -0,0 +1,29 @@
+package helloworld;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.http.HttpObject;
+import io.netty.handler.codec.http.HttpServerCodec;
+
+/*
+ * Created by 颜群
+ */
+//综合（内置+自定义）初始化器
+public class NettyServerInit extends ChannelInitializer<SocketChannel> {
+    //当连接注册到channel时，执行此方法
+    @Override
+    protected void initChannel(SocketChannel ch) throws Exception {
+
+        ChannelPipeline pipeline = ch.pipeline();
+        //内置初始化器 （编码初始化器：HttpServerCodec）
+        pipeline.addLast( "HttpServerCodec",new HttpServerCodec()  )  ;
+
+        //自定义初始化器（NettyServerHandler）
+        pipeline.addLast("NettyServerHandler",new NettyServerHandler());
+    }
+
+
+}
diff --git a/sources/NettyProject/src/main/java/helloworld/NettyServerTest.java b/sources/NettyProject/src/main/java/helloworld/NettyServerTest.java
new file mode 100644
index 0000000..d3d01d2
--- /dev/null
+++ b/sources/NettyProject/src/main/java/helloworld/NettyServerTest.java
@@ -0,0 +1,40 @@
+package helloworld;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+
+/*
+ * Created by 颜群
+ */
+public class NettyServerTest {//入口类
+
+    public static void main(String[] args) {
+
+        //创建事件循环组 （master -slaver）
+        EventLoopGroup bossGroup =  new NioEventLoopGroup() ;//接收客户端连接，并分发给workerGroup
+        EventLoopGroup workerGroup =  new NioEventLoopGroup() ;//真正的处理连接
+        //启动
+        ServerBootstrap serverBootstrap = new ServerBootstrap();
+        try {
+            ChannelFuture channelFuture = serverBootstrap.group(bossGroup, workerGroup)
+                    .channel(NioServerSocketChannel.class)
+
+                    //综合（内置+自定义）初始化器
+                    .childHandler(new NettyServerInit())
+
+                    .bind(8888)
+                    .sync();
+            channelFuture.channel().closeFuture().sync() ;
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }finally{
+            bossGroup.shutdownGracefully();
+            workerGroup.shutdownGracefully() ;
+        }
+
+    }
+
+}
diff --git a/sources/NettyProject/src/main/java/ws/dot2dot/MyNettyServerHandler.java b/sources/NettyProject/src/main/java/ws/dot2dot/MyNettyServerHandler.java
new file mode 100644
index 0000000..f25c43e
--- /dev/null
+++ b/sources/NettyProject/src/main/java/ws/dot2dot/MyNettyServerHandler.java
@@ -0,0 +1,34 @@
+package ws.dot2dot;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+
+import java.util.Scanner;
+
+/*
+ * Created by 颜群
+ * 自定义功能：聊天
+ */
+public class MyNettyServerHandler extends SimpleChannelInboundHandler<TextWebSocketFrame> {
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, TextWebSocketFrame msg) throws Exception {
+        //接收消息
+        System.out.println("server接收到的客户端消息：" + msg.text());
+        //向客户端发出响应
+        ctx.channel().writeAndFlush(new TextWebSocketFrame("hello client...")) ;
+    }
+
+
+    //监听是否有客户端链接上了
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("有客户端连接上了："+ctx.channel().id());
+    }
+
+    //监听是否有客户端断开了
+    @Override
+    public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("有客户端断开了："+ctx.channel().id());
+    }
+}
diff --git a/sources/NettyProject/src/main/java/ws/dot2dot/MyNettyServerInit.java b/sources/NettyProject/src/main/java/ws/dot2dot/MyNettyServerInit.java
new file mode 100644
index 0000000..3d79c9c
--- /dev/null
+++ b/sources/NettyProject/src/main/java/ws/dot2dot/MyNettyServerInit.java
@@ -0,0 +1,38 @@
+package ws.dot2dot;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+
+/*
+ * Created by 颜群
+ *
+ * netty自带类库解决
+ */
+public class MyNettyServerInit extends ChannelInitializer<SocketChannel> {
+    @Override
+    protected void initChannel(SocketChannel ch) throws Exception {
+
+        //netty自带的类
+        ChannelPipeline pipeline = ch.pipeline();
+        //服务端解析器
+        pipeline.addLast("HttpServerCodec", new HttpServerCodec()) ;
+        //组装工具类：可以将多个请求、响应进行组装的工具类
+        pipeline.addLast("HttpObjectAggregator", new HttpObjectAggregator(4096)) ;
+        //localhost:8888/myWebsocket
+        pipeline.addLast("WebSocketServerProtocolHandler",new WebSocketServerProtocolHandler("/myWebsocket"));
+
+        //自定义
+        pipeline.addLast("MyNettyServerHandler",new MyNettyServerHandler()) ;
+
+
+    }
+}
diff --git a/sources/NettyProject/src/main/java/ws/dot2dot/MyNettyServerTest.java b/sources/NettyProject/src/main/java/ws/dot2dot/MyNettyServerTest.java
new file mode 100644
index 0000000..017b974
--- /dev/null
+++ b/sources/NettyProject/src/main/java/ws/dot2dot/MyNettyServerTest.java
@@ -0,0 +1,41 @@
+package ws.dot2dot;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+
+/*
+ * Created by 颜群
+ * 入口类->初始化器 ->自定义处理器
+ */
+public class MyNettyServerTest {
+
+    public static void main(String[] args) {
+
+        //创建事件循环组 （master -slaver）
+        EventLoopGroup bossGroup =  new NioEventLoopGroup() ;//接收客户端连接，并分发给workerGroup
+        EventLoopGroup workerGroup =  new NioEventLoopGroup() ;//真正的处理连接
+        //启动
+        ServerBootstrap serverBootstrap = new ServerBootstrap();
+        try {
+            ChannelFuture channelFuture = serverBootstrap.group(bossGroup, workerGroup)
+                    .channel(NioServerSocketChannel.class)
+
+                    //综合（内置+自定义）初始化器
+                    .childHandler(new MyNettyServerInit())
+
+                    .bind(8888)
+                    .sync();
+            channelFuture.channel().closeFuture().sync() ;
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }finally{
+            bossGroup.shutdownGracefully();
+            workerGroup.shutdownGracefully() ;
+        }
+
+    }
+
+}
diff --git a/sources/NettyProject/src/main/java/ws/dot2dot/webSocketClient.html b/sources/NettyProject/src/main/java/ws/dot2dot/webSocketClient.html
new file mode 100644
index 0000000..c789c83
--- /dev/null
+++ b/sources/NettyProject/src/main/java/ws/dot2dot/webSocketClient.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title>Title</title>
+        <script type="text/javascript">
+            var webSocket = new WebSocket("ws://localhost:8888/myWebsocket") ;
+
+
+
+            //向服务端发送消息
+            function sendMessage(msg){
+                if(webSocket.readyState == webSocket.OPEN)
+                        webSocket.send(msg) ;
+            }
+
+            //接收服务端消息
+            webSocket.onmessage = function(event){
+                document.getElementById("tip").innerText = "接收的消息：" + event.data ;
+            }
+
+
+            //监听服务端是否开启
+            webSocket.onopen= function(event){
+                document.getElementById("tip").innerText ="连接开启" ;
+            }
+
+            //监听服务端是否关闭
+            webSocket.onclose= function(event){
+                document.getElementById("tip").innerText ="连接关闭" ;
+            }
+
+
+        </script>
+
+    </head>
+
+
+    <body>
+
+        <form>
+            <textarea name="message"></textarea>
+
+            <input type="button" onclick="sendMessage(this.form.message.value)" value="发送"/>
+        </form>
+
+
+      <div id="tip"></div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/sources/microservice/.idea/compiler.xml b/sources/microservice/.idea/compiler.xml
index dfc93c7..b2279c2 100644
--- a/sources/microservice/.idea/compiler.xml
+++ b/sources/microservice/.idea/compiler.xml
@@ -12,8 +12,8 @@
         <module name="micro_config" />
         <module name="micro_people" />
         <module name="micro_httpclient" />
+        <module name="projct_httpclient" />
         <module name="project-webmagic" />
-        <module name="project_myJwt" />
         <module name="project_neo4j" />
         <module name="project_crawler" />
         <module name="micro_city" />
@@ -22,7 +22,7 @@
         <module name="project_jsoup" />
         <module name="project_hbase" />
         <module name="projectwebmagic" />
-        <module name="projct_httpclient" />
+        <module name="project_myJwt" />
         <module name="micro_city4" />
       </profile>
     </annotationProcessing>
diff --git a/sources/microservice/.idea/workspace.xml b/sources/microservice/.idea/workspace.xml
index cc01b6d..04ee040 100644
--- a/sources/microservice/.idea/workspace.xml
+++ b/sources/microservice/.idea/workspace.xml
@@ -2,14 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aa898001-c0de-4b01-ae9c-aa12eef4af72" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/project_myJwt/pom.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project_myJwt/src/main/java/JWTClient.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project_myJwt/src/main/java/JWTServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../notes/微服务/微服务.md" beforeDir="false" afterPath="$PROJECT_DIR$/../../notes/微服务/微服务.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../notes/面试题/1.JAVA基础面试题1-50.md" beforeDir="false" afterPath="$PROJECT_DIR$/../../notes/面试题/1.JAVA基础面试题1-50.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/projct_httpclient/src/main/java/URLConnectionDemo.java" beforeDir="false" afterPath="$PROJECT_DIR$/projct_httpclient/src/main/java/URLConnectionDemo.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -52,28 +46,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/project_myJwt/src/main/java/JWTServer.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="653">
-              <caret line="35" lean-forward="true" selection-end-line="56" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1457#1458#0" expanded="true" />
-                <element signature="e#1486#1487#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/project_myJwt/src/main/java/JWTClient.java">
+        <entry file="file://$PROJECT_DIR$/projct_httpclient/src/main/java/URLConnectionDemo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="266">
-              <caret line="26" column="46" lean-forward="true" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="342">
+              <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
             </state>
           </provider>
         </entry>
@@ -90,11 +67,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>select</find>
-      <find>queryCities</find>
-      <find>cityService</find>
-      <find>par</find>
-      <find>findByNameOrderByAgeDesc</find>
       <find>sec</find>
       <find>*</find>
       <find>ele</find>
@@ -120,6 +92,11 @@
       <find>findCityById</find>
       <find>findCityById2</find>
       <find>queryCityBiId</find>
+      <find>jwt</find>
+      <find>config</find>
+      <find>size</find>
+      <find>10</find>
+      <find>Comsu</find>
     </findStrings>
     <replaceStrings>
       <replace>100000</replace>
@@ -137,24 +114,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/project_crawler/src/main/java/com/yanqun/util/JsonUtils.java" />
-        <option value="$PROJECT_DIR$/project_hbase/pom.xml" />
-        <option value="$PROJECT_DIR$/project_crawler/pom.xml" />
-        <option value="$PROJECT_DIR$/project_hbase/src/main/java/HbaseDemo.java" />
-        <option value="$PROJECT_DIR$/project_crawler/src/main/java/com/yanqun/crawlerDemo.java" />
-        <option value="$PROJECT_DIR$/ABC/pom.xml" />
-        <option value="$PROJECT_DIR$/ABC/src/main/java/EmbeddedNeo4j.java" />
-        <option value="$PROJECT_DIR$/project_neo4j/pom.xml" />
-        <option value="$PROJECT_DIR$/project_neo4j/src/main/java/com/yanqun/demo/EmbeddedNeo4j.java" />
-        <option value="$PROJECT_DIR$/ShiPinHao/src/main/java/Loop.java" />
-        <option value="$PROJECT_DIR$/ShiPinHao/pom.xml" />
-        <option value="$PROJECT_DIR$/ShiPinHao/src/main/java/YunSuan.java" />
-        <option value="$PROJECT_DIR$/ShiPinHao/src/main/java/Demo.java" />
-        <option value="$PROJECT_DIR$/micro_eureka/pom.xml" />
-        <option value="$PROJECT_DIR$/micro_eureka/src/main/java/com/yanqun/MicroEurekaApplication.java" />
-        <option value="$PROJECT_DIR$/micro_city/pom.xml" />
-        <option value="$PROJECT_DIR$/micro_eureka2/pom.xml" />
-        <option value="$PROJECT_DIR$/micro_eureka3/pom.xml" />
         <option value="$PROJECT_DIR$/micro_eureka/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/micro_eureka2/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/micro_eureka3/src/main/resources/application.yml" />
@@ -167,11 +126,9 @@
         <option value="$PROJECT_DIR$/micro_city2/src/main/java/remote/city/CityClient.java" />
         <option value="$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/city/CityClient.java" />
         <option value="$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/config/ConfigBean.java" />
-        <option value="$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/controller/CityController.java" />
         <option value="$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/controller/CityController2.java" />
         <option value="$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/remote/city/CityClient.java" />
         <option value="$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/remote/city/CityClientImpl.java" />
-        <option value="$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/MicroCityApplication.java" />
         <option value="$PROJECT_DIR$/micro_zuul/src/main/java/com/yanqun/MicroZuulApplication.java" />
         <option value="$PROJECT_DIR$/micro_city/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/micro_config/pom.xml" />
@@ -183,11 +140,31 @@
         <option value="$PROJECT_DIR$/micro_city2/pom.xml" />
         <option value="$PROJECT_DIR$/micro_zuul/src/main/resources/bootstrap.yml" />
         <option value="$PROJECT_DIR$/micro_zuul/src/main/resources/application123.yml" />
-        <option value="$PROJECT_DIR$/micro_city/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/micro_config/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/project_myJwt/pom.xml" />
         <option value="$PROJECT_DIR$/project_myJwt/src/main/java/JWTServer.java" />
         <option value="$PROJECT_DIR$/project_myJwt/src/main/java/JWTClient.java" />
+        <option value="$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/MicroPeopleApplication.java" />
+        <option value="$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/service/PeopleService.java" />
+        <option value="$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/controller/AddressControler.java" />
+        <option value="$PROJECT_DIR$/micro_common/src/main/java/util/JwtUtil.java" />
+        <option value="$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/service/AddressService.java" />
+        <option value="$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/entity/Address.java" />
+        <option value="$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/entity/People.java" />
+        <option value="$PROJECT_DIR$/micro_people/pom.xml" />
+        <option value="$PROJECT_DIR$/micro_common/pom.xml" />
+        <option value="$PROJECT_DIR$/micro_common/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/dao/AddressDao.java" />
+        <option value="$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/dao/PeopleDao.java" />
+        <option value="$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/MicroCityApplication.java" />
+        <option value="$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/controller/PeopleController.java" />
+        <option value="$PROJECT_DIR$/micro_people/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/micro_city/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/interceptor/JwtInterceptor.java" />
+        <option value="$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/config/JwtConfig.java" />
+        <option value="$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/controller/CityController.java" />
+        <option value="$PROJECT_DIR$/micro_city/src/main/java/Test.java" />
+        <option value="$PROJECT_DIR$/projct_httpclient/src/main/java/URLConnectionDemo.java" />
       </list>
     </option>
   </component>
@@ -213,8 +190,7 @@
         </path>
         <path>
           <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="micro_city2" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" />
+          <item name="micro_people" type="9519ce18:MavenProjectsStructure$ProjectNode" />
         </path>
       </expand>
       <select />
@@ -234,6 +210,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -245,34 +222,219 @@
             <path>
               <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
               <item name="microservice" type="462c0819:PsiDirectoryNode" />
-              <item name="project_myJwt" type="462c0819:PsiDirectoryNode" />
+              <item name="projct_httpclient" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microservice" type="462c0819:PsiDirectoryNode" />
+              <item name="projct_httpclient" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microservice" type="462c0819:PsiDirectoryNode" />
+              <item name="projct_httpclient" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microservice" type="462c0819:PsiDirectoryNode" />
+              <item name="projct_httpclient" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microservice" type="462c0819:PsiDirectoryNode" />
+              <item name="project-webmagic" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microservice" type="462c0819:PsiDirectoryNode" />
+              <item name="project-webmagic" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microservice" type="462c0819:PsiDirectoryNode" />
+              <item name="project-webmagic" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microservice" type="462c0819:PsiDirectoryNode" />
+              <item name="project-webmagic" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microservice" type="462c0819:PsiDirectoryNode" />
+              <item name="project-webmagic" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="yanqun" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microservice" type="462c0819:PsiDirectoryNode" />
+              <item name="project_crawler" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
               <item name="microservice" type="462c0819:PsiDirectoryNode" />
-              <item name="project_myJwt" type="462c0819:PsiDirectoryNode" />
+              <item name="project_crawler" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
               <item name="microservice" type="462c0819:PsiDirectoryNode" />
-              <item name="project_myJwt" type="462c0819:PsiDirectoryNode" />
+              <item name="project_crawler" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
               <item name="microservice" type="462c0819:PsiDirectoryNode" />
-              <item name="project_myJwt" type="462c0819:PsiDirectoryNode" />
+              <item name="project_crawler" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="microservice" type="462c0819:PsiDirectoryNode" />
+              <item name="project_crawler" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="yanqun" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; 1.8 &gt;" type="70bed36:NamedLibraryElementNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; 1.8 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="rt.jar" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; 1.8 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="rt.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; 1.8 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="rt.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="io" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; 1.8 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="rt.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="lang" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; 1.8 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="rt.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="lang" type="462c0819:PsiDirectoryNode" />
+              <item name="reflect" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; 1.8 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="rt.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="util" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; 1.8 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="rt.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="util" type="462c0819:PsiDirectoryNode" />
+              <item name="function" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="Maven: org.mybatis:mybatis:3.5.3" type="70bed36:NamedLibraryElementNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="Maven: org.mybatis:mybatis:3.5.3" type="70bed36:NamedLibraryElementNode" />
+              <item name="mybatis-3.5.3.jar" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="Maven: org.mybatis:mybatis:3.5.3" type="70bed36:NamedLibraryElementNode" />
+              <item name="mybatis-3.5.3.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="ibatis" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="Maven: org.mybatis:mybatis:3.5.3" type="70bed36:NamedLibraryElementNode" />
+              <item name="mybatis-3.5.3.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="ibatis" type="462c0819:PsiDirectoryNode" />
+              <item name="builder" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="Maven: org.mybatis:mybatis:3.5.3" type="70bed36:NamedLibraryElementNode" />
+              <item name="mybatis-3.5.3.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="ibatis" type="462c0819:PsiDirectoryNode" />
+              <item name="builder" type="462c0819:PsiDirectoryNode" />
+              <item name="xml" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="Maven: org.mybatis:mybatis:3.5.3" type="70bed36:NamedLibraryElementNode" />
+              <item name="mybatis-3.5.3.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="ibatis" type="462c0819:PsiDirectoryNode" />
+              <item name="session" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="microservice" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="Maven: org.mybatis:mybatis:3.5.3" type="70bed36:NamedLibraryElementNode" />
+              <item name="mybatis-3.5.3.jar" type="462c0819:PsiDirectoryNode" />
+              <item name="ibatis" type="462c0819:PsiDirectoryNode" />
+              <item name="session" type="462c0819:PsiDirectoryNode" />
+              <item name="defaults" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -284,7 +446,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="jdk.selected.JAVA_MODULE" value="1.8" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/dao" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_package_manager_path" value="npm" />
@@ -308,11 +470,11 @@
       <recent name="com.yanqun.micro_city2.mapper" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\github\JavaCore\sources\microservice\micro_people\src\main\java\com\yanqun\dao" />
+      <recent name="D:\github\JavaCore\sources\microservice\micro_common\src\main\resources" />
       <recent name="D:\github\JavaCore\sources\microservice\micro_config\src\main\resources" />
       <recent name="D:\github\JavaCore\sources\microservice\micro_zuul\src\main\resources" />
       <recent name="D:\github\JavaCore\sources\microservice\micro_city\src" />
-      <recent name="D:\github\JavaCore\sources\microservice" />
-      <recent name="D:\github\JavaCore\sources\microservice\micro_city2\src\main\resources" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -333,17 +495,17 @@
     </option>
     <option name="contentProportion" value="0.2124317" />
   </component>
-  <component name="RunManager" selected="Application.JWTClient">
-    <configuration name="JWTClient" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="JWTClient" />
-      <module name="project_myJwt" />
+  <component name="RunManager" selected="Application.URLConnectionDemo">
+    <configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Test" />
+      <module name="micro_city" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="JWTServer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="JWTServer" />
-      <module name="project_myJwt" />
+    <configuration name="URLConnectionDemo" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="URLConnectionDemo" />
+      <module name="projct_httpclient" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -355,7 +517,7 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MicroCityApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
+    <configuration name="MicroCityApplication (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
       <module name="micro_city" />
       <extension name="coverage">
         <pattern>
@@ -368,60 +530,47 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MicroCityApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
-      <module name="micro_city2" />
+    <configuration name="MicroEurekaApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
+      <module name="micro_eureka" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.yanqun.micro_city2.city.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.yanqun.micro_city2.MicroCityApplication" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="MicroConfigApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
-      <module name="micro_config" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.yanqun.config.*" />
+          <option name="PATTERN" value="com.yanqun.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.yanqun.config.MicroConfigApplication" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.yanqun.MicroEurekaApplication" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MicroZuulApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
-      <module name="micro_zuul" />
+    <configuration name="MicroPeopleApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
+      <module name="micro_people" />
       <extension name="coverage">
         <pattern>
           <option name="PATTERN" value="com.yanqun.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.yanqun.MicroZuulApplication" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.yanqun.MicroPeopleApplication" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <list>
+      <item itemvalue="Application.Test" />
+      <item itemvalue="Application.URLConnectionDemo" />
       <item itemvalue="Spring Boot.MicroCity2Application" />
-      <item itemvalue="Spring Boot.MicroCityApplication" />
-      <item itemvalue="Spring Boot.MicroZuulApplication" />
-      <item itemvalue="Spring Boot.MicroConfigApplication" />
-      <item itemvalue="Application.JWTServer" />
-      <item itemvalue="Application.JWTClient" />
+      <item itemvalue="Spring Boot.MicroPeopleApplication" />
+      <item itemvalue="Spring Boot.MicroCityApplication (1)" />
+      <item itemvalue="Spring Boot.MicroEurekaApplication" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.JWTClient" />
-        <item itemvalue="Application.JWTServer" />
-        <item itemvalue="Spring Boot.MicroZuulApplication" />
-        <item itemvalue="Spring Boot.MicroConfigApplication" />
-        <item itemvalue="Spring Boot.MicroCityApplication" />
+        <item itemvalue="Application.URLConnectionDemo" />
+        <item itemvalue="Application.Test" />
+        <item itemvalue="Spring Boot.MicroCityApplication (1)" />
+        <item itemvalue="Spring Boot.MicroEurekaApplication" />
+        <item itemvalue="Spring Boot.MicroPeopleApplication" />
       </list>
     </recent_temporary>
   </component>
@@ -519,6 +668,23 @@
       <workItem from="1592810404858" duration="3936000" />
       <workItem from="1592872519243" duration="605000" />
       <workItem from="1593399677488" duration="2117000" />
+      <workItem from="1593415870930" duration="596000" />
+      <workItem from="1594006390620" duration="608000" />
+      <workItem from="1594019290123" duration="3407000" />
+      <workItem from="1594022972896" duration="4885000" />
+      <workItem from="1594079858624" duration="924000" />
+      <workItem from="1594170554647" duration="55000" />
+      <workItem from="1595207306710" duration="4531000" />
+      <workItem from="1595229607395" duration="74000" />
+      <workItem from="1595465955239" duration="321000" />
+      <workItem from="1595894653905" duration="6942000" />
+      <workItem from="1595907875232" duration="861000" />
+      <workItem from="1595986780119" duration="1634000" />
+      <workItem from="1596449059982" duration="1302000" />
+      <workItem from="1596703096479" duration="526000" />
+      <workItem from="1596785093922" duration="282000" />
+      <workItem from="1598347635162" duration="1771000" />
+      <workItem from="1598404142760" duration="349000" />
     </task>
     <servers />
   </component>
@@ -555,11 +721,10 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="210375000" />
+    <option name="totallyTimeSpent" value="239443000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info id="Structure" order="0" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="1" />
@@ -568,10 +733,10 @@
       <window_info id="Capture Tool" order="4" />
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Web" order="6" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="7" weight="0.31903484" />
+      <window_info active="true" content_ui="combo" id="Project" order="7" visible="true" weight="0.19772118" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.33097595" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.49433428" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.33002833" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.36402267" />
       <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
       <window_info anchor="bottom" id="Debug" order="5" weight="0.40452617" />
@@ -579,18 +744,18 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" />
       <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32956153" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.3286119" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
-      <window_info anchor="bottom" id="Spring" order="12" weight="0.34512022" />
+      <window_info anchor="bottom" id="Spring" order="12" weight="0.34419262" />
       <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.32956153" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.20538244" />
-      <window_info anchor="bottom" id="Run Dashboard" order="15" weight="0.18696883" />
+      <window_info anchor="bottom" id="Messages" order="14" weight="0.15722379" />
+      <window_info anchor="bottom" id="Run Dashboard" order="15" weight="0.4815864" />
       <window_info anchor="bottom" id="JProfiler" order="16" weight="0.25176802" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
       <window_info anchor="right" id="Palette" order="2" />
       <window_info anchor="right" id="Theme Preview" order="3" />
-      <window_info anchor="right" id="Maven" order="4" weight="0.25737265" />
+      <window_info anchor="right" id="Maven" order="4" weight="0.2533512" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Palette&#9;" order="6" />
       <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
@@ -606,10 +771,10 @@
       <window_info id="Capture Tool" order="4" />
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info id="Web" order="6" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="7" weight="0.31903484" />
+      <window_info content_ui="combo" id="Project" order="7" visible="true" weight="0.19772118" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.33097595" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.49433428" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.33002833" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.36402267" />
       <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
       <window_info anchor="bottom" id="Debug" order="5" weight="0.40452617" />
@@ -617,18 +782,18 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" />
       <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32956153" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.3286119" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
-      <window_info anchor="bottom" id="Spring" order="12" weight="0.34512022" />
+      <window_info anchor="bottom" id="Spring" order="12" weight="0.34419262" />
       <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.32956153" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.20538244" />
-      <window_info anchor="bottom" id="Run Dashboard" order="15" weight="0.18696883" />
+      <window_info anchor="bottom" id="Messages" order="14" weight="0.15864022" />
+      <window_info anchor="bottom" id="Run Dashboard" order="15" weight="0.4815864" />
       <window_info anchor="bottom" id="JProfiler" order="16" weight="0.25176802" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
       <window_info anchor="right" id="Palette" order="2" />
       <window_info anchor="right" id="Theme Preview" order="3" />
-      <window_info anchor="right" id="Maven" order="4" weight="0.25737265" />
+      <window_info anchor="right" id="Maven" order="4" weight="0.2533512" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Palette&#9;" order="6" />
       <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
@@ -641,319 +806,373 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/ShiPinHao/src/main/java/YunSuan.java" />
-    <entry file="file://$PROJECT_DIR$/ShiPinHao/src/main/java/Demo.java" />
-    <entry file="file://$PROJECT_DIR$/micro_city2/target/classes/application.yml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/micro_people/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="24" column="12" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="16" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_eureka3/src/main/resources/application.yml" />
-    <entry file="file://$PROJECT_DIR$/micro_eureka2/src/main/resources/application.yml" />
-    <entry file="file://$PROJECT_DIR$/micro_eureka2/pom.xml" />
-    <entry file="file://$PROJECT_DIR$/micro_eureka3/pom.xml" />
-    <entry file="file://$PROJECT_DIR$/micro_eureka2/src/main/java/com/yanqun/MicroEurekaApplication.java" />
-    <entry file="file://$PROJECT_DIR$/micro_eureka3/src/main/java/com/yanqun/MicroEurekaApplication.java" />
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.5.RELEASE/spring-webmvc-5.1.5.RELEASE.jar!/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="219">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
+        <state relative-caret-position="132">
+          <caret line="17" column="28" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/mapper/CityMapper.java">
+    <entry file="file://$PROJECT_DIR$/micro_people/src/main/java/com/yanqun/MicroPeopleApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="423">
-          <caret line="18" column="22" selection-start-line="15" selection-start-column="3" selection-end-line="25" selection-end-column="36" />
+        <state relative-caret-position="297">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/micro_eureka/src/main/java/com/yanqun/MicroEurekaApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="356">
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/entity/City.java">
+    <entry file="file://$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/MicroCityApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="13" column="52" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="52" />
+        <state relative-caret-position="290">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/entity/City.java">
+    <entry file="file://$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/interceptor/JwtInterceptor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="43" />
+        <state relative-caret-position="726">
+          <caret line="29" column="5" selection-end-line="42" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city2/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/config/JwtConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="5" column="15" lean-forward="true" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
+        <state relative-caret-position="264">
+          <caret line="12" selection-start-line="12" selection-end-line="25" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.5.RELEASE/spring-web-5.1.5.RELEASE.jar!/org/springframework/web/client/RestOperations.class">
+    <entry file="file://$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/controller/CityController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
+        <state relative-caret-position="33">
+          <caret line="66" column="7" selection-start-line="66" selection-start-column="7" selection-end-line="66" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/service/CityService.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/Collections.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="49" column="16" lean-forward="true" selection-start-line="49" selection-start-column="16" selection-end-line="49" selection-end-column="40" />
+        <state relative-caret-position="250">
+          <caret line="116" column="35" lean-forward="true" selection-start-line="116" selection-start-column="35" selection-end-line="116" selection-end-column="35" />
           <folding>
-            <element signature="e#1011#1012#0" expanded="true" />
-            <element signature="e#1058#1059#0" expanded="true" />
+            <element signature="e#5644#5645#0" expanded="true" />
+            <element signature="e#5675#5676#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.5.RELEASE/spring-web-5.1.5.RELEASE.jar!/org/springframework/web/client/RestTemplate.class">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/ArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
+        <state relative-caret-position="108">
+          <caret line="103" column="3" lean-forward="true" selection-start-line="103" selection-start-column="3" selection-end-line="103" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_common/src/main/java/com/yanqun/entity/Message.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/Iterable.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="489">
-          <caret line="18" column="31" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="31" />
+        <state relative-caret-position="225">
+          <caret line="44" column="25" selection-start-line="44" selection-start-column="17" selection-end-line="44" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/remote/city/CityClient.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/ArithmeticException.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="67">
-          <caret line="17" selection-start-line="17" selection-end-line="25" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="137">
+          <caret line="40" column="32" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/controller/CityController2.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/Throwable.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1287">
-          <caret line="48" column="31" selection-start-line="48" selection-start-column="18" selection-end-line="48" selection-end-column="31" />
+        <state relative-caret-position="137">
+          <caret line="113" column="40" selection-start-line="113" selection-start-column="23" selection-end-line="113" selection-end-column="46" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/remote/city/CityClientImpl.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/io/Serializable.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="363">
-          <caret line="14" column="32" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="32" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="137">
+          <caret line="168" column="17" selection-start-line="168" selection-start-column="17" selection-end-line="168" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city/src/main/resources/abc.txt">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/micro_eureka/pom.xml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/io/FileInputStream.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="14" selection-start-line="14" selection-end-line="18" selection-end-column="21" />
+        <state relative-caret-position="129">
+          <caret line="91" column="58" selection-start-line="91" selection-start-column="47" selection-end-line="91" selection-end-column="68" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/controller/CityController.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/io/FileNotFoundException.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="44" column="28" selection-start-line="44" selection-start-column="17" selection-end-line="44" selection-end-column="28" />
+        <state relative-caret-position="129">
+          <caret line="42" column="47" selection-start-line="42" selection-start-column="9" selection-end-line="42" selection-end-column="56" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city3/src/main/resources/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city3/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/io/IOException.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="38" column="37" lean-forward="true" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="37" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_zuul/micro_zuul.iml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/ClassCastException.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="137">
+          <caret line="40" column="24" selection-start-line="40" selection-start-column="6" selection-end-line="40" selection-end-column="24" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_eureka/src/main/resources/application.yml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/IndexOutOfBoundsException.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
+        <state relative-caret-position="302">
+          <caret line="42" column="16" lean-forward="true" selection-start-line="42" selection-start-column="16" selection-end-line="42" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city/src/main/resources/application.properties">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/List.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="5" column="16" lean-forward="true" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
+        <state relative-caret-position="129">
+          <caret line="237" column="21" lean-forward="true" selection-start-line="237" selection-start-column="21" selection-end-line="237" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_eureka/src/main/java/com/yanqun/MicroEurekaApplication.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/Map.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="159">
+          <caret line="211" column="6" lean-forward="true" selection-start-line="211" selection-start-column="4" selection-end-line="211" selection-end-column="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city/pom.xml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/Object.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
-          <caret line="49" column="65" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="65" />
+        <state relative-caret-position="225">
+          <caret line="62" column="4" lean-forward="true" selection-start-line="62" selection-start-column="4" selection-end-line="62" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_zuul/pom.xml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/reflect/Executable.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
-          <caret line="30" column="21" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" />
+          <caret line="39" column="2" lean-forward="true" selection-start-line="39" selection-start-column="2" selection-end-line="39" selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/config/ConfigBean.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/reflect/Method.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-36">
-          <caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="70">
+          <caret line="576" column="24" selection-start-line="576" selection-start-column="24" selection-end-line="576" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city2/src/main/resources/mybatis.xml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/NullPointerException.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="137">
+          <caret line="52" column="42" lean-forward="true" selection-start-line="52" selection-start-column="42" selection-end-line="52" selection-end-column="42" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city2/pom.xml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/RuntimeException.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="71" selection-start-line="71" selection-end-line="71" />
+        <state relative-caret-position="144">
+          <caret line="42" column="43" selection-start-line="42" selection-start-column="36" selection-end-line="42" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city/src/main/java/com/yanqun/micro_city/MicroCityApplication.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/Exception.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="12" column="37" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" />
+        <state relative-caret-position="144">
+          <caret line="44" column="22" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/Thread.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="283">
+          <caret line="461" column="5" selection-start-line="461" selection-start-column="5" selection-end-line="461" selection-end-column="5" />
           <folding>
-            <element signature="e#443#444#0" expanded="true" />
-            <element signature="e#514#515#0" expanded="true" />
+            <element signature="e#14796#14797#0" expanded="true" />
+            <element signature="e#14860#14861#0" expanded="true" />
+            <element signature="e#15480#15481#0" expanded="true" />
+            <element signature="e#15546#15547#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city2/src/main/java/com/yanqun/micro_city2/MicroCityApplication.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/Runnable.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="389">
+          <caret line="67" column="29" selection-start-line="67" selection-start-column="29" selection-end-line="67" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/function/Consumer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="9" column="19" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
+        <state relative-caret-position="594">
+          <caret line="41" selection-start-line="41" selection-end-line="48" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_zuul/src/main/java/com/yanqun/MicroZuulApplication.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/function/Supplier.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="36">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="561">
+          <caret line="40" selection-start-line="40" selection-end-line="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_zuul/src/main/resources/application123.yml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/function/Function.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        <state relative-caret-position="528">
+          <caret line="39" selection-start-line="39" selection-end-line="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_config/pom.xml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/function/Predicate.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
+        <state relative-caret-position="495">
+          <caret line="38" selection-start-line="38" selection-end-line="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_config/src/main/java/com/yanqun/config/MicroConfigApplication.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/function/IntUnaryOperator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+        <state relative-caret-position="462">
+          <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city2/src/main/resources/application.yml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/function/DoubleBinaryOperator.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="528">
-          <caret line="16" selection-start-line="16" selection-end-line="16" />
+          <caret line="39" column="17" selection-start-line="39" selection-start-column="17" selection-end-line="39" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_zuul/src/main/resources/bootstrap.yml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/function/IntToLongFunction.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="6" column="33" selection-start-line="6" selection-start-column="33" selection-end-line="6" selection-end-column="33" />
+        <state relative-caret-position="495">
+          <caret line="38" column="17" selection-start-line="38" selection-start-column="17" selection-end-line="38" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_config/src/main/resources/application.yml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/function/IntBinaryOperator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
+        <state relative-caret-position="528">
+          <caret line="39" column="17" selection-start-line="39" selection-start-column="17" selection-end-line="39" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/micro_city/src/main/resources/application.yml">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/Class.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="5" column="10" selection-start-line="5" selection-start-column="10" selection-end-line="6" selection-end-column="48" />
+        <state relative-caret-position="217">
+          <caret line="392" column="26" selection-start-line="392" selection-start-column="11" selection-end-line="392" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/project_hbase/src/main/java/HbaseDemo.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/lang/Math.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <state relative-caret-position="587">
+          <caret line="104" column="19" selection-start-line="104" selection-start-column="19" selection-end-line="104" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/project_myJwt/pom.xml">
+    <entry file="file://$PROJECT_DIR$/micro_city/src/main/java/Test.java" />
+    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.3/mybatis-3.5.3.jar!/org/apache/ibatis/session/SqlSession.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="290">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
+        <state relative-caret-position="-396">
+          <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt/0.9.1/jjwt-0.9.1.jar!/io/jsonwebtoken/Claims.class">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.3/mybatis-3.5.3.jar!/org/apache/ibatis/session/SqlSessionFactory.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
-          <caret line="10" column="16" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="16" />
+          <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Java/jdk1.8.0_101/jre/lib/jce.jar!/javax/crypto/spec/SecretKeySpec.class">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.3/mybatis-3.5.3.jar!/org/apache/ibatis/session/SqlSessionFactoryBuilder.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="17" column="40" lean-forward="true" selection-start-line="17" selection-start-column="40" selection-end-line="17" selection-end-column="48" />
+        <state relative-caret-position="1848">
+          <caret line="68" column="39" selection-start-line="68" selection-start-column="39" selection-end-line="68" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/project_myJwt/src/main/java/JWTServer.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.3/mybatis-3.5.3.jar!/org/apache/ibatis/builder/xml/XMLConfigBuilder.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="653">
-          <caret line="35" lean-forward="true" selection-end-line="56" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1457#1458#0" expanded="true" />
-            <element signature="e#1486#1487#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="1353">
+          <caret line="80" column="26" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/project_myJwt/src/main/java/JWTClient.java">
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/Iterator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="26" column="46" lean-forward="true" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="990">
+          <caret line="53" column="17" selection-start-line="53" selection-start-column="17" selection-end-line="53" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/Set.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3333">
+          <caret line="124" column="6" selection-start-line="124" selection-start-column="6" selection-end-line="124" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.3/mybatis-3.5.3.jar!/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="297">
+          <caret line="25" column="11" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Java/jdk1.8.0_101/src.zip!/java/util/Collection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="217">
+          <caret line="188" column="16" selection-start-line="188" selection-start-column="16" selection-end-line="188" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/project-webmagic/src/main/java/com/yanqun/WebMagicDemo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/project_crawler/src/main/java/com/yanqun/crawlerDemo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-8150">
+          <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/projct_httpclient/src/main/java/URLConnectionDemo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
         </state>
       </provider>
     </entry>
@@ -1007,7 +1226,7 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>micro_city</last-edited>
+          <last-edited>micro_people</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/MicroCityApplication.java b/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/MicroCityApplication.java
index f30b79c..32c612c 100644
--- a/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/MicroCityApplication.java
+++ b/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/MicroCityApplication.java
@@ -4,6 +4,8 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.context.annotation.Bean;
+import util.JwtUtil;
 
 @MapperScan(value="com.yanqun.micro_city.mapper")
 @SpringBootApplication
@@ -14,4 +16,9 @@ public static void main(String[] args) {
         SpringApplication.run(MicroCityApplication.class, args);
     }
 
+    @Bean
+    public JwtUtil jwtUtil(){
+        return new JwtUtil() ;
+    }
+
 }
diff --git a/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/config/JwtConfig.java b/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/config/JwtConfig.java
new file mode 100644
index 0000000..f3baa1b
--- /dev/null
+++ b/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/config/JwtConfig.java
@@ -0,0 +1,25 @@
+package com.yanqun.micro_city.config;
+
+/*
+ * Created by 颜群
+ */
+
+import com.yanqun.micro_city.interceptor.JwtInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+@Configuration
+public class JwtConfig  extends WebMvcConfigurationSupport {
+
+    @Autowired
+    private JwtInterceptor jwtInterceptor;
+
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(jwtInterceptor)
+                .addPathPatterns("/**")
+                .excludePathPatterns("/**/login");   //假设city项目中的登录映射叫 login,则排除登录
+    }
+}
diff --git a/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/controller/CityController.java b/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/controller/CityController.java
index 1b2b06f..476d775 100644
--- a/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/controller/CityController.java
+++ b/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/controller/CityController.java
@@ -4,9 +4,12 @@
 import com.yanqun.entity.StatusCode;
 import com.yanqun.micro_city.entity.City;
 import com.yanqun.micro_city.service.CityService;
+import io.jsonwebtoken.Claims;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import util.JwtUtil;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /*
@@ -18,6 +21,12 @@ public class CityController {//spring mvc
     @Autowired
     CityService cityService ;//service 注入mapper(dao)
 
+    @Autowired
+    private HttpServletRequest request ;
+
+    @Autowired
+    private JwtUtil jwtUtil ;
+
 
 //    @RequestMapping(value="addCity",method= RequestMethod.POST)
     @PostMapping("addCity")
@@ -27,8 +36,42 @@ public Message addCity(@RequestBody City city){
        Message message = new Message(true, StatusCode.OK,   result );
         return message;//将请求的状态、状态码、结果封装在message对象
     }
+//    @DeleteMapping("deleteById/{id}")
+//    public Message deleteById( @PathVariable("id") Integer  id){
+//
+//        //删除之前 先通过jwt进行权限校验
+//        /*
+//                已经存在生成jwt
+//
+//                现在：解析jwt
+//                        1.客户端将jwt 传递给服务端 （postman模拟）
+//                        2.解析jwt
+//         */
+//        //假设此时，客户端postman已经将jwt(token)传递过来了
+//        String authentication = request.getHeader("authentication");
+//        if(authentication == null) {//请求时（postman)时，并没有携带jwt
+//            return new Message(false,StatusCode.ERROR,"权限不足！") ;
+//        }
+//
+//        String token = authentication.substring(7);//从yanqun-token截取出token
+//        Claims claims = jwtUtil.parseJWT(token);
+//        String roles = (String)claims.get("roles");
+//        System.out.println(roles+"roles");
+//        if(!roles.equals("admin")){
+//            return new Message(false,StatusCode.ERROR,"权限不足！") ;
+//        }
+//
+//
+//        boolean result =cityService.deleteById(id) ;
+//        return  new Message(true, StatusCode.OK,   result );
+//    }
     @DeleteMapping("deleteById/{id}")
     public Message deleteById( @PathVariable("id") Integer  id){
+        //如果拦截器 判断权限足够，则会在request中 放入一个claims参数；否则，没有claims参数
+        Claims claims = (Claims)request.getAttribute("claims");
+        if(claims == null){
+            return new Message(false,StatusCode.ERROR,"权限不足") ;
+        }
 
         boolean result =cityService.deleteById(id) ;
         return  new Message(true, StatusCode.OK,   result );
diff --git a/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/interceptor/JwtInterceptor.java b/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/interceptor/JwtInterceptor.java
new file mode 100644
index 0000000..ed66f84
--- /dev/null
+++ b/sources/microservice/micro_city/src/main/java/com/yanqun/micro_city/interceptor/JwtInterceptor.java
@@ -0,0 +1,42 @@
+package com.yanqun.micro_city.interceptor;
+
+import io.jsonwebtoken.Claims;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import util.JwtUtil;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/*
+ * Created by 颜群
+ */
+@Component
+public class JwtInterceptor extends HandlerInterceptorAdapter {
+
+
+    //请求 ->拦截器(pre) -> 增删改
+    @Autowired
+    private JwtUtil jwtUtil ;
+
+    @Autowired
+    private HttpServletRequest request ;
+
+
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        System.out.println("jwt拦截器...");
+        String authentication = request.getHeader("authentication");
+        if(authentication != null && authentication.startsWith("yanqun-")) {
+            String token = authentication.substring(7);
+            Claims claims = jwtUtil.parseJWT(token);
+            String roles = (String)claims.get("roles");
+            if(roles.equals("admin")){
+                request.setAttribute("claims",claims);
+            }
+        }
+        return true;
+    }
+}
diff --git a/sources/microservice/micro_city/src/main/resources/application.yml b/sources/microservice/micro_city/src/main/resources/application.yml
index 63242a1..76c39ee 100644
--- a/sources/microservice/micro_city/src/main/resources/application.yml
+++ b/sources/microservice/micro_city/src/main/resources/application.yml
@@ -13,3 +13,7 @@ spring:
 server:
   port: 8881
 
+jwt:
+  config:
+    key: yanqun
+    ttl: 1800000
\ No newline at end of file
diff --git a/sources/microservice/micro_city/target/classes/application.yml b/sources/microservice/micro_city/target/classes/application.yml
index 63242a1..76c39ee 100644
--- a/sources/microservice/micro_city/target/classes/application.yml
+++ b/sources/microservice/micro_city/target/classes/application.yml
@@ -13,3 +13,7 @@ spring:
 server:
   port: 8881
 
+jwt:
+  config:
+    key: yanqun
+    ttl: 1800000
\ No newline at end of file
diff --git a/sources/microservice/micro_common/pom.xml b/sources/microservice/micro_common/pom.xml
index d243d75..d7626cb 100644
--- a/sources/microservice/micro_common/pom.xml
+++ b/sources/microservice/micro_common/pom.xml
@@ -11,7 +11,26 @@
 
     <artifactId>micro_common</artifactId>
     <packaging>pom</packaging>
-   
+
+    <dependencies>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+
+        <!-- 解决提示警告： Annotation  Processor ....
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
 
 
 </project>
\ No newline at end of file
diff --git a/sources/microservice/micro_common/src/main/java/util/JwtUtil.java b/sources/microservice/micro_common/src/main/java/util/JwtUtil.java
new file mode 100644
index 0000000..1ddb016
--- /dev/null
+++ b/sources/microservice/micro_common/src/main/java/util/JwtUtil.java
@@ -0,0 +1,60 @@
+package util;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/*
+ * Created by 颜群
+ */
+
+@Component
+@ConfigurationProperties("jwt.config")
+
+@PropertySource("classpath:application.yml")
+public class JwtUtil {
+    private String key ;
+    private long ttl ;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public long getTtl() {
+        return ttl;
+    }
+
+    public void setTtl(long ttl) {
+        this.ttl = ttl;
+    }
+
+    //服务端生成jwt-token的方法 （JWTServer）
+    //约定：roles有两个值   normal/admin
+    public String createJWT(String id, String subject,String roles){
+        Date now = new Date() ;
+      long nowMillis =   System.currentTimeMillis() ;
+
+      return  Jwts.builder().setId(id)
+                .setSubject(subject)
+                .setIssuedAt( now  )
+                .setExpiration( new Date( nowMillis +  ttl   )   )
+                .signWith( SignatureAlgorithm.HS256, key   )
+                .claim("roles",roles).compact() ;//token
+    }
+
+
+    //客户单发送jwt-token时进行的校验方法 (JWTClient)
+     public Claims parseJWT(String token){
+        return Jwts.parser().setSigningKey(key).parseClaimsJws(token).getBody() ;
+     }
+}
+
diff --git a/sources/microservice/micro_people/pom.xml b/sources/microservice/micro_people/pom.xml
index a5dfbb0..666857d 100644
--- a/sources/microservice/micro_people/pom.xml
+++ b/sources/microservice/micro_people/pom.xml
@@ -18,17 +18,18 @@
             <groupId>com.yanqun</groupId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- jpa ,已经自带了类似jdbc功能，因此不需要单独再引入jdbc-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
+        <!--
+                       <dependency>
+                           <groupId>mysql</groupId>
+                           <artifactId>mysql-connector-java</artifactId>
+                       </dependency>
+
+              jpa ,已经自带了类似jdbc功能，因此不需要单独再引入jdbc
+ <dependency>
+     <groupId>org.springframework.boot</groupId>
+     <artifactId>spring-boot-starter-data-jpa</artifactId>
+ </dependency>
+-->
 
     </dependencies>
 
diff --git a/sources/microservice/micro_people/src/main/java/com/yanqun/MicroPeopleApplication.java b/sources/microservice/micro_people/src/main/java/com/yanqun/MicroPeopleApplication.java
index 452497c..dd5de36 100644
--- a/sources/microservice/micro_people/src/main/java/com/yanqun/MicroPeopleApplication.java
+++ b/sources/microservice/micro_people/src/main/java/com/yanqun/MicroPeopleApplication.java
@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import util.JwtUtil;
 
 @SpringBootApplication
 public class MicroPeopleApplication {
@@ -10,4 +12,9 @@ public static void main(String[] args) {
         SpringApplication.run(MicroPeopleApplication.class, args);
     }
 
+
+    @Bean
+    public JwtUtil jwtUtil(){
+        return new JwtUtil() ;
+    }
 }
diff --git a/sources/microservice/micro_people/src/main/java/com/yanqun/controller/AddressControler.java b/sources/microservice/micro_people/src/main/java/com/yanqun/controller/AddressControler.java
index 7711714..df23215 100644
--- a/sources/microservice/micro_people/src/main/java/com/yanqun/controller/AddressControler.java
+++ b/sources/microservice/micro_people/src/main/java/com/yanqun/controller/AddressControler.java
@@ -1,10 +1,10 @@
 package com.yanqun.controller;
 
-import com.yanqun.entity.Message;
-import com.yanqun.entity.StatusCode;
 import com.yanqun.service.AddressService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /*
  * Created by 颜群
@@ -17,24 +17,24 @@ public class AddressControler {
     private AddressService addressService ;
 
 
-    @GetMapping(value="/jpa4/findAddressNamesAndCount")
-    public Message findAddressNamesAndCount(){
-        return new Message(true, StatusCode.OK,addressService.findAddressNamesAndCount()) ;
-    }
-
-    @PostMapping(value="/jpa4/addAddress/{id}/{name}")
-    public Message addAddress(@PathVariable Integer id ,@PathVariable String name){
-        return new Message(true,StatusCode.OK, addressService.addAddress(id,name)  ) ;
-    }
-
-    @DeleteMapping(value="/jpa4/deleteAddress/{id}")
-    public Message deleteAddress(@PathVariable Integer id){
-        return new Message(true,StatusCode.OK, addressService.deleteAddressById(id)  ) ;
-    }
-
-    @PutMapping(value="/jpa4/updateAddress/{id}/{name}")
-    public Message updateAddress(@PathVariable String name, @PathVariable Integer id){
-        return new Message(true,StatusCode.OK, addressService.updateAddress(name,id)  ) ;
-    }
+//    @GetMapping(value="/jpa4/findAddressNamesAndCount")
+//    public Message findAddressNamesAndCount(){
+//        return new Message(true, StatusCode.OK,addressService.findAddressNamesAndCount()) ;
+//    }
+//
+//    @PostMapping(value="/jpa4/addAddress/{id}/{name}")
+//    public Message addAddress(@PathVariable Integer id ,@PathVariable String name){
+//        return new Message(true,StatusCode.OK, addressService.addAddress(id,name)  ) ;
+//    }
+//
+//    @DeleteMapping(value="/jpa4/deleteAddress/{id}")
+//    public Message deleteAddress(@PathVariable Integer id){
+//        return new Message(true,StatusCode.OK, addressService.deleteAddressById(id)  ) ;
+//    }
+//
+//    @PutMapping(value="/jpa4/updateAddress/{id}/{name}")
+//    public Message updateAddress(@PathVariable String name, @PathVariable Integer id){
+//        return new Message(true,StatusCode.OK, addressService.updateAddress(name,id)  ) ;
+//    }
 
 }
diff --git a/sources/microservice/micro_people/src/main/java/com/yanqun/controller/PeopleController.java b/sources/microservice/micro_people/src/main/java/com/yanqun/controller/PeopleController.java
index acd0717..cec7cd8 100644
--- a/sources/microservice/micro_people/src/main/java/com/yanqun/controller/PeopleController.java
+++ b/sources/microservice/micro_people/src/main/java/com/yanqun/controller/PeopleController.java
@@ -1,13 +1,13 @@
 package com.yanqun.controller;
 
 import com.yanqun.entity.Message;
-import com.yanqun.entity.People;
 import com.yanqun.entity.StatusCode;
 import com.yanqun.service.PeopleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import util.JwtUtil;
 
-import java.util.List;
+import java.util.HashMap;
 import java.util.Map;
 
 /*
@@ -17,105 +17,148 @@
 @RestController
 @RequestMapping("/people")
 public class PeopleController {
+    @Autowired
+    private JwtUtil jwtUtil ;
 
     @Autowired
     private PeopleService peopleService ;
 
     //localhost:8885/people
-    @GetMapping
-    public Message findAll(){
-        return new Message(true,StatusCode.OK,  peopleService.findAll() ) ;
-    }
-
-    @GetMapping(value="/jpa2/{name}")
-    public Message findByNameOrderByAgeDesc(@PathVariable String name){
-        return new Message(true,StatusCode.OK,  peopleService.findByNameOrderByAgeDesc(name) ) ;
-    }
-
-
-    @GetMapping(value="/jpa3/{age}")
-    public Message findByAgeAsc(@PathVariable Integer age){
-        return new Message(true,StatusCode.OK,  peopleService.findByAgeAsc(age) ) ;
-    }
-
-    @GetMapping(value="/jpa3/page/{age}/{currentPage}/{pageSize}")
-    public Message findByAgeAsc2(@PathVariable Integer age,@PathVariable Integer currentPage,@PathVariable Integer pageSize){
-        return new Message(true,StatusCode.OK,  peopleService.findByAgeAsc2(age,currentPage,pageSize) ) ;
-    }
-
-
-
-
-
-
-    @PostMapping
-    public Message savePeople(@RequestBody People people){
-        peopleService.savePeople(people);
-        return new Message( true , StatusCode.OK) ;
-    }
-
-    //localhost:8885/people/s1001   delete
-    @DeleteMapping(value="/{id}")
-    public Message deletePeopleById(@PathVariable String id){
-        peopleService.deletePeopleById(id);
-        return new Message( true , StatusCode.OK) ;
-    }
-
-    //update ....set name = ?,age = ?  where id = ?
-    @PutMapping // id,   name,age
-    public Message updatePeople( @RequestBody People people){
-        peopleService.updatePeople( people);
-        return new Message( true , StatusCode.OK) ;
-    }
-
-
-    @PutMapping(value="/update/{id}")
-    public Message updatePeople(@PathVariable String id){
-        return new Message(true,StatusCode.OK,  peopleService.updatePeople(id) ) ;
-    }
-
-    @PutMapping(value="/update2/{id}/{age}")
-    public Message updatePeople2(@PathVariable String id,@PathVariable  Integer age){
-        return new Message(true,StatusCode.OK,  peopleService.updatePeople2(id,age) ) ;
-    }
+//    @GetMapping
+//    public Message findAll(){
+//        return new Message(true,StatusCode.OK,  peopleService.findAll() ) ;
+//    }
 
-    @PutMapping(value="/update3")
-    public Message updatePeople3(@RequestBody People people){
-        return new Message(true,StatusCode.OK,  peopleService.updatePeople3(people) ) ;
+    public JwtUtil getJwtUtil() {
+        return jwtUtil;
     }
 
-
-
-
-    @GetMapping(value="/{id}")
-    public Message findPeopleById(@PathVariable String id){
-        return new Message(true,StatusCode.OK,  peopleService.findPeopleById(id) ) ;
+    public void setJwtUtil(JwtUtil jwtUtil) {
+        this.jwtUtil = jwtUtil;
     }
 
-    @GetMapping(value="/jpa4/{id}")
-    public Message findNameById(@PathVariable String id){
-        return new Message(true,StatusCode.OK,peopleService.findNameById(id)) ;
-
-    }
+    //用户名：username
+    //密码：password
+    @PostMapping(value="/login")
+    public Message login(@RequestBody Map<String,String> login){
+        //controller -sercice -dao 模拟操作
+        String uname =    login.get("username") ;
+        String upwd = login.get("password") ;
+        //findUserByUsernameAndPassword
+        //zs/abc -> 返回这个人的全部信息 User(zs/abc,id(1001).....)
+
+        System.out.println("1111");
+        //假设数据库中的zs/abc  （并且：假设这个人的id1001,这个人是管理员权限admin   ）
+        if(uname.equals("zs") && upwd.equals("abc")){
+            //登录成功，服务端生成token
+            //String id, String subject,String roles
+            String token = jwtUtil.createJWT("1001", "zs", "admin");
+
+            Map map = new HashMap() ;
+            map.put("token",token) ;
+            map.put("username",uname) ;
+
+            System.out.println("登录成功");
+            //登录成功：返回token\用户名
+            return new Message(true,StatusCode.OK,map) ;
+        }else{
+            System.out.println("登录失败");
+            return new Message(false,StatusCode.ERROR) ;
+        }
 
-    @GetMapping(value="/jpa4/{name}/{age}")
-    public Message findPeopleByNameAndAge(@PathVariable String name, @PathVariable int age){
-        return new Message(true,StatusCode.OK,peopleService.findPeopleByNameAndAge(name,age)) ;
 
     }
 
-    //给原生SQL传入的是集合，并且加了分页功能
-    @GetMapping(value="/jpa4/findPeopleByAges/{currentPage}/{pageSize}")
-     public  Message findPeopleByAges(@RequestParam(value="ages")  List<Integer> ages,@PathVariable Integer currentPage,@PathVariable Integer pageSize){
-        return new Message(true,StatusCode.OK,peopleService.findPeopleByAges(ages,currentPage,pageSize)) ;
-
-    }
 
-    //springmvc 接收map 和接收entiy是一致的
-    @GetMapping(value="/jpa5/findPeople/{currentPage}/{pageSize}")
-    public Message findPeople(@RequestBody Map<String,Object> map ,@PathVariable Integer currentPage,@PathVariable Integer  pageSize) {
-        return new Message(true, StatusCode.OK, peopleService.findPeople(map,currentPage,pageSize));
-    }
+//    @GetMapping(value="/jpa2/{name}")
+//    public Message findByNameOrderByAgeDesc(@PathVariable String name){
+//        return new Message(true,StatusCode.OK,  peopleService.findByNameOrderByAgeDesc(name) ) ;
+//    }
+//
+//
+//    @GetMapping(value="/jpa3/{age}")
+//    public Message findByAgeAsc(@PathVariable Integer age){
+//        return new Message(true,StatusCode.OK,  peopleService.findByAgeAsc(age) ) ;
+//    }
+//
+//    @GetMapping(value="/jpa3/page/{age}/{currentPage}/{pageSize}")
+//    public Message findByAgeAsc2(@PathVariable Integer age,@PathVariable Integer currentPage,@PathVariable Integer pageSize){
+//        return new Message(true,StatusCode.OK,  peopleService.findByAgeAsc2(age,currentPage,pageSize) ) ;
+//    }
+//
+//
+//
+//
+//
+//
+//    @PostMapping
+//    public Message savePeople(@RequestBody People people){
+//        peopleService.savePeople(people);
+//        return new Message( true , StatusCode.OK) ;
+//    }
+//
+//    //localhost:8885/people/s1001   delete
+//    @DeleteMapping(value="/{id}")
+//    public Message deletePeopleById(@PathVariable String id){
+//        peopleService.deletePeopleById(id);
+//        return new Message( true , StatusCode.OK) ;
+//    }
+//
+//    //update ....set name = ?,age = ?  where id = ?
+//    @PutMapping // id,   name,age
+//    public Message updatePeople( @RequestBody People people){
+//        peopleService.updatePeople( people);
+//        return new Message( true , StatusCode.OK) ;
+//    }
+//
+//
+//    @PutMapping(value="/update/{id}")
+//    public Message updatePeople(@PathVariable String id){
+//        return new Message(true,StatusCode.OK,  peopleService.updatePeople(id) ) ;
+//    }
+//
+//    @PutMapping(value="/update2/{id}/{age}")
+//    public Message updatePeople2(@PathVariable String id,@PathVariable  Integer age){
+//        return new Message(true,StatusCode.OK,  peopleService.updatePeople2(id,age) ) ;
+//    }
+//
+//    @PutMapping(value="/update3")
+//    public Message updatePeople3(@RequestBody People people){
+//        return new Message(true,StatusCode.OK,  peopleService.updatePeople3(people) ) ;
+//    }
+//
+//
+//
+//
+//    @GetMapping(value="/{id}")
+//    public Message findPeopleById(@PathVariable String id){
+//        return new Message(true,StatusCode.OK,  peopleService.findPeopleById(id) ) ;
+//    }
+//
+//    @GetMapping(value="/jpa4/{id}")
+//    public Message findNameById(@PathVariable String id){
+//        return new Message(true,StatusCode.OK,peopleService.findNameById(id)) ;
+//
+//    }
+//
+//    @GetMapping(value="/jpa4/{name}/{age}")
+//    public Message findPeopleByNameAndAge(@PathVariable String name, @PathVariable int age){
+//        return new Message(true,StatusCode.OK,peopleService.findPeopleByNameAndAge(name,age)) ;
+//
+//    }
+//
+//    //给原生SQL传入的是集合，并且加了分页功能
+//    @GetMapping(value="/jpa4/findPeopleByAges/{currentPage}/{pageSize}")
+//     public  Message findPeopleByAges(@RequestParam(value="ages")  List<Integer> ages,@PathVariable Integer currentPage,@PathVariable Integer pageSize){
+//        return new Message(true,StatusCode.OK,peopleService.findPeopleByAges(ages,currentPage,pageSize)) ;
+//
+//    }
+//
+//    //springmvc 接收map 和接收entiy是一致的
+//    @GetMapping(value="/jpa5/findPeople/{currentPage}/{pageSize}")
+//    public Message findPeople(@RequestBody Map<String,Object> map ,@PathVariable Integer currentPage,@PathVariable Integer  pageSize) {
+//        return new Message(true, StatusCode.OK, peopleService.findPeople(map,currentPage,pageSize));
+//    }
 
 
 
diff --git a/sources/microservice/micro_people/src/main/java/com/yanqun/dao/AddressDao.java b/sources/microservice/micro_people/src/main/java/com/yanqun/dao/AddressDao.java
index c0bb374..987d902 100644
--- a/sources/microservice/micro_people/src/main/java/com/yanqun/dao/AddressDao.java
+++ b/sources/microservice/micro_people/src/main/java/com/yanqun/dao/AddressDao.java
@@ -1,36 +1,30 @@
 package com.yanqun.dao;
 
-import com.yanqun.entity.Address;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.List;
-
 /*
  * Created by 颜群
  */
-public interface AddressDao extends JpaRepository<Address,String>, JpaSpecificationExecutor<Address> {
+public interface AddressDao
+//        extends JpaRepository<Address,String>, JpaSpecificationExecutor<Address>
+{
 
     /*查询每一个地址，各自有多少人使用
                xa      3
                bj      5
              核心：将原生的SQL，放在value中。无论是 单表、还是复杂的多表查询都可以。
         */
-    @Query(nativeQuery = true ,value="select a.name,count(1) from tb_address a inner join tb_people p on a.id = p.address group by a.name")
-    public List<Object[]> findAddressNamesAndCount() ;
-
-    //DML
-    @Modifying
-    @Query(nativeQuery = true ,value="insert into tb_address(id,name) values(?,?)")
-    public int addAddress(Integer id ,String name);
-
-    @Modifying
-    @Query(nativeQuery = true,value="delete from tb_address where id = ?")
-    public int deleteAddressById(Integer id);
-
-    @Modifying
-    @Query(nativeQuery = true,value = "update tb_address a set a.name= ? where a.id =?")
-    public int updateAddress( String name , Integer id );
+//    @Query(nativeQuery = true ,value="select a.name,count(1) from tb_address a inner join tb_people p on a.id = p.address group by a.name")
+//    public List<Object[]> findAddressNamesAndCount() ;
+//
+//    //DML
+//    @Modifying
+//    @Query(nativeQuery = true ,value="insert into tb_address(id,name) values(?,?)")
+//    public int addAddress(Integer id ,String name);
+//
+//    @Modifying
+//    @Query(nativeQuery = true,value="delete from tb_address where id = ?")
+//    public int deleteAddressById(Integer id);
+//
+//    @Modifying
+//    @Query(nativeQuery = true,value = "update tb_address a set a.name= ? where a.id =?")
+//    public int updateAddress( String name , Integer id );
 }
diff --git a/sources/microservice/micro_people/src/main/java/com/yanqun/dao/PeopleDao.java b/sources/microservice/micro_people/src/main/java/com/yanqun/dao/PeopleDao.java
index e6b52e1..e680916 100644
--- a/sources/microservice/micro_people/src/main/java/com/yanqun/dao/PeopleDao.java
+++ b/sources/microservice/micro_people/src/main/java/com/yanqun/dao/PeopleDao.java
@@ -1,16 +1,5 @@
 package com.yanqun.dao;
 
-import com.yanqun.entity.People;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-
 /*
  * Created by 颜群
  * jpa使用方式一：继承JpaRepository<People,String> , JpaSpecificationExecutor<People>;需要写任何代码
@@ -18,42 +7,44 @@
  * JpaRepository ：提供了基本的增删改查
  * JpaSpecificationExecutor：较为复杂的条件查询
  */
-public interface PeopleDao extends JpaRepository<People,String> , JpaSpecificationExecutor<People> {
-    //jpa使用方式一：dao层中不用自己写任何方法，只调用父接口中的方法。缺点：父接口中提供的方法有限
-    //jpa使用方式二：可以编写自己的方法，但是可以不写SQL。根据约定写方法的名字。
-    public List<People> findByNameOrderByAgeDesc(String name) ;
-
-    //jpa使用方式三：面向对象SQL语句 ：JPQL
-    //select p from People p from where 类中的属性 = ?序号
-    @Query("select p from People p where age =?1 ")
-    public List<People> findByAgeAsc(Integer age) ;//因为上面是通过Query指定了HQL，因此方法名可以任意编写
-
-    //在方式三的基础上，加上分页功能
-    @Query("select p from People p where age =?1 ")
-    public List<People> findByAgeAsc2(Integer age , Pageable pageable) ;//因为上面是通过Query指定了HQL，因此方法名可以任意编写
-
-    @Modifying
-    @Query("update People  set age=age+1 where id =?1")
-    public int updatePeople(String id) ;
-
-    @Modifying
-    @Query("update People  set age=?2 where id =?1")
-    public int updatePeople2( String id,Integer age);
-
-
-    @Modifying
-    @Query("update People p set  p.age = :#{#people.age}  , p.address=:#{#people.address}   where p.id =:#{#people.id}")
-    public int updatePeople3(@Param("people") People people );//28  ,shanghai
-
-    //jpa使用方式四：面向SQL（原生的SQL语句）,推荐
-    @Query(nativeQuery = true , value="select  name from tb_people where id =? ")
-    public String findNameById(String id) ;
-
-    @Query(nativeQuery = true,value="select * from tb_people where name = ? and age =? ")
-    public List<People> findPeopleByNameAndAge(String name ,int age);
-
-    @Query(nativeQuery = true,value="select * from tb_people where age in (:ages) order by age")
-    public Page<People> findPeopleByAges(@Param("ages") List<Integer> ages   , Pageable pageable);
+public interface PeopleDao
+//        extends JpaRepository<People,String> , JpaSpecificationExecutor<People>
+{
+//    //jpa使用方式一：dao层中不用自己写任何方法，只调用父接口中的方法。缺点：父接口中提供的方法有限
+//    //jpa使用方式二：可以编写自己的方法，但是可以不写SQL。根据约定写方法的名字。
+//    public List<People> findByNameOrderByAgeDesc(String name) ;
+//
+//    //jpa使用方式三：面向对象SQL语句 ：JPQL
+//    //select p from People p from where 类中的属性 = ?序号
+//    @Query("select p from People p where age =?1 ")
+//    public List<People> findByAgeAsc(Integer age) ;//因为上面是通过Query指定了HQL，因此方法名可以任意编写
+//
+//    //在方式三的基础上，加上分页功能
+//    @Query("select p from People p where age =?1 ")
+//    public List<People> findByAgeAsc2(Integer age , Pageable pageable) ;//因为上面是通过Query指定了HQL，因此方法名可以任意编写
+//
+//    @Modifying
+//    @Query("update People  set age=age+1 where id =?1")
+//    public int updatePeople(String id) ;
+//
+//    @Modifying
+//    @Query("update People  set age=?2 where id =?1")
+//    public int updatePeople2( String id,Integer age);
+//
+//
+//    @Modifying
+//    @Query("update People p set  p.age = :#{#people.age}  , p.address=:#{#people.address}   where p.id =:#{#people.id}")
+//    public int updatePeople3(@Param("people") People people );//28  ,shanghai
+//
+//    //jpa使用方式四：面向SQL（原生的SQL语句）,推荐
+//    @Query(nativeQuery = true , value="select  name from tb_people where id =? ")
+//    public String findNameById(String id) ;
+//
+//    @Query(nativeQuery = true,value="select * from tb_people where name = ? and age =? ")
+//    public List<People> findPeopleByNameAndAge(String name ,int age);
+//
+//    @Query(nativeQuery = true,value="select * from tb_people where age in (:ages) order by age")
+//    public Page<People> findPeopleByAges(@Param("ages") List<Integer> ages   , Pageable pageable);
     //public  List<People> findPeopleByAges(@Param("ages") List<Integer> ages   , Pageable pageable);
 
     //jpa使用方式五：面向对象查法
diff --git a/sources/microservice/micro_people/src/main/java/com/yanqun/entity/Address.java b/sources/microservice/micro_people/src/main/java/com/yanqun/entity/Address.java
index caa6d1e..f6df30d 100644
--- a/sources/microservice/micro_people/src/main/java/com/yanqun/entity/Address.java
+++ b/sources/microservice/micro_people/src/main/java/com/yanqun/entity/Address.java
@@ -1,16 +1,12 @@
 package com.yanqun.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /*
  * Created by 颜群
  */
-@Entity
-@Table(name="tb_address")
+//@Entity
+//@Table(name="tb_address")
 public class Address {
-    @Id
+//    @Id
     private Integer id ;
     private String name ;
 
diff --git a/sources/microservice/micro_people/src/main/java/com/yanqun/entity/People.java b/sources/microservice/micro_people/src/main/java/com/yanqun/entity/People.java
index faf6abe..dbeb7cd 100644
--- a/sources/microservice/micro_people/src/main/java/com/yanqun/entity/People.java
+++ b/sources/microservice/micro_people/src/main/java/com/yanqun/entity/People.java
@@ -4,15 +4,12 @@
  * Created by 颜群
  */
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.io.Serializable;
 
-@Entity
-@Table(name="tb_people")
+//@Entity
+//@Table(name="tb_people")
 public class People implements Serializable {
-    @Id
+//    @Id
     private String id ;  //分布式系统  uuid  snowflake自动生成一套 不会重复的id
     private String name ;
     private Integer age ;
diff --git a/sources/microservice/micro_people/src/main/java/com/yanqun/service/AddressService.java b/sources/microservice/micro_people/src/main/java/com/yanqun/service/AddressService.java
index 2483110..c787a66 100644
--- a/sources/microservice/micro_people/src/main/java/com/yanqun/service/AddressService.java
+++ b/sources/microservice/micro_people/src/main/java/com/yanqun/service/AddressService.java
@@ -1,11 +1,6 @@
 package com.yanqun.service;
 
-import com.yanqun.dao.AddressDao;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /*
  * Created by 颜群
@@ -13,29 +8,28 @@
 
 @Service
 public class AddressService  {
-    @Autowired
-    private AddressDao addressDao ;
-
-
-    public List<Object[]> findAddressNamesAndCount() {
-        return addressDao.findAddressNamesAndCount() ;
-    }
-
-
-
-
-    @Transactional
-    public int addAddress(Integer id ,String name){
-        return addressDao.addAddress(id,name) ;
-    }
-
-    @Transactional
-    public int deleteAddressById(Integer id){
-        return addressDao.deleteAddressById(id) ;
-    }
-
-    @Transactional
-    public int updateAddress( String name , Integer id ){
-        return addressDao.updateAddress(name,id) ;
-    }
+//    @Autowired
+//    private AddressDao addressDao ;
+//
+//
+//    public List<Object[]> findAddressNamesAndCount() {
+//        return addressDao.findAddressNamesAndCount() ;
+//    }
+//
+//
+//
+//    @Transactional
+//    public int addAddress(Integer id ,String name){
+//        return addressDao.addAddress(id,name) ;
+//    }
+//
+//    @Transactional
+//    public int deleteAddressById(Integer id){
+//        return addressDao.deleteAddressById(id) ;
+//    }
+//
+//    @Transactional
+//    public int updateAddress( String name , Integer id ){
+//        return addressDao.updateAddress(name,id) ;
+//    }
 }
diff --git a/sources/microservice/micro_people/src/main/java/com/yanqun/service/PeopleService.java b/sources/microservice/micro_people/src/main/java/com/yanqun/service/PeopleService.java
index 1cc1f0d..448201f 100644
--- a/sources/microservice/micro_people/src/main/java/com/yanqun/service/PeopleService.java
+++ b/sources/microservice/micro_people/src/main/java/com/yanqun/service/PeopleService.java
@@ -1,21 +1,6 @@
 package com.yanqun.service;
 
-import com.yanqun.dao.PeopleDao;
-import com.yanqun.entity.People;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 /*
  * Created by 颜群
@@ -23,114 +8,114 @@
 
 @Service
 public class PeopleService {
-    @Autowired
-    private PeopleDao peopleDao ;
-
-
-    public void savePeople(People people){
-        peopleDao.save(people) ;
-    }
-
-
-    //jpa底层，修改和 增加都是 save()
-    public void updatePeople(People people){
-            peopleDao.save( people) ;
-    }
-
-    public void deletePeopleById(String id){
-        peopleDao.deleteById(id);
-    }
-
-    public List<People> findAll() {
-       return  peopleDao.findAll() ;
-    }
-
-    public People findPeopleById(String id){
-        return peopleDao.findById( id ).get() ;
-    }
-
-    public List<People> findByNameOrderByAgeDesc(String name) {
-      return   peopleDao.findByNameOrderByAgeDesc(name) ;
-    }
-
-    public List<People> findByAgeAsc(Integer age) {
-        return   peopleDao.findByAgeAsc(age) ;
-    }
-
-    public List<People> findByAgeAsc2(Integer age,int currentPage ,int pageSize) {
-//        PageRequest.of(第几页，页面大小);
-        PageRequest pageRequest = PageRequest.of(currentPage-1, pageSize);//1  ,0
-        return   peopleDao.findByAgeAsc2(age, pageRequest) ;
-    }
-
-    @Transactional
-    public int updatePeople(String id){
-       return  peopleDao.updatePeople(id) ;
-    }
-
-
-
+//    @Autowired
+//    private PeopleDao peopleDao ;
+//
+//
+//    public void savePeople(People people){
+//        peopleDao.save(people) ;
+//    }
+//
+//
+//    //jpa底层，修改和 增加都是 save()
+//    public void updatePeople(People people){
+//            peopleDao.save( people) ;
+//    }
+//
+//    public void deletePeopleById(String id){
+//        peopleDao.deleteById(id);
+//    }
+//
+//    public List<People> findAll() {
+//       return  peopleDao.findAll() ;
+//    }
+//
+//    public People findPeopleById(String id){
+//        return peopleDao.findById( id ).get() ;
+//    }
+//
+//    public List<People> findByNameOrderByAgeDesc(String name) {
+//      return   peopleDao.findByNameOrderByAgeDesc(name) ;
+//    }
+//
+//    public List<People> findByAgeAsc(Integer age) {
+//        return   peopleDao.findByAgeAsc(age) ;
+//    }
+//
+//    public List<People> findByAgeAsc2(Integer age,int currentPage ,int pageSize) {
+////        PageRequest.of(第几页，页面大小);
+//        PageRequest pageRequest = PageRequest.of(currentPage-1, pageSize);//1  ,0
+//        return   peopleDao.findByAgeAsc2(age, pageRequest) ;
+//    }
+//
 //    @Transactional
-    public int updatePeople2(String id,int age){
-        return  peopleDao.updatePeople2(id,age) ;
-    }
-
-
-
-    @Transactional
-    public int updatePeople3(People people){
-        return  peopleDao.updatePeople3(people) ;
-    }
-
-
-    public String findNameById(String id) {
-        return peopleDao.findNameById(id) ;
-    }
-
-    public List<People> findPeopleByNameAndAge(String name,int age){
-        return peopleDao.findPeopleByNameAndAge(name,age) ;
-    }
-
-
-    public Page<People> findPeopleByAges(List<Integer> ages, Integer currentPage, Integer pageSize){
-        PageRequest pageRequest = PageRequest.of(currentPage-1, pageSize);
-        return peopleDao.findPeopleByAges(ages,pageRequest) ;
-    }
-
-
-    //map [ {id,1}, {name,zs}   ]
-    //select *from people where id =?  and name like '%?%'  and age=?  and address=?
-    //方式五
-    public Page<People> findPeople(Map<String,Object> map, int currentPage,int pageSize){
-
-        PageRequest pageRequest = PageRequest.of(currentPage - 1, pageSize);
-
-        return peopleDao.findAll(new Specification<People>() {
-            @Override
-            public Predicate toPredicate(Root<People> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
-                //查询条件
-                List<Predicate>  predicates = new ArrayList<>() ;
-                if (map.get("age") != null  &&  map.get("age")!=""  ) {//是否where子句中有age
-                    predicates.add( criteriaBuilder.equal(  root.get("age").as(Integer.class)  ,(Integer)map.get("age") )          ) ;
-                }
-
-                if(map.get("name") != null  &&  map.get("name")!=""){
-                    predicates.add(  criteriaBuilder.like( root.get("name").as(String.class)  ,"%"+(String)map.get("name")+"%" )  );
-                }
-
-
-                //if  address
-                //if  age
-                //API拼凑
-                return  criteriaBuilder.and( predicates.toArray( new Predicate[predicates.size()] )  );
-            }
-        }, pageRequest     ) ;
-
-
-
-    }
-
-
+//    public int updatePeople(String id){
+//       return  peopleDao.updatePeople(id) ;
+//    }
+//
+//
+//
+////    @Transactional
+//    public int updatePeople2(String id,int age){
+//        return  peopleDao.updatePeople2(id,age) ;
+//    }
+//
+//
+//
+//    @Transactional
+//    public int updatePeople3(People people){
+//        return  peopleDao.updatePeople3(people) ;
+//    }
+//
+//
+//    public String findNameById(String id) {
+//        return peopleDao.findNameById(id) ;
+//    }
+//
+//    public List<People> findPeopleByNameAndAge(String name,int age){
+//        return peopleDao.findPeopleByNameAndAge(name,age) ;
+//    }
+//
+//
+//    public Page<People> findPeopleByAges(List<Integer> ages, Integer currentPage, Integer pageSize){
+//        PageRequest pageRequest = PageRequest.of(currentPage-1, pageSize);
+//        return peopleDao.findPeopleByAges(ages,pageRequest) ;
+//    }
+//
+//
+//    //map [ {id,1}, {name,zs}   ]
+//    //select *from people where id =?  and name like '%?%'  and age=?  and address=?
+//    //方式五
+//    public Page<People> findPeople(Map<String,Object> map, int currentPage,int pageSize){
+//
+//        PageRequest pageRequest = PageRequest.of(currentPage - 1, pageSize);
+//
+//        return peopleDao.findAll(new Specification<People>() {
+//            @Override
+//            public Predicate toPredicate(Root<People> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+//                //查询条件
+//                List<Predicate>  predicates = new ArrayList<>() ;
+//                if (map.get("age") != null  &&  map.get("age")!=""  ) {//是否where子句中有age
+//                    predicates.add( criteriaBuilder.equal(  root.get("age").as(Integer.class)  ,(Integer)map.get("age") )          ) ;
+//                }
+//
+//                if(map.get("name") != null  &&  map.get("name")!=""){
+//                    predicates.add(  criteriaBuilder.like( root.get("name").as(String.class)  ,"%"+(String)map.get("name")+"%" )  );
+//                }
+//
+//
+//                //if  address
+//                //if  age
+//                //API拼凑
+//                return  criteriaBuilder.and( predicates.toArray( new Predicate[predicates.size()] )  );
+//            }
+//        }, pageRequest     ) ;
+//
+//
+//
+//    }
+//
+//
 
 
 
diff --git a/sources/microservice/micro_people/src/main/resources/application.yml b/sources/microservice/micro_people/src/main/resources/application.yml
index e984a00..cfc287a 100644
--- a/sources/microservice/micro_people/src/main/resources/application.yml
+++ b/sources/microservice/micro_people/src/main/resources/application.yml
@@ -1,25 +1,28 @@
 server:
   port: 8885
 
-spring:
-  datasource:
-    username: root
-    password: root123
-    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.2.130/micro_people?characterEncodig=utf-8
-  jpa:
-    database: mysql
-    generate-ddl: true #利用jpa，根据实体类、自动生成相应的表
-    show-sql: true
-    #abcda: true  如果属性名写错，背景是黄色
-    properties:
-      hibernate:
-        dialect:
-          org.hibernate.dialect.MySQL5InnoDBDialect  # 默认 不加也可以；但如果 无法使用自动生成表的功能，则加上此句
+#spring:
+#  datasource:
+#    username: root
+#    password: root123
+#    driverClassName: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://192.168.2.130/micro_people?characterEncodig=utf-8
+#  jpa:
+#    database: mysql
+#    generate-ddl: true #利用jpa，根据实体类、自动生成相应的表
+#    show-sql: true
+#    properties:
+#      hibernate:
+#        dialect:
+#          org.hibernate.dialect.MySQL5InnoDBDialect  # 默认 不加也可以；但如果 无法使用自动生成表的功能，则加上此句
 #    hibernate:
 #      ddl-auto: update
 
 
+jwt:
+  config:
+    key: yanqun
+    ttl: 1800000
 
 
 
diff --git a/sources/microservice/micro_people/target/classes/META-INF/micro_people.kotlin_module b/sources/microservice/micro_people/target/classes/META-INF/micro_people.kotlin_module
deleted file mode 100644
index 8fb6019..0000000
Binary files a/sources/microservice/micro_people/target/classes/META-INF/micro_people.kotlin_module and /dev/null differ
diff --git a/sources/microservice/micro_people/target/classes/application.yml b/sources/microservice/micro_people/target/classes/application.yml
index e984a00..cfc287a 100644
--- a/sources/microservice/micro_people/target/classes/application.yml
+++ b/sources/microservice/micro_people/target/classes/application.yml
@@ -1,25 +1,28 @@
 server:
   port: 8885
 
-spring:
-  datasource:
-    username: root
-    password: root123
-    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.2.130/micro_people?characterEncodig=utf-8
-  jpa:
-    database: mysql
-    generate-ddl: true #利用jpa，根据实体类、自动生成相应的表
-    show-sql: true
-    #abcda: true  如果属性名写错，背景是黄色
-    properties:
-      hibernate:
-        dialect:
-          org.hibernate.dialect.MySQL5InnoDBDialect  # 默认 不加也可以；但如果 无法使用自动生成表的功能，则加上此句
+#spring:
+#  datasource:
+#    username: root
+#    password: root123
+#    driverClassName: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://192.168.2.130/micro_people?characterEncodig=utf-8
+#  jpa:
+#    database: mysql
+#    generate-ddl: true #利用jpa，根据实体类、自动生成相应的表
+#    show-sql: true
+#    properties:
+#      hibernate:
+#        dialect:
+#          org.hibernate.dialect.MySQL5InnoDBDialect  # 默认 不加也可以；但如果 无法使用自动生成表的功能，则加上此句
 #    hibernate:
 #      ddl-auto: update
 
 
+jwt:
+  config:
+    key: yanqun
+    ttl: 1800000
 
 
 
diff --git a/sources/microservice/projct_httpclient/src/main/java/URLConnectionDemo.java b/sources/microservice/projct_httpclient/src/main/java/URLConnectionDemo.java
index 1ed7f03..53000db 100644
--- a/sources/microservice/projct_httpclient/src/main/java/URLConnectionDemo.java
+++ b/sources/microservice/projct_httpclient/src/main/java/URLConnectionDemo.java
@@ -10,50 +10,47 @@
  * Created by 颜群
  */
 public class URLConnectionDemo {
-    public static void main(String[] args) {
+
+    public static String getResource(){
         BufferedReader reader = null ;
         StringBuffer html = new StringBuffer();
         try {
-            URL url = new URL("http://www.lanqiao.cn/");//如果某个网站无法爬取，则更换网址，或者终止爬取
+            URL url = new URL("https://www.lanqiao.cn/");//如果某个网站无法爬取，则更换网址，或者终止爬取
             //获取网页的html源码
             URLConnection urlConnection = url.openConnection();
             urlConnection.connect();
-             reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));  //字节流 ->转换流-> 字符串(字符流)->带缓冲区的字符流
+            reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));  //字节流 ->转换流-> 字符串(字符流)->带缓冲区的字符流
 
             String line = null;
             while ((line = reader.readLine()) != null) {
                 html.append(line);
             }
-
         }catch (Exception e){
             e.printStackTrace();
         }finally {
-         {
-               try {
-                   if(reader != null)  reader.close();
-               } catch (IOException e) {
-                   e.printStackTrace();
-               }
-           }
+            {
+                try {
+                    if(reader != null)  reader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
+            return html.toString()  ;
+    }
 
-//        System.out.println(html);
-
+    public static String parseResource(String html){
         //通过正则表达式+字符串解析 从html中，解析出需要的数据：将网站的简介（description）进行提取
         /*
             .: 除了换行符以外的任何字符
             + ： 匹配之前的一次，或多次
             ? ：0次或1次
 
-
-
             html :    aaa<div ccc >xxxxx</div>bbbb
              (.+):贪婪模式  :  <.+>  :  <div ccc >xxxxx</div>
              (.+?) :惰性模式 :   <.+?> :  <div ccc >
-
-
          */
-        Pattern pattern = Pattern.compile( "meta name=\"description\" content=\"(.+?)\"" ) ;
+        Pattern pattern = Pattern.compile( "meta data-n-head=\"ssr\" data-hid=\"description\" name=\"description\" itemprop=\"description\" content=\"(.+?)\"" ) ;
         //从html中，只提取 符合patter约束的字符串
         Matcher matcher = pattern.matcher(  html) ;
 
@@ -67,7 +64,17 @@ public static void main(String[] args) {
                  group(2)
              */
             result =   matcher.group(0);  //提取
+            result = result.substring(result.indexOf("content=") +  "content=".length());
         }
+        return result ;
+    }
+
+
+    public static void main(String[] args) {
+
+        String html = getResource();
+
+        String result = parseResource(html) ;
 
         System.out.println(result==null? "爬取失败":result);