diff --git a/src/Http/WebSocketClient.cpp b/src/Http/WebSocketClient.cpp
new file mode 100644
index 00000000..1ec0f7a5
--- /dev/null
+++ b/src/Http/WebSocketClient.cpp
@@ -0,0 +1,288 @@
+#include "WebSocketClient.h"
+
+
+
+int mediakit::WebSocketClient::send(const string& buf)
+{
+    if (_sock)
+    {
+        if (_WSClientStatus == WORKING)
+        {
+            _session->send(buf);
+            return 0;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+}
+
+void mediakit::WebSocketClient::clear()
+{
+    _method.clear();
+    _path.clear();
+    _parser.Clear();
+    _recvedBodySize = 0;
+    _totalBodySize = 0;
+    _aliveTicker.resetTime();
+    _chunkedSplitter.reset();
+    HttpRequestSplitter::reset();
+}
+
+const std::string & mediakit::WebSocketClient::responseStatus() const
+{
+    return _parser.Url();
+}
+
+const mediakit::WebSocketClient::HttpHeader & mediakit::WebSocketClient::responseHeader() const
+{
+    return _parser.getValues();
+}
+
+const mediakit::Parser& mediakit::WebSocketClient::response() const
+{
+    return _parser;
+}
+
+const std::string & mediakit::WebSocketClient::getUrl() const
+{
+    return _url;
+}
+
+int64_t mediakit::WebSocketClient::onResponseHeader(const string &status, const HttpHeader &headers)
+{
+    DebugL << status;
+    //无Content-Length字段时默认后面全是content
+    return -1;
+}
+
+void mediakit::WebSocketClient::onResponseBody(const char *buf, int64_t size, int64_t recvedSize, int64_t totalSize)
+{
+    DebugL << size << " " << recvedSize << " " << totalSize;
+}
+
+void mediakit::WebSocketClient::onResponseCompleted()
+{
+    DebugL;
+}
+
+int64_t mediakit::WebSocketClient::onRecvHeader(const char *data, uint64_t len)
+{
+    _parser.Parse(data);
+    if (_parser.Url() == "101")
+    {
+        switch (_WSClientStatus)
+        {
+        case HANDSHAKING:
+        {
+            StrCaseMap& valueMap = _parser.getValues();
+            auto key = valueMap.find("Sec-WebSocket-Accept");
+            if (key != valueMap.end() && key->second.length() > 0) {
+                onConnect(SockException());
+            }
+            break;
+        }
+        }
+        return -1;
+    }
+    else
+    {
+        shutdown(SockException(Err_shutdown, _parser.Url().c_str()));
+        return 0;
+    }
+    return -1;
+}
+
+void mediakit::WebSocketClient::onRecvContent(const char *data, uint64_t len)
+{
+    if (_chunkedSplitter) {
+        _chunkedSplitter->input(data, len);
+        return;
+    }
+    auto recvedBodySize = _recvedBodySize + len;
+    if (_totalBodySize < 0) {
+        //不限长度的content,最大支持INT64_MAX个字节
+        onResponseBody(data, len, recvedBodySize, INT64_MAX);
+        _recvedBodySize = recvedBodySize;
+        return;
+    }
+
+    //固定长度的content
+    if (recvedBodySize < _totalBodySize) {
+        //content还未接收完毕
+        onResponseBody(data, len, recvedBodySize, _totalBodySize);
+        _recvedBodySize = recvedBodySize;
+        return;
+    }
+
+    //content接收完毕
+    onResponseBody(data, _totalBodySize - _recvedBodySize, _totalBodySize, _totalBodySize);
+    bool biggerThanExpected = recvedBodySize > _totalBodySize;
+    onResponseCompleted_l();
+    if (biggerThanExpected) {
+        //声明的content数据比真实的小，那么我们只截取前面部分的并断开链接
+        shutdown(SockException(Err_shutdown, "http response content size bigger than expected"));
+    }
+}
+
+void mediakit::WebSocketClient::onConnect(const SockException &ex)
+{
+    _aliveTicker.resetTime();
+    if (ex) {
+        onDisconnect(ex);
+        return;
+    }
+
+    //先假设http客户端只会接收一点点数据（只接受http头，节省内存）
+    _sock->setReadBuffer(std::make_shared<BufferRaw>(1 * 1024));
+
+    _totalBodySize = 0;
+    _recvedBodySize = 0;
+    HttpRequestSplitter::reset();
+    _chunkedSplitter.reset();
+
+    if (_WSClientStatus == WSCONNECT)
+    {
+        //Websocket握手
+        string random = get_random(16);
+        auto Sec_WebSocket_Key = encodeBase64(SHA1::encode_bin(random));
+        _key = Sec_WebSocket_Key;
+        string p = generate_websocket_client_handshake(_ip.c_str(), _port, _url.c_str(), _key.c_str());
+        TcpClient::send(p);
+        _WSClientStatus = HANDSHAKING;
+    }
+    else if (_WSClientStatus == HANDSHAKING)
+    {
+        _WSClientStatus = WORKING;
+    }
+
+    onFlush();
+}
+
+void mediakit::WebSocketClient::onRecv(const Buffer::Ptr &pBuf)
+{
+    _aliveTicker.resetTime();
+    if (_WSClientStatus == HANDSHAKING || _WSClientStatus == WSCONNECT)
+        HttpRequestSplitter::input(pBuf->data(), pBuf->size());
+    else if (_WSClientStatus == WORKING)
+    {
+        WebSocketSplitter::decode((uint8_t *)pBuf->data(), pBuf->size());
+    }
+}
+
+void mediakit::WebSocketClient::onErr(const SockException &ex)
+{
+    _session->onError(ex);
+    onDisconnect(ex);
+}
+
+void mediakit::WebSocketClient::onManager()
+{
+    if (_WSClientStatus != WORKING)
+    {
+        if (_fTimeOutSec > 0 && _aliveTicker.elapsedTime() > _fTimeOutSec * 1000) {
+            //超时
+            shutdown(SockException(Err_timeout, "ws server respone timeout"));
+        }
+    }
+    else
+        _session->onManager();
+}
+
+std::string mediakit::WebSocketClient::generate_websocket_client_handshake(const char* ip, uint16_t port, const char * path, const char * key)
+{
+    /**
+* @brief  业务数据被分片的单片最大大小， 等于 65535 - 14 - 1
+*/
+#define DATA_FRAME_MAX_LEN  65520
+#define HANDSHAKE_SIZE      1024
+    char buf[HANDSHAKE_SIZE] = { 0 };
+
+    snprintf(buf, HANDSHAKE_SIZE,
+        "GET %s HTTP/1.1\r\n"
+        "Host: %s:%d\r\n"
+        "Upgrade: websocket\r\n"
+        "Connection: Upgrade\r\n"
+        "Sec-WebSocket-Key: %s\r\n"
+        "Sec-WebSocket-Version: 13\r\n"
+        "\r\n",
+        path, ip, port, key);
+    string temBuf(buf);
+    return temBuf;
+}
+
+std::string mediakit::WebSocketClient::get_random(size_t n)
+{
+    random_device rd;
+    _StrPrinter printer;
+    for (int i = 0; i < n; i++)
+    {
+        unsigned int rnd = rd();
+        printer << rnd % 9;
+    }
+
+    return string(printer);
+}
+
+void mediakit::WebSocketClient::onWebSocketDecodeHeader(const WebSocketHeader &packet)
+{
+    //新包，原来的包残余数据清空掉
+    _remian_data.clear();
+
+    if (_firstPacket) {
+        //这是个WebSocket会话而不是普通的Http会话
+        _firstPacket = false;
+        //此处截取数据并进行websocket协议打包
+    }
+}
+
+void mediakit::WebSocketClient::onWebSocketDecodePlayload(const WebSocketHeader &packet, const uint8_t *ptr, uint64_t len, uint64_t recved)
+{
+    _remian_data.append((char *)ptr, len);
+}
+
+void mediakit::WebSocketClient::onWebSocketDecodeComplete(const WebSocketHeader &header_in)
+{
+    WebSocketHeader& header = const_cast<WebSocketHeader&>(header_in);
+    auto  flag = header._mask_flag;
+    header._mask_flag = false;
+
+    switch (header._opcode) {
+    case WebSocketHeader::CLOSE: {
+        shutdown(SockException(Err_timeout, "session timeouted"));
+    }
+                                 break;
+    case WebSocketHeader::PING: {
+        const_cast<WebSocketHeader&>(header)._opcode = WebSocketHeader::PONG;
+        WebSocketSplitter::encode(header, (uint8_t *)_remian_data.data(), _remian_data.size());
+    }
+                                break;
+    case WebSocketHeader::CONTINUATION: {
+
+    }
+                                        break;
+    case WebSocketHeader::TEXT:
+    case WebSocketHeader::BINARY: {
+        BufferString::Ptr buffer = std::make_shared<BufferString>(_remian_data);
+        _session->onRecv(buffer);
+    }
+                                  break;
+    default:
+        break;
+    }
+    _remian_data.clear();
+    header._mask_flag = flag;
+}
+
+void mediakit::WebSocketClient::onWebSocketEncodeData(const uint8_t *ptr, uint64_t len)
+{
+    TcpClient::send(string((char*)ptr, len));
+}
+
+void mediakit::WebSocketClient::onResponseCompleted_l()
+{
+    _totalBodySize = 0;
+    _recvedBodySize = 0;
+    onResponseCompleted();
+}
diff --git a/src/Http/WebSocketClient.h b/src/Http/WebSocketClient.h
new file mode 100644
index 00000000..51a00874
--- /dev/null
+++ b/src/Http/WebSocketClient.h
@@ -0,0 +1,205 @@
+锘�#ifndef Http_WebSocketClient_h
+#define Http_WebSocketClient_h
+
+#include <stdio.h>
+#include <string.h>
+#include <functional>
+#include <memory>
+#include "Util/util.h"
+#include "Util/mini.h"
+#include "Network/TcpClient.h"
+#include "Common/Parser.h"
+#include "HttpRequestSplitter.h"
+#include "HttpCookie.h"
+#include "HttpChunkedSplitter.h"
+#include "strCoding.h"
+#include "Http/HttpClient.h"
+#include "Http/WebSocketSplitter.h"
+#include "Http/WebSocketSession.h"
+#include <cstdlib>
+#include <random>
+#include "Common/config.h"
+#include "Util/SHA1.h"
+#include "Util/base64.h"
+
+
+
+using namespace std;
+using namespace toolkit;
+
+namespace mediakit {
+
+/**
+* @brief  瀹㈡埛绔殑鐘舵��
+*/
+typedef enum WSClientStatus {
+    WSCONNECT,
+    HANDSHAKING, ///鎻℃墜涓�
+    WORKING,     ///宸ヤ綔涓�
+} WSClientStatus;
+
+class WebSocketClient : public TcpClient , public HttpRequestSplitter, public WebSocketSplitter
+{
+public:
+    typedef StrCaseMap HttpHeader;
+    typedef std::shared_ptr<WebSocketClient> Ptr;
+    WebSocketClient() :_WSClientStatus(WSCONNECT) {}
+    virtual ~WebSocketClient() {}
+
+    template <typename SessionType>
+    void startConnect(const string &strUrl, uint16_t iPort, float fTimeOutSec = 3)
+    {
+        _ip = strUrl;
+        _port = iPort;
+        TcpClient::startConnect(strUrl, iPort, fTimeOutSec);
+
+        typedef function<int(const Buffer::Ptr &buf)> onBeforeSendCB;
+        /**
+         * 璇ョ被瀹炵幇浜員cpSession娲剧敓绫诲彂閫佹暟鎹殑鎴彇
+         * 鐩殑鏄彂閫佷笟鍔℃暟鎹墠杩涜websocket鍗忚鐨勬墦鍖�
+         */
+        class SessionImp : public SessionType {
+        public:
+            SessionImp(const Socket::Ptr &pSock) :SessionType(pSock) {}
+
+            ~SessionImp() {}
+
+            /**
+             * 璁剧疆鍙戦�佹暟鎹埅鍙栧洖璋冨嚱鏁�
+             * @param cb 鎴彇鍥炶皟鍑芥暟
+             */
+            void setOnBeforeSendCB(const onBeforeSendCB &cb) {
+                _beforeSendCB = cb;
+            }
+        protected:
+            /**
+             * 閲嶈浇send鍑芥暟鎴彇鏁版嵁
+             * @param buf 闇�瑕佹埅鍙栫殑鏁版嵁
+             * @return 鏁版嵁瀛楄妭鏁�
+             */
+            int send(const Buffer::Ptr &buf) override {
+                if (_beforeSendCB) {
+                    return _beforeSendCB(buf);
+                }
+                return SessionType::send(buf);
+            }
+        private:
+            onBeforeSendCB _beforeSendCB;
+        };
+        std::shared_ptr<SessionImp> temSession = std::make_shared<SessionImp>(_sock);
+        //姝ゅ鎴彇鏁版嵁骞惰繘琛寃ebsocket鍗忚鎵撳寘
+        weak_ptr<WebSocketClient> weakSelf = dynamic_pointer_cast<WebSocketClient>(WebSocketClient::shared_from_this());
+
+        _sock->setOnErr([weakSelf](const SockException &ex) {
+            auto strongSelf = weakSelf.lock();
+            if (!strongSelf) {
+                return;
+            }
+            strongSelf->onErr(ex);
+        });
+
+        temSession->setOnBeforeSendCB([weakSelf](const Buffer::Ptr &buf) {
+            auto strongSelf = weakSelf.lock();
+            if (strongSelf) {
+                WebSocketHeader header;
+                header._fin = true;
+                header._reserved = 0;
+                header._opcode = WebSocketHeader::BINARY;
+                header._mask_flag = false;
+                strongSelf->WebSocketSplitter::encode(header, (uint8_t *)buf->data(), buf->size());
+            }
+            return buf->size();
+        });
+        _session = temSession;
+        _session->onManager();
+    }
+
+    virtual int send(const string& buf);
+
+    virtual void clear();
+
+    const string &responseStatus() const;
+
+    const HttpHeader &responseHeader() const;
+
+    const Parser& response() const;
+
+    const string &getUrl() const;
+
+protected:
+    virtual int64_t onResponseHeader(const string &status,const HttpHeader &headers);;
+
+    virtual void onResponseBody(const char *buf,int64_t size,int64_t recvedSize,int64_t totalSize);;
+
+    /**
+     * 鎺ユ敹http鍥炲瀹屾瘯,
+     */
+    virtual void onResponseCompleted();
+
+    /**
+     * http閾炬帴鏂紑鍥炶皟
+     * @param ex 鏂紑鍘熷洜
+     */
+    virtual void onDisconnect(const SockException &ex){}
+
+    //HttpRequestSplitter override
+    int64_t onRecvHeader(const char *data, uint64_t len) override;
+
+    void onRecvContent(const char *data, uint64_t len) override;
+
+protected:
+    virtual void onConnect(const SockException &ex) override;
+
+    virtual void onRecv(const Buffer::Ptr &pBuf) override;
+
+    virtual void onErr(const SockException &ex) override;
+
+    virtual void onFlush() override {};
+
+    virtual void onManager() override;
+
+protected:
+    string generate_websocket_client_handshake(const char* ip, uint16_t port, const char * path, const char * key);
+
+    string get_random(size_t n);
+
+    void onWebSocketDecodeHeader(const WebSocketHeader &packet) override;
+
+    void onWebSocketDecodePlayload(const WebSocketHeader &packet, const uint8_t *ptr, uint64_t len, uint64_t recved) override;
+
+    void onWebSocketDecodeComplete(const WebSocketHeader &header_in) override;
+
+    virtual void onWebSocketEncodeData(const uint8_t *ptr, uint64_t len);
+
+private:
+    void onResponseCompleted_l();
+
+protected:
+    bool _isHttps;
+private:
+    string _ip;
+    int _port;
+    string _url;
+    string _method;
+    string _path;
+    //recv
+    int64_t _recvedBodySize;
+    int64_t _totalBodySize;
+    Parser _parser;
+    string _lastHost;
+    Ticker _aliveTicker;
+    float _fTimeOutSec = 0;
+    std::shared_ptr<HttpChunkedSplitter> _chunkedSplitter;
+
+    std::string _key;    ///瀹㈡埛绔殑key
+    WSClientStatus _WSClientStatus;  ///瀹㈡埛绔姸鎬�
+    bool _firstPacket = true;
+    string _remian_data;
+
+    std::shared_ptr<TcpSession> _session;
+
+};
+
+} /* namespace mediakit */
+
+#endif /* Http_HttpClient_h */
diff --git a/src/Http/WebSocketSession.h b/src/Http/WebSocketSession.h
index 6862e9bc..d8f2504e 100644
--- a/src/Http/WebSocketSession.h
+++ b/src/Http/WebSocketSession.h
@@ -76,23 +76,25 @@ protected:
 
             auto strongServer = _weakServer.lock();
             if(strongServer){
+
+                //姝ゅ鎴彇鏁版嵁骞惰繘琛寃ebsocket鍗忚鎵撳寘
+                weak_ptr<WebSocketSession> weakSelf = dynamic_pointer_cast<WebSocketSession>(HttpSessionType::shared_from_this());
+                _session->setOnBeforeSendCB([weakSelf](const Buffer::Ptr &buf) {
+                    auto strongSelf = weakSelf.lock();
+                    if (strongSelf) {
+                        WebSocketHeader header;
+                        header._fin = true;
+                        header._reserved = 0;
+                        header._opcode = WebSocketHeader::TEXT;
+                        header._mask_flag = false;
+                        strongSelf->WebSocketSplitter::encode(header, (uint8_t *)buf->data(), buf->size());
+                    }
+                    return buf->size();
+                });
+
                 _session->attachServer(*strongServer);
             }
 
-            //姝ゅ鎴彇鏁版嵁骞惰繘琛寃ebsocket鍗忚鎵撳寘
-            weak_ptr<WebSocketSession> weakSelf = dynamic_pointer_cast<WebSocketSession>(HttpSessionType::shared_from_this());
-            _session->setOnBeforeSendCB([weakSelf](const Buffer::Ptr &buf){
-                auto strongSelf = weakSelf.lock();
-                if(strongSelf){
-                    WebSocketHeader header;
-                    header._fin = true;
-                    header._reserved = 0;
-                    header._opcode = WebSocketHeader::TEXT;
-                    header._mask_flag = false;
-                    strongSelf->WebSocketSplitter::encode(header,buf);
-                }
-                return buf->size();
-            });
         }
     }