diff --git a/02nio/nio02/pom.xml b/02nio/nio02/pom.xml
index 6cbbeffd..91d78573 100644
--- a/02nio/nio02/pom.xml
+++ b/02nio/nio02/pom.xml
@@ -47,12 +47,32 @@
             <artifactId>slf4j-log4j12</artifactId>
             <version>1.7.25</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.11.0</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpasyncclient</artifactId>
             <version>4.1.4</version>
         </dependency>
-    
+        <dependency>
+            <groupId>com.netflix.ribbon</groupId>
+            <artifactId>ribbon</artifactId>
+            <version>2.7.17</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-ribbon -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-ribbon</artifactId>
+            <version>1.3.0.RELEASE</version>
+        </dependency>
+
+
         <!--
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/02nio/nio02/src/main/java/io/github/kimmking/gateway/filter/HttpRequestFilter.java b/02nio/nio02/src/main/java/io/github/kimmking/gateway/filter/HttpRequestFilter.java
index 31253b40..61c1e597 100644
--- a/02nio/nio02/src/main/java/io/github/kimmking/gateway/filter/HttpRequestFilter.java
+++ b/02nio/nio02/src/main/java/io/github/kimmking/gateway/filter/HttpRequestFilter.java
@@ -6,5 +6,4 @@
 public interface HttpRequestFilter {
     
     void filter(FullHttpRequest fullRequest, ChannelHandlerContext ctx);
-    
 }
diff --git a/02nio/nio02/src/main/java/io/github/kimmking/gateway/filter/impl/HttpRequestHeadFilterImpl.java b/02nio/nio02/src/main/java/io/github/kimmking/gateway/filter/impl/HttpRequestHeadFilterImpl.java
new file mode 100644
index 00000000..fae1eb0a
--- /dev/null
+++ b/02nio/nio02/src/main/java/io/github/kimmking/gateway/filter/impl/HttpRequestHeadFilterImpl.java
@@ -0,0 +1,20 @@
+package io.github.kimmking.gateway.filter.impl;
+
+import io.github.kimmking.gateway.filter.HttpRequestFilter;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+
+/**
+ * @author liu_penghui
+ * @date 2020/11/3.
+ */
+public class HttpRequestHeadFilterImpl implements HttpRequestFilter {
+
+    @Override
+    public void filter(FullHttpRequest fullRequest, ChannelHandlerContext ctx) {
+        fullRequest.headers().set("nio", "liupenghui");
+        fullRequest.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.CLOSE);
+    }
+}
diff --git a/02nio/nio02/src/main/java/io/github/kimmking/gateway/inbound/HttpInboundHandler.java b/02nio/nio02/src/main/java/io/github/kimmking/gateway/inbound/HttpInboundHandler.java
index 22fb2525..46a73f68 100644
--- a/02nio/nio02/src/main/java/io/github/kimmking/gateway/inbound/HttpInboundHandler.java
+++ b/02nio/nio02/src/main/java/io/github/kimmking/gateway/inbound/HttpInboundHandler.java
@@ -1,6 +1,10 @@
 package io.github.kimmking.gateway.inbound;
 
+import io.github.kimmking.gateway.filter.HttpRequestFilter;
+import io.github.kimmking.gateway.filter.impl.HttpRequestHeadFilterImpl;
 import io.github.kimmking.gateway.outbound.httpclient4.HttpOutboundHandler;
+import io.github.kimmking.gateway.outbound.netty4.NettyHttpClient;
+import io.github.kimmking.gateway.outbound.okhttp.OkhttpOutboundHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -13,10 +17,18 @@ public class HttpInboundHandler extends ChannelInboundHandlerAdapter {
     private static Logger logger = LoggerFactory.getLogger(HttpInboundHandler.class);
     private final String proxyServer;
     private HttpOutboundHandler handler;
+
+    private NettyHttpClient nettyHandler;
+
+    private OkhttpOutboundHandler okhttpOutboundHandler;
+
+    private HttpRequestFilter filter;
     
     public HttpInboundHandler(String proxyServer) {
         this.proxyServer = proxyServer;
         handler = new HttpOutboundHandler(this.proxyServer);
+        nettyHandler = new NettyHttpClient("127.0.0.1", 8088);
+        filter = new HttpRequestHeadFilterImpl();
     }
     
     @Override
@@ -34,8 +46,10 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
 //            if (uri.contains("/test")) {
 //                handlerTest(fullRequest, ctx);
 //            }
-    
-            handler.handle(fullRequest, ctx);
+
+            //handler.handle(fullRequest, ctx);
+            filter.filter(fullRequest, ctx);
+            nettyHandler.handle(fullRequest, ctx, proxyServer);
     
         } catch(Exception e) {
             e.printStackTrace();
@@ -44,6 +58,8 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
         }
     }
 
+
+
 //    private void handlerTest(FullHttpRequest fullRequest, ChannelHandlerContext ctx) {
 //        FullHttpResponse response = null;
 //        try {
diff --git a/02nio/nio02/src/main/java/io/github/kimmking/gateway/outbound/netty4/NettyHttpClient.java b/02nio/nio02/src/main/java/io/github/kimmking/gateway/outbound/netty4/NettyHttpClient.java
index 79aeb148..b2ad6119 100644
--- a/02nio/nio02/src/main/java/io/github/kimmking/gateway/outbound/netty4/NettyHttpClient.java
+++ b/02nio/nio02/src/main/java/io/github/kimmking/gateway/outbound/netty4/NettyHttpClient.java
@@ -1,51 +1,53 @@
-//package io.github.kimmking.gateway.outbound;
-//
-//import io.netty.bootstrap.Bootstrap;
-//import io.netty.channel.ChannelFuture;
-//import io.netty.channel.ChannelInitializer;
-//import io.netty.channel.ChannelOption;
-//import io.netty.channel.EventLoopGroup;
-//import io.netty.channel.nio.NioEventLoopGroup;
-//import io.netty.channel.socket.SocketChannel;
-//import io.netty.channel.socket.nio.NioSocketChannel;
-//import io.netty.handler.codec.http.HttpRequestEncoder;
-//import io.netty.handler.codec.http.HttpResponseDecoder;
-//
-//public class NettyHttpClient {
-//    public void connect(String host, int port) throws Exception {
-//        EventLoopGroup workerGroup = new NioEventLoopGroup();
-//
-//        try {
-//            Bootstrap b = new Bootstrap();
-//            b.group(workerGroup);
-//            b.channel(NioSocketChannel.class);
-//            b.option(ChannelOption.SO_KEEPALIVE, true);
-//            b.handler(new ChannelInitializer<SocketChannel>() {
-//                @Override
-//                public void initChannel(SocketChannel ch) throws Exception {
-//                    // 客户端接收到的是httpResponse响应，所以要使用HttpResponseDecoder进行解码
-//                    ch.pipeline().addLast(new HttpResponseDecoder());
-//                     客户端发送的是httprequest，所以要使用HttpRequestEncoder进行编码
-//                    ch.pipeline().addLast(new HttpRequestEncoder());
-//                    ch.pipeline().addLast(new HttpClientOutboundHandler());
-//                }
-//            });
-//
-//            // Start the client.
-//            ChannelFuture f = b.connect(host, port).sync();
-//
-//           
-//            f.channel().write(request);
-//            f.channel().flush();
-//            f.channel().closeFuture().sync();
-//        } finally {
-//            workerGroup.shutdownGracefully();
-//        }
-//
-//    }
-//
-//    public static void main(String[] args) throws Exception {
-//        NettyHttpClient client = new NettyHttpClient();
-//        client.connect("127.0.0.1", 8844);
-//    }
-//}
\ No newline at end of file
+package io.github.kimmking.gateway.outbound.netty4;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.http.*;
+
+public class NettyHttpClient {
+
+    private String host;
+
+    private int port;
+
+    public NettyHttpClient(String host, int port) {
+        this.host = host;
+        this.port = port;
+    }
+
+    public void handle(final FullHttpRequest fullRequest, final ChannelHandlerContext ctx, String proxyServer) throws Exception {
+        EventLoopGroup workerGroup = new NioEventLoopGroup(16);
+        try {
+            Bootstrap b = new Bootstrap();
+            b.group(workerGroup);
+            //b.remoteAddress(host, port);
+            b.channel(NioSocketChannel.class);
+            b.option(ChannelOption.SO_KEEPALIVE, true);
+            b.handler(new ChannelInitializer<SocketChannel>() {
+                @Override
+                public void initChannel(SocketChannel ch) throws Exception {
+                    //包含编码器和解码器
+                    ch.pipeline().addLast(new HttpClientCodec());
+                    //聚合
+                    ch.pipeline().addLast(new HttpObjectAggregator(512 * 1024));
+                    //解压
+                    ch.pipeline().addLast(new HttpContentDecompressor());
+                    // 客户端接收到的是httpResponse响应，所以要使用HttpResponseDecoder进行解码
+                    // 客户端接收到的是httpResponse响应，所以要使用HttpResponseDecoder进行解码
+                    // ch.pipeline().addLast(new HttpResponseDecoder());
+                    // 客户端发送的是httprequest，所以要使用HttpRequestEncoder进行编码
+                    // ch.pipeline().addLast(new HttpRequestEncoder());
+                    ch.pipeline().addLast(new NettyHttpClientOutboundHandler(ctx, fullRequest, proxyServer));
+                }
+            });
+            // Start the client.
+            ChannelFuture f = b.connect(host, port).sync();
+            f.channel().closeFuture().sync();
+        } finally {
+            workerGroup.shutdownGracefully();
+        }
+    }
+}
\ No newline at end of file
diff --git a/02nio/nio02/src/main/java/io/github/kimmking/gateway/outbound/netty4/NettyHttpClientOutboundHandler.java b/02nio/nio02/src/main/java/io/github/kimmking/gateway/outbound/netty4/NettyHttpClientOutboundHandler.java
index 6730cd5a..69586ebf 100644
--- a/02nio/nio02/src/main/java/io/github/kimmking/gateway/outbound/netty4/NettyHttpClientOutboundHandler.java
+++ b/02nio/nio02/src/main/java/io/github/kimmking/gateway/outbound/netty4/NettyHttpClientOutboundHandler.java
@@ -1,22 +1,90 @@
 package io.github.kimmking.gateway.outbound.netty4;
 
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.*;
+import io.netty.handler.codec.http.*;
+import io.netty.util.CharsetUtil;
+import org.apache.http.util.EntityUtils;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+
+import static io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_0;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+
+public class NettyHttpClientOutboundHandler extends ChannelInboundHandlerAdapter {
+
+    private ChannelHandlerContext ctx1;
+
+    private FullHttpRequest fullRequest;
+
+    private String backUrl;
+
+    public NettyHttpClientOutboundHandler(ChannelHandlerContext ctx1, FullHttpRequest fullRequest, String url) {
+        this.ctx1 = ctx1;
+        this.fullRequest = fullRequest;
+        this.backUrl = url.endsWith("/") ? url.substring(0, url.length() - 1) : url;
+    }
+
+    /**
+     * 读取数据
+     * @param ctx
+     * @param msg
+     * @throws Exception
+     */
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        FullHttpResponse response = null;
+        DefaultFullHttpResponse defaultFullHttpResponse = null;
+        try {
+            if (msg instanceof FullHttpResponse) {
+                response = (FullHttpResponse) msg;
+                ByteBuf buf = response.content();
+                String result = buf.toString(CharsetUtil.UTF_8);
+                defaultFullHttpResponse = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, response.status(), Unpooled.wrappedBuffer(result.getBytes("UTF-8")));
+                defaultFullHttpResponse.headers().add(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE);
+                defaultFullHttpResponse.headers().add(HttpHeaderNames.CONTENT_LENGTH, buf.readableBytes());
+            }
+            if (fullRequest != null) {
+                if (!HttpUtil.isKeepAlive(fullRequest)) {
+                    ctx1.write(defaultFullHttpResponse).addListener(ChannelFutureListener.CLOSE);
+                } else {
+                    ctx1.write(defaultFullHttpResponse);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            ctx1.flush();
+
+        }
+    }
 
-public class NettyHttpClientOutboundHandler  extends ChannelInboundHandlerAdapter {
-    
     @Override
-    public void channelActive(ChannelHandlerContext ctx)
-            throws Exception {
-        
-        
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        try {
+            URI uri = new URI(backUrl + fullRequest.uri());
+            // 获取Netty内置的请求头对象
+            HttpHeaders header = fullRequest.headers();
+            // 将包含的请求信息赋值到list中
+            List<Map.Entry<String, String>> list = header.entries();
+            DefaultFullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, HttpMethod.GET, uri.toASCIIString());
+            for (Map.Entry<String, String> map : list) {
+                request.headers().add(map.getKey(), map.getValue());
+            }
+            ctx.writeAndFlush(request);
+        } catch (Exception e) {
+            e.printStackTrace();
+            ctx.flush();
+        }
     }
-    
+
     @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg)
-            throws Exception {
-        
-        
-        
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        ctx.flush();
+        super.exceptionCaught(ctx, cause);
     }
 }
\ No newline at end of file
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/sync/Counter.java b/03concurrency/0301/src/main/java/java0/conc0301/sync/Counter.java
index e60845a6..18d0ca21 100644
--- a/03concurrency/0301/src/main/java/java0/conc0301/sync/Counter.java
+++ b/03concurrency/0301/src/main/java/java0/conc0301/sync/Counter.java
@@ -1,6 +1,13 @@
 package java0.conc0301.sync;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 public class Counter {
+<<<<<<< HEAD
+    private AtomicInteger sum = new AtomicInteger(0);
+    public void incr() {
+        sum.addAndGet(1);
+=======
     
     public final static int A=10;
     
@@ -9,9 +16,10 @@ public class Counter {
     private volatile int sum = 0;
     public synchronized void incr() {
         sum=sum+1;
+>>>>>>> d360a518ec3ddef629a5c7b23fb2490a72a6c2bb
     }
     public int getSum() {
-        return sum;
+        return sum.intValue();
     }
     
     public static void main(String[] args) throws InterruptedException {
diff --git a/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/client/Rpcfx.java b/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/client/Rpcfx.java
index 74adbcc6..6e380d9b 100644
--- a/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/client/Rpcfx.java
+++ b/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/client/Rpcfx.java
@@ -29,14 +29,10 @@ public static <T, filters> T createFromRegistry(final Class<T> serviceClass, fin
         // curator Provider list from zk
         List<String> invokers = new ArrayList<>();
         // 1. 简单：从zk拿到服务提供的列表
-        // 2. 挑战：监听zk的临时节点，根据事件更新这个list（注意，需要做个全局map保持每个服务的提供者List）
-
+        // 2. 挑战：监听zk 的临时节点，根据事件更新这个list（注意，需要做个全局map保持每个服务的提供者List）
         List<String> urls = router.route(invokers);
-
         String url = loadBalance.select(urls); // router, loadbalance
-
         return (T) create(serviceClass, url, filter);
-
     }
 
     public static <T> T create(final Class<T> serviceClass, final String url, Filter... filters) {