wr 6 years ago
parent
commit
320127ff8a

+ 27 - 0
kline/214341259320977.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA1OUKKbqdzMWGyEJtyW6owsTMTwqjI/BDn2n5COXqjZXtPQ+d
+Ov+sR5aGviKfKsEpyiCRqVN1mVcVX90DKj2OmGI9EWbOCSG1eaKtRkdyHbei+hPb
+JMU0gIcttZm/zZnB7rVXwXBT1DD5/fMwVMT73FlQ49WbLwIHglJMeh0Tt7h+l/XD
+WfcGLtEUAUi2rz7JjO1RaCitlnpdN+Go/2CtYD3J0ZW46Nc9otknqSWwvcZGPC80
+e+36v+0jQQAl9xiJqZFySOtwo/Qgv4B8sTszaL2NH1FJIxrOezpFVYGlBikpkZ42
+Lwy8OsoiIutIjFwgIeT8Cn4aDxdXD49eSBRBnQIDAQABAoIBAQDI30LzlI0HhOhj
+U6pbAPpiq2VKvvKnGi/z3f2Hk8f3x5qMnorv/AUFltWT2P7tTEyt1oUZixHOmQgl
+51bxKBu/VBHitWl53EBqgD+VrBvURkyUQN/oldmv29wZGPSMfaMqJBik/+NYts1p
++2eC1En/4pYcIpPFitii8hwOrBjKoqR1wcumStcw7z4+U1bI2R7rImFXyW15/bfq
+Et0HjqF7r86yMSqEywe+TqUXMu/xTzPce5OKO1h0gjOgFmH4zwXhXAnOi4reR+6V
+zXxF3TgjvxxpiOJVQxGzUOLUGpaxBipP4EiK+MWAr9sopZDZm20yOrv3UcWTE5wS
+kKgSyczRAoGBAPP333Jz2aolIMmxANdvEY+cY1OXdfSicJD3O0I8FVLvfukf7gLf
+/xzJL6qm0ow3GC6g103+6B1EANdX0DU4ecrFvvzM9k6hddnrEfluCT+K3PVW/f7i
+KJkXTzIHONxRCSfHhBxktXm2yZ3vRtp6JUZEkjXXLWAlE1f+sjqGzjOjAoGBAN9k
+3AkpMExGEpfsavU901cIy0CPMS95oW3lGF7ezUL7YUmkfZRkqaRyTTgHggcD6OiC
+/GxVtti7YuGz2yDjPx4TKLTdbHl0h6megyNIp1qu7tmwOawhbUDOiXZYvovzYwcd
+Ab1F7BT8gMYTNwdi7R1W49z+trtRdepoGTmImQm/AoGAVQkRxjfhJ2/3hLWAYJbj
+HRZafJlvUMyJxc2WxxhgKl818hXiBPiEWEk7pxSskJjngeEoCpSN3R2F2YlPFi3Q
+LcBNOJpMQ839YO6Rfko/SPmi2JTwxTWZBvtb7EkeJZTNRyNAxhDIPFtc3QK4xJAM
+i/h8qe2NcFSb8HDjOIkiOFcCgYB8U+vKBWxl5tHOT7uvRXtrgu9rvMXJAE6BlPEd
+S669Sp54l910SxnG9f5X4oXRVbG4Rb4qpQGgWZnMt4aLJS4plMwg7OLELcCa/CdL
+6dGKPLWd3eAbFndxjAEhJn7V8Nz6RoCDUHj1rRoWIveLWtlQbN1gTzpvwgR4Mvtm
+88kIjQKBgQDwOZoUYO6lOLM8mms4Bddn1cgE/6aDljrBJnnpUmBy08WB+FjU8Y7Y
+AkU28jFkmBlVkdQEewu1sLRgQq44yvfxcRu03BNWdjI1eRNiIG55+Wz0txAEkiR4
+Mt6PQITNHu4GWcMCDRETt2qAVn8LnGlrR/MbFGy50e1s2rzaiIDU7w==
+-----END RSA PRIVATE KEY-----

+ 63 - 0
kline/214341259320977.pem

@@ -0,0 +1,63 @@
+-----BEGIN CERTIFICATE-----
+MIIFfzCCBGegAwIBAgIQcU4T8WVoUGHBoM9yUVul4jANBgkqhkiG9w0BAQsFADCB
+lDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8w
+HQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMR0wGwYDVQQLExREb21haW4g
+VmFsaWRhdGVkIFNTTDEmMCQGA1UEAxMdU3ltYW50ZWMgQmFzaWMgRFYgU1NMIENB
+IC0gRzEwHhcNMTcxMTE2MDAwMDAwWhcNMTgxMTE2MjM1OTU5WjAXMRUwEwYDVQQD
+DAwqLnpoYW9iaS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDU
+5Qopup3MxYbIQm3JbqjCxMxPCqMj8EOfafkI5eqNle09D506/6xHloa+Ip8qwSnK
+IJGpU3WZVxVf3QMqPY6YYj0RZs4JIbV5oq1GR3Idt6L6E9skxTSAhy21mb/NmcHu
+tVfBcFPUMPn98zBUxPvcWVDj1ZsvAgeCUkx6HRO3uH6X9cNZ9wYu0RQBSLavPsmM
+7VFoKK2Wel034aj/YK1gPcnRlbjo1z2i2SepJbC9xkY8LzR77fq/7SNBACX3GImp
+kXJI63Cj9CC/gHyxOzNovY0fUUkjGs57OkVVgaUGKSmRnjYvDLw6yiIi60iMXCAh
+5PwKfhoPF1cPj15IFEGdAgMBAAGjggJHMIICQzAjBgNVHREEHDAaggwqLnpoYW9i
+aS5jb22CCnpoYW9iaS5jb20wCQYDVR0TBAIwADBhBgNVHSAEWjBYMFYGBmeBDAEC
+ATBMMCMGCCsGAQUFBwIBFhdodHRwczovL2Quc3ltY2IuY29tL2NwczAlBggrBgEF
+BQcCAjAZDBdodHRwczovL2Quc3ltY2IuY29tL3JwYTAfBgNVHSMEGDAWgBRcYZ6w
+dkGpaqpDC+HHbjApbrHNNjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMFcGCCsGAQUFBwEBBEswSTAfBggrBgEFBQcwAYYTaHR0
+cDovL2hjLnN5bWNkLmNvbTAmBggrBgEFBQcwAoYaaHR0cDovL2hjLnN5bWNiLmNv
+bS9oYy5jcnQwggEDBgorBgEEAdZ5AgQCBIH0BIHxAO8AdgDd6x0reg1PpiCLga2B
+aHB+Lo6dAdVciI09EcTNtuy+zAAAAV/DRWBGAAAEAwBHMEUCIQDlthLeW6SvomjY
+3w9fGN+LDycCn3+BQhY+HMOSPOHYYwIgPMTnsrt5H9eT84N7GfsDil1mdXOvlx5A
+4xpdusCKfyoAdQCkuQmQtBhYFIe7E6LMZ3AKPDWYBPkb37jjd80OyA3cEAAAAV/D
+RWB6AAAEAwBGMEQCIAOyT1ttiKfYSRk9uXqIVQDAxXwI9zDwPpCIsSSeHdEVAiBG
+VumpS2b0a4mT4dY6uoB8ZSwOa0DlNENyNNzvSmeAWzANBgkqhkiG9w0BAQsFAAOC
+AQEAUqQYnRdWx68oCqfXL6/n0bhbH3tDaOM6KDlnGLiJzvk1QDrHnSHqpN+1ffGF
+hCjXDw+wgBI+qpg1yzdaW312dC4OUHR3jUDH3JPkoTj1j1ePiFnz41rxudM0wAfm
+TQlF3wuTweqD58MfCbv4A8gtTzU4bI3eF5v0nwxtqvNijQZjH1uGoPev3qu0Dn13
+qH6QhgTBu2ITcRRyGHgNuCAy71rQ3jqW69K7cL/wMmipS6YC8QlqRLU2z8LVt5Ak
+lzrBb7HknXBcwuIhsxNj+eUPyczr87vIcDiK8nqCPa8kDl9CCb8eKuLCsnRt9R0b
+JnekDKQSi2yhc0uebVMMx5fQUw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFYjCCBEqgAwIBAgIQTEzYoPxP6q4VVKh/CQ7ahzANBgkqhkiG9w0BAQsFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMTYwNjA3MDAwMDAwWhcNMjYwNjA2MjM1OTU5WjCBlDEL
+MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD
+VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMR0wGwYDVQQLExREb21haW4gVmFs
+aWRhdGVkIFNTTDEmMCQGA1UEAxMdU3ltYW50ZWMgQmFzaWMgRFYgU1NMIENBIC0g
+RzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkN8hYylrZCZihZgN2
+5FsiT+qfOv8rKi3MbRIsZ2TUqsS5e1eDLPXI8IP4XXUZLWt9hlqmDpqiZa5mLSBj
+KDX3iWq/FaOc8l1AsbeOhr9ZESCoEorqm6S9wAL+HX7hLY/7p03SSNSAO+/gr2o7
+ciWu3jhd+H4dzGNNDN0nCuRIOX7rTGYI5mOb8QWJRC6H/3MlUYpBt9VV+l2FVNhB
+LJuofF3TNJojVHximZnTEkybg/r9AZc2TkDHJX1BA6rNjXG8l5iSCL9ICJCBUPB5
+z/s3hQBQkOALXN88QTIrlj53XpWpqxYdQJrOFbtWi18WW3ZAnGAscd8vZ5UIg3KL
+AmoBAgMBAAGjggF2MIIBcjASBgNVHRMBAf8ECDAGAQH/AgEAMC8GA1UdHwQoMCYw
+JKAioCCGHmh0dHA6Ly9zLnN5bWNiLmNvbS9wY2EzLWc1LmNybDAOBgNVHQ8BAf8E
+BAMCAQYwLgYIKwYBBQUHAQEEIjAgMB4GCCsGAQUFBzABhhJodHRwOi8vcy5zeW1j
+ZC5jb20wYQYDVR0gBFowWDBWBgZngQwBAgEwTDAjBggrBgEFBQcCARYXaHR0cHM6
+Ly9kLnN5bWNiLmNvbS9jcHMwJQYIKwYBBQUHAgIwGRoXaHR0cHM6Ly9kLnN5bWNi
+LmNvbS9ycGEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCkGA1UdEQQi
+MCCkHjAcMRowGAYDVQQDExFTeW1hbnRlY1BLSS0yLTU1NTAdBgNVHQ4EFgQUXGGe
+sHZBqWqqQwvhx24wKW6xzTYwHwYDVR0jBBgwFoAUf9Nlp8Ld7LvwMAnzQzn6Aq8z
+MTMwDQYJKoZIhvcNAQELBQADggEBAGHqRXEvjeE/CpuVSPHyPKJYFsqWxP/a4quX
+cRCRsy+ki4EP8qT7NfPnkEogxZvlMctHsWgdtTbp9ShXbqCnqXPCw575BZH2rEKN
+xI30CWr6U47n4h2hSnaJxJeeA+xKsA1Vk4v8eLu7xwRlBwhZEsYNFAVpD3YEToek
+H877QzZrZ6EdG/3Vg6sdtHDQ4i/U87syTmyM2l8vXOGIZDd1Wr6dqee2FtCfhvAc
+WMbvh/J6sBOHMq0Vn5G8Tp6iUwsRlY1z7LaQKAlnlOiiZVhhe+1gvzJBHC0t+Hr2
+2YHwaoKDLhSB0F/gGkziNQ+py1hFne4MEOuvzOxJpjn0+wRIbBk=
+-----END CERTIFICATE-----

+ 163 - 0
kline/datasource.json

@@ -0,0 +1,163 @@
+{
+  "DBDriver": "mysql",
+  "DSN": "root:TickServer@133@tcp(localhost:3306)/tick_server?charset=utf8",
+  "DBName": "fzmnewdb",
+  "DsMap": {
+	"ctp": {
+      "BrokerId": "66666",
+      "User": "1011000",
+      "PassWord": "317496",
+      "Url": "tcp://ctp1-front5.citicsf.com:41205",
+      "Url2": "tcp://ctp1-md5.citicsf.com:41213",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false
+    },
+    "dzh": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "115.29.238.128:19526",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "",
+      "SymbolsFile": ""
+    },
+    "easyforex": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "",
+      "SymbolsFile": ""
+    },
+    "oanda": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "",
+      "SymbolsFile": ""
+    },
+    "lmax": {
+      "BrokerId": "",
+      "User": "wave2907",
+      "PassWord": "Tg417396",
+      "Url": "https://trade.lmaxtrader.com",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "",
+      "SymbolsFile": ""
+    },
+    "sina": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "",
+      "SymbolsFile": ""
+    },
+    "sinafuture": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "",
+      "SymbolsFile": ""
+    },
+    "tdx": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "serverlist.txt",
+      "SymbolsFile": ""
+    },
+    "btc": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "serverlist.txt",
+      "SymbolsFile": ""
+    },
+    "polo": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "serverlist.txt",
+      "SymbolsFile": ""
+    },
+    "bty": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": true,
+      "CfgFile": "serverlist.txt",
+      "SymbolsFile": ""
+    },
+    "huobi": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "serverlist.txt",
+      "SymbolsFile": ""
+    },
+    "yunbi": {
+      "BrokerId": "",
+      "User": "",
+      "PassWord": "",
+      "Url": "",
+      "Url2": "",
+      "SaveDir": "/data/macoin/goprojects/bin/buff",
+      "SaveDir1": "",
+      "Run": false,
+      "CfgFile": "",
+      "SymbolsFile": ""
+    }
+  },
+  "DataDir": "/data/macoin/goprojects/bin/buff",
+  "HttpAddr": ":2107"
+}

BIN
kline/datasourceserver


+ 37 - 0
kline/db_script.sql

@@ -0,0 +1,37 @@
+-- MySQL dump 10.13  Distrib 5.7.20, for Linux (x86_64)
+--
+-- Host: localhost    Database: tick_server
+-- ------------------------------------------------------
+-- Server version	5.7.20-0ubuntu0.16.04.1
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Dumping data for table `inss_lastoffsets`
+--
+
+LOCK TABLES `inss_lastoffsets` WRITE;
+/*!40000 ALTER TABLE `inss_lastoffsets` DISABLE KEYS */;
+INSERT INTO `inss_lastoffsets` VALUES ('bty','ETHBTC',2310451),('bty','ETCBTC',2310118),('bty','ZECBTC',2310445),('bty','LTCBTC',2310452),('bty','BCCBTC',2310453),('bty','ETHUSDT',2310433),('bty','ETCUSDT',2310432),('bty','ZECUSDT',2310441),('bty','LTCUSDT',2310454),('bty','BCCUSDT',2310455),('bty','BTCUSDT',2309844),('bty','BTYUSDT',2310456),('bty','BTSUSDT',2310417),('bty','SCUSDT',2310448),('bty','BTYBTC',0),('bty','BTSBTC',0),('bty','SCBTC',0),('bty','YCCUSDT',0),('bty','BTCSUSDT',0),('bty','DCRUSDT',2310431);
+/*!40000 ALTER TABLE `inss_lastoffsets` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2018-05-16 18:02:12

+ 13 - 0
kline/ds.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+while true; do
+    running=$(ps -ef | grep "datasourceserver" | grep -v "grep") 
+    if [ "$running" ]; then
+        sleep 10
+	#rm -rf $PWD/*.log 
+	#rm -rf $PWD/*.out   
+	else
+        mv -f $PWD/datasourceserver.out $PWD/../dserver.out 
+	echo "starting service ..." 
+        nohup $PWD/datasourceserver > $PWD/datasourceserver.out 2>&1 &
+    fi 
+done 

File diff suppressed because it is too large
+ 44 - 0
kline/fzmnewdb.sql


+ 1 - 0
kline/fzmnewinss.json

@@ -0,0 +1 @@
+{}

+ 73 - 0
kline/macoin.org.crt

@@ -0,0 +1,73 @@
+-----BEGIN CERTIFICATE-----
+MIIEqzCCA5OgAwIBAgIDAhaMMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
+NTYgQ0EgLSBHMzAeFw0xNTAyMDMwMDQ0NDRaFw0xNjAzMDcwNDQ2NThaMIGQMRMw
+EQYDVQQLEwpHVDI5NTgxODM5MTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
+bS9yZXNvdXJjZXMvY3BzIChjKTE1MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
+YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEVMBMGA1UEAwwMKi5tYWNvaW4ub3JnMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoswGBpghzTOC0PrCYeNdYi7j
+LPfiKu2mFt1Krd3ADseYGULF45vRFwIV9Jr8mKvObZ3TK4F8lPeoZwShWZADFZok
+Y5Cyo7JlgxI/7pupH1zWUW+9CCdxy13cirW8IsckEe5+mDkmyVv4zlJsBe5fZhza
+gEghC+T89xeDcnuce2SaSaFLemKs8Twp2puyjGoEB2q0YDjg/MqA1Ce8CkjY9AYz
+nrutb1FTz3X2ZvAtRUl4DwJpMKbQ1/E3Stlc/PVkCu89y9HiBfgdP/mpokOa5DTV
+WmzWrqmCErYy7y8i3kpYrMzhFT9V1URdlbSzswupummEpHO+Mqi2TZjkPRPYwwID
+AQABo4IBVDCCAVAwHwYDVR0jBBgwFoAUw5zz/NNGCDS7zkZ/oHxb8+IIy1kwVwYI
+KwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNodHRwOi8vZ3Yuc3ltY2QuY29tMCYG
+CCsGAQUFBzAChhpodHRwOi8vZ3Yuc3ltY2IuY29tL2d2LmNydDAOBgNVHQ8BAf8E
+BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCMGA1UdEQQcMBqC
+DCoubWFjb2luLm9yZ4IKbWFjb2luLm9yZzArBgNVHR8EJDAiMCCgHqAchhpodHRw
+Oi8vZ3Yuc3ltY2IuY29tL2d2LmNybDAMBgNVHRMBAf8EAjAAMEUGA1UdIAQ+MDww
+OgYKYIZIAYb4RQEHNjAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5yYXBpZHNz
+bC5jb20vbGVnYWwwDQYJKoZIhvcNAQELBQADggEBAAsCVFLyM9UT+WiLdvOO6CJP
+P+gnsoxZ6rFjvEJCT3fI/vg+4Ssf6pAzq2bB5L9WzlrperNznnSkFmq86UB0V24b
+uQKQYiOmdFIi/AOvehxKAi5dEQ2mpUI4/E8TgLDJ/ZS2pEG+aO/qPlZSU6G+6D2y
+cRF/afR8YDbm2yAbUI2CCjQWriVWowANY/PYswHxyVJ6mEa8PIj7HRFfD1ZjtC/L
+7P0zdbCgD8WXCcfGoD+6HTnv1mck/mv+WdsWCNTVVSPBWY8bL/0BAO4SNzX5KpLv
+hzWv1UTLoGgLLCdgd4ghY4IMrCmF6u+2iQgRn4UtjzPQM44aKyR2OjRORhvdG1c=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEJTCCAw2gAwIBAgIDAjp3MA0GCSqGSIb3DQEBCwUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMTQwODI5MjEzOTMyWhcNMjIwNTIwMjEzOTMyWjBHMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXUmFwaWRTU0wg
+U0hBMjU2IENBIC0gRzMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv
+VJvZWF0eLFbG1eh/9H0WA//Qi1rkjqfdVC7UBMBdmJyNkA+8EGVf2prWRHzAn7Xp
+SowLBkMEu/SW4ib2YQGRZjEiwzQ0Xz8/kS9EX9zHFLYDn4ZLDqP/oIACg8PTH2lS
+1p1kD8mD5xvEcKyU58Okaiy9uJ5p2L4KjxZjWmhxgHsw3hUEv8zTvz5IBVV6s9cQ
+DAP8m/0Ip4yM26eO8R5j3LMBL3+vV8M8SKeDaCGnL+enP/C1DPz1hNFTvA5yT2AM
+QriYrRmIV9cE7Ie/fodOoyH5U/02mEiN1vi7SPIpyGTRzFRIU4uvt2UevykzKdkp
+YEj4/5G8V1jlNS67abZZAgMBAAGjggEdMIIBGTAfBgNVHSMEGDAWgBTAephojYn7
+qwVkDBF9qn1luMrMTjAdBgNVHQ4EFgQUw5zz/NNGCDS7zkZ/oHxb8+IIy1kwEgYD
+VR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwNQYDVR0fBC4wLDAqoCig
+JoYkaHR0cDovL2cuc3ltY2IuY29tL2NybHMvZ3RnbG9iYWwuY3JsMC4GCCsGAQUF
+BwEBBCIwIDAeBggrBgEFBQcwAYYSaHR0cDovL2cuc3ltY2QuY29tMEwGA1UdIARF
+MEMwQQYKYIZIAYb4RQEHNjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdlb3Ry
+dXN0LmNvbS9yZXNvdXJjZXMvY3BzMA0GCSqGSIb3DQEBCwUAA4IBAQCjWB7GQzKs
+rC+TeLfqrlRARy1+eI1Q9vhmrNZPc9ZE768LzFvB9E+aj0l+YK/CJ8cW8fuTgZCp
+fO9vfm5FlBaEvexJ8cQO9K8EWYOHDyw7l8NaEpt7BDV7o5UzCHuTcSJCs6nZb0+B
+kvwHtnm8hEqddwnxxYny8LScVKoSew26T++TGezvfU5ho452nFnPjJSxhJf3GrkH
+uLLGTxN5279PURt/aQ1RKsHWFf83UTRlUfQevjhq7A6rvz17OQV79PP7GqHQyH5O
+ZI3NjGFVkP46yl0lD/gdo0p0Vk8aVUBwdSWmMy66S6VdU5oNMOGNX2Esr8zvsJmh
+gP8L8mJMcCaY
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAuagAwIBAgIDErvmMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
+MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
+aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDIwNTIxMDQwMDAwWhcNMTgwODIxMDQwMDAw
+WjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UE
+AxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9m
+OSm9BXiLnTjoBbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIu
+T8rxh0PBFpVXLVDviS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6c
+JmTM386DGXHKTubU1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmR
+Cw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5asz
+PeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo4HwMIHtMB8GA1UdIwQYMBaAFEjm
+aPkr0rKV10fYIyAQTzOYkJ/UMB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrM
+TjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLmdlb3RydXN0LmNvbS9jcmxzL3NlY3VyZWNhLmNybDBO
+BgNVHSAERzBFMEMGBFUdIAAwOzA5BggrBgEFBQcCARYtaHR0cHM6Ly93d3cuZ2Vv
+dHJ1c3QuY29tL3Jlc291cmNlcy9yZXBvc2l0b3J5MA0GCSqGSIb3DQEBBQUAA4GB
+AHbhEm5OSxYShjAGsoEIz/AIx8dxfmbuwu3UOx//8PDITtZDOLC5MH0Y0FWDomrL
+NhGc6Ehmo21/uBPUR/6LWlxz/K7ZGzIZOKuXNBSqltLroxwUCEm2u+WR74M26x1W
+b8ravHNjkOR/ez4iyz0H7V84dJzjA1BOoa+Y7mHyhD8S
+-----END CERTIFICATE-----

+ 27 - 0
kline/macoin.org.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAoswGBpghzTOC0PrCYeNdYi7jLPfiKu2mFt1Krd3ADseYGULF
+45vRFwIV9Jr8mKvObZ3TK4F8lPeoZwShWZADFZokY5Cyo7JlgxI/7pupH1zWUW+9
+CCdxy13cirW8IsckEe5+mDkmyVv4zlJsBe5fZhzagEghC+T89xeDcnuce2SaSaFL
+emKs8Twp2puyjGoEB2q0YDjg/MqA1Ce8CkjY9AYznrutb1FTz3X2ZvAtRUl4DwJp
+MKbQ1/E3Stlc/PVkCu89y9HiBfgdP/mpokOa5DTVWmzWrqmCErYy7y8i3kpYrMzh
+FT9V1URdlbSzswupummEpHO+Mqi2TZjkPRPYwwIDAQABAoIBADHAwrKvOd1Zucge
+atu5vedsxvcORuuxt4nTVahvVevuafiGZK4cB7nNZGJeH4aVM0Bi9I+eQjHQwoHB
+c4JItfibJDXdmgrXUZjOMgW9QuGX4NQAnzfnvipV5DnsMrQ6QjbMuZnSFZ2CYzbD
+D8p8QGGXvdtor9jPwdPONtj9GCTJbFWS1B5vvLNl3EDEY7H6LP6GyIP8nXPsXs3b
+V0DuRzTUzqiBvWPlszUtdcdSJqjIGB4jP+fafVDTXeQo58onEq4P57uUHhlOrYcR
+MS9pgLocraY8PnJ3N7MAXPTihV0zE89fsAPk1BaSUzINbM7GDyKKve3KSZpkkHtC
+1JRohCkCgYEA036WR9Qpjc9LMo/NLGsSJ3mBpthgF12UyhjYFvd1UjCkkQko4mqe
+hrk/BeqQVlOTc/78UYSddu0Z22WGY5jNw33oY3XeHKpBwYnIaw6uUHSJhjdsF00O
+OjjeUCQaDF0iLUFBkSTH5219GyeR2HRU+TBrvUypS+FAdlcNnrb7zN8CgYEAxQ4N
+3lL0JqwDJUwnQn+ymPhBSGRqOOc8U0a0NT65TA546qrwXhLifMhKTcsYqO6IFJ/Z
+VMqrLNvQdemBmgPi9FguQsEQFgRDr16hTyIwoos1QzZ1Kk1NFOArWXQI08nxFNRY
+ig/fYhd62tgpzG3ASibcHnrsnoHy9/4rqxHLTJ0CgYEApKCWzlbB+dbwS+1P4lF+
+Eigs2fj343g+x4nLOyVot4+RqiwdHRGtUGWGP061B92Km/JR6gp2oAoz5GoE0CYz
+lQa/DBzFxj5pbQOZdGw7F/l+y3D8vK6Icp2tv2g6toEQh3WSWi7tRKIfjjGg/4Ke
+WlJsqy+vYJd4HCXrPi5llrUCgYADWwXpb0gxEGTNUcqpWztTV4blELCuX2GrmVyg
+O300SlrMxDRrpa6tqUt6n6a/2a//ielNhFX94ZBfMaa/VKmct5OyF0+K0G/GoLnm
+exKQ8gXqKxc7rS1O2bJjR5KO6LVuQV9wmmyXYwb4iw3LKWNI3/iHnFhDKrtUdcOQ
+mjD4EQKBgEN73pyaiP2Oj9QHzXEsWNW7/kJKRECykb5pPWuH8RAI2vtQ309ZWTtI
+RtTseUR5nDg9Cn7C9SiZ6RX5G4UWdN6qoUn//0pFymIJFM8i8jiFDlJ27wQssGPD
+47otYRmHQur8p0rv9jy4E4npGIB12uNfNGp9IzE10FlqIMDAn3cL
+-----END RSA PRIVATE KEY-----

+ 53 - 0
kline/mkconf.json

@@ -0,0 +1,53 @@
+{
+  "DBDriver": "mysql",
+  "DSN": "root:TickServer@133@tcp(localhost:3306)/fzmnewdb?charset=utf8",
+  "DBName": "fzmnewdb",
+  "DsMap": {
+    "lmax": {
+      "Run": false
+    },
+    "dzh": {
+      "Run": false
+    },
+    "sina": {
+      "Run": false
+    },
+    "ctp": {
+      "Run": false
+    },
+    "easyforex": {
+      "Run": false
+    },
+    "oanda": {
+      "Run": false
+    },
+    "sinafuture": {
+      "Run": false
+    },
+    "tdx": {
+      "Run": false
+    },
+    "btc": {
+      "Run": false
+    },
+    "polo": {
+      "Run": false
+    },
+    "bty": {
+      "Run": true
+    },
+    "huobi": {
+      "Run": false
+    },
+    "yunbi": {
+      "Run": false
+    }
+  },
+  "Url": "http://127.0.0.1:2107/",
+  "UrlSSL": "https://127.0.0.1:2107/",
+  "FileServerAddr": "localhost:8080",
+  "DataDir": "/data/macoin/goprojects/bin/fzmnew",
+  "InssFile": "fzmnewinss.json",
+  "RpcAddr": ":19528",
+  "StreamAddr": ":19529"
+}

File diff suppressed because it is too large
+ 112 - 0
kline/tick_server.sql


BIN
kline/tickserver


+ 11 - 0
kline/ts.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+while true; do
+    running=$(ps -ef | grep "tickserver" | grep -v "grep") 
+    if [ "$running" ]; then
+        sleep 10 
+    else
+        mv -f $PWD/tickserver.out $PWD/../tserver.out 
+        echo "starting service ..." 
+        nohup $PWD/tickserver > $PWD/tickserver.out 2>&1 &
+    fi 
+done 

+ 6 - 0
kline/webproxy.json

@@ -0,0 +1,6 @@
+{
+  "Saddr1": "127.0.0.1:19528",
+  "Saddr2": "127.0.0.1:19528",
+  "Saddr3": "127.0.0.1:19529",
+  "Saddr4": "127.0.0.1:9090"
+}

+ 6 - 0
kline/webproxys.json

@@ -0,0 +1,6 @@
+{
+  "Saddr1": "127.0.0.1:19528",
+  "Saddr2": "127.0.0.1:19528",
+  "Saddr3": "127.0.0.1:19529",
+  "Saddr4": "127.0.0.1:9090"
+}

BIN
kline/webproxys33


BIN
kline/webproxyt


+ 11 - 0
kline/wps33.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+while true; do
+    running=$(ps -ef | grep "webproxys33" | grep -v "grep") 
+    if [ "$running" ]; then
+        sleep 2 
+    else
+        mv -f $PWD/webproxys33.out $PWD/../wproxys33.out 
+        echo "starting service ..." 
+        nohup $PWD/webproxys33 > $PWD/webproxys33.out 2>&1 &
+    fi 
+done 

+ 11 - 0
kline/wpt.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+while true; do
+    running=$(ps -ef | grep "webproxyt" | grep -v "grep") 
+    if [ "$running" ]; then
+        sleep 2 
+    else
+        mv -f $PWD/webproxyt.out $PWD/../wproxyt.out 
+        echo "starting service ..." 
+        nohup $PWD/webproxyt > $PWD/webproxyt.out 2>&1 &
+    fi 
+done 

+ 73 - 0
read.txt

@@ -1 +1,74 @@
 
+###########环境依赖  
+nginx  
+mysql
+  
+###########部署步骤  
+1. 新建目录  
+    mkdir -p /data/macoin/goprojects/bin  
+  
+  
+2. 安装nginix,并修改/etc/nginx/sites-available/default:
+  server {
+        listen 9090 default_server;
+        listen [::]:9090 default_server ipv6only=on;
+
+        root /data/macoin/goprojects/bin/fzmnew;
+        index index.html index.htm;
+
+        server_name localhost;
+
+        location / {
+                try_files $uri $uri/ =404;
+        }
+	server {
+        listen 8080;
+        listen [::]:8080 ipv6only=on;
+        server_name localhost;
+        root /data/macoin/goprojects/bin/buff;
+        index index.html index.htm;
+
+        location / {
+                try_files $uri $uri/ =404;
+        }
+}
+
+  
+3. 安装mysql
+	新建数据库tick_server,fzmnewdb;
+	导入tick_server数据库表:use tick_server; source tick_server.sql;
+	导入fzmnewdb数据库表:use fzmnewdb; source fzmnewdb.sql;
+  
+4. 启动服务器: 
+    nohup ./wpt.sh > wpt.out 2>&1 &
+	nohup ./wps33.sh > wps33.out 2>&1 &
+	nohup ./ts.sh > ts.out 2>&1 &
+	nohup ./ds.sh > ds.out 2>&1 &
+	
+5. 在/etc/rc.local里添加如下内容:
+	cd /data/macoin/goprojects/bin
+	nohup ./wpt.sh > wpt.out 2>&1 &
+	nohup ./wps33.sh > wps33.out 2>&1 &
+	nohup ./ts.sh > ts.out 2>&1 &
+	nohup ./ds.sh > ds.out 2>&1 &
+         
+  
+  
+###########目录结构描述  
+├── datasourceserver                 
+├── datasource.json                         
+├── ds.sh                                  
+├── tickserver  
+├── mkconf.json                           
+├── ts.sh  
+├── webproxys33  
+├── webproxys.json  
+├── wps33.sh          
+├── webproxyt  
+├── webproxyt.json  
+├── wpt.sh               
+  
+  
+  
+###########V1.0.0 版本内容更新  
+1. 新功能  aaaaaaaaa  

+ 1 - 19
server/tick/ds_bty.go

@@ -22,17 +22,6 @@ import (
 )
 
 var btyInss = []int{
-	//markinfo.SCCNY,
-	//markinfo.BTCCNY,
-	//markinfo.BTYCNY,
-	//markinfo.ETHCNY,
-	//markinfo.ETCCNY,
-	//markinfo.ZECCNY,
-	//markinfo.BTSCNY,
-	//markinfo.LTCCNY,
-	//markinfo.BCCCNY,
-	//markinfo.NYCCCNY,
-	//markinfo.WTCCNY,
 	markinfo.ETHBTC,
 	markinfo.ETCBTC,
 	markinfo.ZECBTC,
@@ -47,11 +36,6 @@ var btyInss = []int{
 	markinfo.BTYUSDT,
 	markinfo.BTSUSDT,
 	markinfo.SCUSDT,
-	markinfo.BTYBTC,
-	markinfo.BTSBTC,
-	markinfo.SCBTC,
-	markinfo.YCCUSDT,
-	markinfo.BTCSUSDT,
 	markinfo.DCRUSDT,
 }
 
@@ -147,10 +131,8 @@ func (bds *BtyDS) getData(instrumentId, offset int64) {
 
 func GetEthTickbyPage(instrumentId, offset int64, cb func(*Market)) (int64, error) {
 	symbol, _ := markinfo.SymbolName(int(instrumentId))
-	//url := "http://47.75.62.253:46658/tender/default/kline?symbol=" + symbol + "&offset=" + fmt.Sprintf("%d", offset) + "&limit=100"
-	//url := "http://47.74.9.155:45656/tender/default/kline?symbol=" + symbol + "&offset=" + fmt.Sprintf("%d", offset) + "&limit=100"
 	url := "http://10.0.1.5:45656/tender/default/kline?symbol=" + symbol + "&offset=" + fmt.Sprintf("%d", offset) + "&limit=100"
-	//url := "http://121.196.205.182:45656/tender/default/kline?symbol=" + symbol + "&offset=" + fmt.Sprintf("%d", offset) + "&limit=100"
+	//url := "http://65.52.167.178:45656/forward?symbol=" + symbol + "&offset=" + fmt.Sprintf("%d", offset) + "&limit=100"
 	response, err := http.Get(url)
 	if err != nil {
 		//log.Println("f1", url, err)

Some files were not shown because too many files changed in this diff