mdlink_tencent added

dataserver/server/etc/market.csv

@@ -5,7 +5,10 @@ market,nationcode,timezone,marketcode,auctbeg1,auctend1,auctbeg2,auctend2,auctbe
 4,1,8,CZC,900,1015,1030,1130,1330,1500,0,0
 5,1,8,DCE,900,1015,1030,1130,1330,1500,0,0
 6,1,8,SHF,900,1015,1030,1130,1330,1500,0,0
-7,1,8,HK,1000,1230,1430,1600,0,0,0,0
+7,1,8,HK,930,1200,1300,1600,0,0,0,0
 8,1,8,JZ,930,1130,1300,1500,0,0,0,0
 9,1,8,CSI,930,1130,1300,1500,0,0,0,0
 10,1,8,SGE,900,1130,1330,1530,0,0,0,0
+11,1,8,IB,830,1700,0,0,0,0,0,0
+12,1,8,HKH,930,1200,1300,1600,0,0,0,0
+13,1,8,HKS,930,1200,1300,1600,0,0,0,0

mdlink/CMakeLists.txt

@@ -78,7 +78,10 @@ add_subdirectory(src/mdlink/mdlink_merge)
 add_subdirectory(src/mdlink/mdlink_ctp)
 add_subdirectory(src/mdlink/mdlink_tdf)
 add_subdirectory(src/mdlink/mdlink_sina)
+add_subdirectory(src/mdlink/mdlink_tencent)
 add_subdirectory(src/qms)
+#add_subdirectory(src/tkreader)
+add_subdirectory(src/client)
 add_subdirectory(src/protocol)
 
 # TODO: move to each module

mdlink/etc/jzs.json

@@ -20,7 +20,8 @@
             "sources": [
                 { "addr": "tcp://127.0.0.1:10001", "id": "future1" },
                 { "addr": "tcp://127.0.0.1:10002", "id": "stock1" },
-                { "addr": "tcp://127.0.0.1:10003", "id": "stock2" }
+                { "addr": "tcp://127.0.0.1:10003", "id": "stock2" },
+                { "addr": "tcp://127.0.0.1:10004", "id": "stock3" }
             ]
         },
 
@@ -75,6 +76,21 @@
                     "insttypes": "1;2;3;4;5;100;"
                 }
             ]
+        },
+
+        "stock3": {
+            "pub_addr": "tcp://0.0.0.0:10004",
+            "route": "TENCENT",
+            "source_id": 4,
+            "sources": [
+                {
+                    "id": "stock3",
+                    "route": "TENCENT",
+                    "addr": "http://qt.gtimg.cn/q=",
+                    "markets": "SZ;SH;",
+                    "insttypes": "1;2;3;4;5;100;"
+                }
+            ]
         }
     }
 }

mdlink/scripts/start.bat

@@ -2,4 +2,5 @@ start cmd /k "cd .. && bin\qms2.exe qms2"
 start cmd /k "cd .. && bin\mdlink2.exe mdlink2"
 ::start cmd /k "cd .. && bin\mdlink_tdf.exe stock1"
 start cmd /k "cd .. && bin\mdlink_sina.exe stock2"
+start cmd /k "cd .. && bin\mdlink_tencent.exe stock3"
 start cmd /k "cd .. && bin\mdlink_ctp.exe future1"

mdlink/src/config/SysConfig.cpp

@@ -162,7 +162,15 @@ namespace jzs
                             LOG(INFO) << "\taddr: " << source["addr"].asString() << endl;
                             LOG(INFO) << "\tinsttypes: " << source["insttypes"].asString() << endl;
                             LOG(INFO) << "\tmarkets: " << source["markets"].asString() << endl;
-                        }
+						}
+						else if (cfg.route == "TENCENT") {
+							svrcfg.addr = source["addr"].asString();
+							svrcfg.markets = source["markets"].asString();
+							svrcfg.insttypes = source["insttypes"].asString();
+							LOG(INFO) << "\taddr: " << source["addr"].asString() << endl;
+							LOG(INFO) << "\tinsttypes: " << source["insttypes"].asString() << endl;
+							LOG(INFO) << "\tmarkets: " << source["markets"].asString() << endl;
+						}
                         cfg.mdvec.push_back(svrcfg);
                     }
                     md = cfg;

mdlink/src/mdlink/mdlink_tencent/CMakeLists.txt

@@ -0,0 +1,96 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(jzs)
+set(CMAKE_INSTALL_PREFIX dist)
+add_definitions(
+    -DUSE_PBMSG
+    -DISLIB 
+)
+
+if (WIN32)
+    set(BIN_PATH    bin)
+    set(LIB_PATH    bin)
+    set(DATA_PATH   data)
+    set(ETC_PATH    etc)
+else()
+    set(BIN_PATH    bin)
+    set(LIB_PATH    lib)
+    set(DATA_PATH   data)
+    set(ETC_PATH    etc)
+endif()
+
+set(SRC
+    ../../../deps/zmq/zhelpers.h
+    ../../../deps/jsoncpp/jsoncpp.cpp
+    ../public/MapTables.h
+    ../public/MapTables.cpp
+    ../public/MdServer.cpp
+    ../public/MdServer.h    
+    TencentApi.cpp
+    TencentApi.h
+    TencentMdServer.cpp
+    TencentMdServer.h
+    MdLinkMain.cpp
+)
+
+include_directories(
+    ../../
+    ../../../deps 
+    ../../../deps/zmq    
+    ../../../deps/jsoncpp
+    ../../../deps/libcurl/include/curl
+)
+
+
+if (WIN32)
+link_directories(    
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../deps/libcurl/lib  
+)
+
+include_directories(
+    ../../../deps/windows/zlib-1.2.8
+)
+
+else()
+
+add_definitions(-std=c++11)
+
+
+endif()
+
+add_executable(mdlink_tencent ${SRC})
+
+if (WIN32) 
+target_link_libraries( mdlink_tencent
+    libcurl
+    base
+    msgbus
+    zmq   
+    protobuf
+    z
+    glog
+    ws2_32
+)
+
+else()
+
+target_link_libraries( mdlink_tencent 
+    libcurl.so
+    base
+    msgbus
+    zmq   
+    protobuf  
+    glog  
+    z 
+)
+
+endif()
+
+if (WIN32)
+  install (FILES
+    ../../../deps/libcurl/lib/libcurl.dll
+    DESTINATION ${LIB_PATH}
+ )
+endif()
+
+install (TARGETS mdlink_tencent  RUNTIME DESTINATION ${BIN_PATH})

mdlink/src/mdlink/mdlink_tencent/MdLinkMain.cpp

@@ -0,0 +1,86 @@
+#include <cstring>
+#include <fstream>
+#include <thread>
+#include <chrono>
+#include <memory>
+#include <iomanip>
+#include <set>
+#include "config/IniApi.h"
+#include "config/SysConfig.h"
+#include "base/StringUtil.h"
+#include "base/Logger.h"
+#include "base/Init.h"
+#include "base/TimeUtil.h"
+#include "protocol/cpp/md.pb.h"
+#include <unistd.h>
+#include <getopt.h>
+#include <json/json.h>
+#include <mutex>
+#include <unordered_map>
+#include <set>
+#include "TencentMdServer.h"
+#include "TencentApi.h"
+#include "protocol/cpp/md.pb.h"
+#include "base/Calendar.h"
+#include "../public/MapTables.h"
+
+
+using namespace std;
+using namespace jzs;
+using namespace jzs::msg;
+using namespace jzs::msg::md;
+using namespace jzs::msgbus;
+using namespace tencent_api;
+void test_tencent()
+{
+	string url_test = "http://qt.gtimg.cn/q=";
+    tencent_api::TencentApi api;
+	api.set_url(url_test);
+
+    vector<shared_ptr<tencent_api::MarketQuote>> quotes;
+
+    vector<string> codes;
+    codes.push_back("sz000001");
+    codes.push_back("sh000001");
+    codes.push_back("sh502028");
+    codes.push_back("sz399001");
+    api.get_quotes(codes, &quotes);
+
+	cout << "test tencent\n";
+    for (auto q : quotes) {
+        cout << q->code << "," << q->date << "," << q->time << "," << q->last << "," << q->volume << endl;
+    }
+    getchar();
+}
+
+int main(int argc, char* argv[])
+{
+	string mdid;
+    if (argc == 2) {
+        mdid = string(argv[1]);
+        init(argv[1]);
+    }
+    else {
+        init(argv[0]);
+        LOG(ERROR) << "Wrong number of arguments given!" << endl;
+        return -1;
+    }
+
+    MdlinkCfg mdcfg;
+    SysConfig::getMdlinkCfg(mdid, mdcfg);
+    TencentMdServer* svr = new TencentMdServer;
+    if (!svr->init(mdcfg)) {
+        return -1;
+    }
+
+    svr->StartMdlink();
+    while (true) {
+        this_thread::sleep_for(chrono::seconds(5));
+        auto next_time = chrono::system_clock::now() + chrono::seconds(5);
+        while (chrono::system_clock::now() < next_time)
+            this_thread::sleep_until(next_time);
+		svr->ShowStatus();
+    }
+    return 0;
+}
+